Put reg preview item back and updated highlights

Changed highlights and removed reg preview line item
Update MD5
2026-01-01 18:06:25 +01:00 · 2025-05-14 09:30:55 -07:00 · 2025-05-14 08:33:25 -07:00 · 2025-05-14 18:44:03 +08:00 · 2025-05-12 15:17:44 -07:00 · 2025-05-09 11:27:40 +08:00
114 changed files with 2932 additions and 1910 deletions
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -344,11 +344,6 @@ jobs:
      flattenFolders: True
      OverWrite: True

-  # Check if all projects (located in src sub-folder) import common props
-  - pwsh: |-
-      & '.pipelines/verifyCommonProps.ps1' -sourceDir '$(build.sourcesdirectory)\src'
-    displayName: Audit shared common props for CSharp projects in src sub-folder
-
  # Check if deps.json files don't reference different dll versions.
  - pwsh: |-
      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
--- a/.pipelines/verifyCommonProps.ps1
+++ b/.pipelines/verifyCommonProps.ps1
@@ -1,54 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True, Position = 1)]
-    [string]$sourceDir
-)
-
-# scan all csharp project in the source directory
-function Get-CSharpProjects {
-    param (
-        [string]$path
-    )
-
-    # Get all .csproj files under the specified path
-    return Get-ChildItem -Path $path -Recurse -Filter *.csproj | Select-Object -ExpandProperty FullName
-}
-
-# Check if the project file imports 'Common.Dotnet.CsWinRT.props'
-function Test-ImportSharedCsWinRTProps {
-    param (
-        [string]$filePath
-    )
-
-    # Load the XML content of the .csproj file
-    [xml]$csprojContent = Get-Content -Path $filePath
-
-    
-    # Check if the Import element with Project attribute containing 'Common.Dotnet.CsWinRT.props' exists
-    return $csprojContent.Project.Import | Where-Object { $null -ne $_.Project -and $_.Project.EndsWith('Common.Dotnet.CsWinRT.props') }
-}
-
-# Call the function with the provided source directory
-$csprojFilesArray = Get-CSharpProjects -path $sourceDir
-
-$hasInvalidCsProj = $false
-
-# Enumerate the array of file paths and call Validate-ImportSharedCsWinRTProps for each file
-foreach ($csprojFile in $csprojFilesArray) {
-    # Skip if the file ends with 'TemplateCmdPalExtension.csproj'
-    if ($csprojFile -like '*TemplateCmdPalExtension.csproj') {
-        continue
-    }
-
-    $importExists = Test-ImportSharedCsWinRTProps -filePath $csprojFile
-    if (!$importExists) {
-        Write-Output "$csprojFile need to import 'Common.Dotnet.CsWinRT.props'."
-        $hasInvalidCsProj = $true
-    }
-}
-
-if ($hasInvalidCsProj) {
-    exit 1
-}
-
-exit 0
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -624,6 +624,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CommandPalette", "CommandPa
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Built-in Extensions", "Built-in Extensions", "{ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Apps", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj", "{6CE438DF-C245-4997-A360-0A0939E4BA34}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Bookmarks", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Bookmark\Microsoft.CmdPal.Ext.Bookmarks.csproj", "{E09AA983-C755-474F-83D6-A5CDF528C070}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Calc", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj", "{6D56B64D-FF1F-488F-AFED-9B9854A5D399}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Registry", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj", "{92EC89E4-9972-453A-8A1A-3A9E230C146A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsServices", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsServices\Microsoft.CmdPal.Ext.WindowsServices.csproj", "{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsSettings", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsSettings\Microsoft.CmdPal.Ext.WindowsSettings.csproj", "{D1160404-D3D1-497A-883A-4059C07C2273}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsTerminal", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsTerminal\Microsoft.CmdPal.Ext.WindowsTerminal.csproj", "{40F6D69D-E321-400F-A767-5628C7AE453D}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extension SDK", "Extension SDK", "{F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.CommandPalette.Extensions", "src\modules\cmdpal\extensionsdk\Microsoft.CommandPalette.Extensions\Microsoft.CommandPalette.Extensions.vcxproj", "{305DD37E-C85D-4B08-AAFE-7381FA890463}"
@@ -646,6 +660,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.UI", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.UI.ViewModels", "src\modules\cmdpal\Microsoft.CmdPal.UI.ViewModels\Microsoft.CmdPal.UI.ViewModels.csproj", "{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.ClipboardHistory", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj", "{79775343-7A3D-445D-9104-3DD5B2893DF9}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalModuleInterface", "src\modules\cmdpal\CmdPalModuleInterface\CmdPalModuleInterface.vcxproj", "{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkspacesCsharpLibrary", "src\modules\Workspaces\WorkspacesCsharpLibrary\WorkspacesCsharpLibrary.csproj", "{89D0E199-B17A-418C-B2F8-7375B6708357}"
@@ -656,6 +672,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Indexe
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Shell", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Shell\Microsoft.CmdPal.Ext.Shell.csproj", "{C0CE3B5E-16D3-495D-B335-CA791B660162}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowWalker", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj", "{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSearch", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj", "{605E914B-7232-4789-AF46-BF5D3DDFC14E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WinGet", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj", "{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "src\modules\AdvancedPaste\AdvancedPaste.FuzzTests\AdvancedPaste.FuzzTests.csproj", "{7F5B9557-5878-4438-A721-3E28296BA193}"
@@ -668,6 +690,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomItModuleInterface", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomItSettingsInterop", "src\modules\ZoomIt\ZoomItSettingsInterop\ZoomItSettingsInterop.vcxproj", "{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.TimeDate", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.TimeDate\Microsoft.CmdPal.Ext.TimeDate.csproj", "{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITestAutomation", "src\common\UITestAutomation\UITestAutomation.csproj", "{A558C25D-2007-498E-8B6F-43405AFAE9E2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyboardManagerEditorUI", "src\modules\keyboardmanager\KeyboardManagerEditorUI\KeyboardManagerEditorUI.csproj", "{08F9155D-B6DC-46E5-9C83-AF60B655898B}"
@@ -680,12 +704,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.UITests", "src\module
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegistryPreview.FuzzTests", "src\modules\registrypreview\RegistryPreview.FuzzTests\RegistryPreview.FuzzTests.csproj", "{5702B3CC-8575-48D5-83D8-15BB42269CD3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj", "{64B88F02-CD88-4ED8-9624-989A800230F9}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "src\modules\cmdpal\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj", "{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Apps", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj", "{9C88FE7A-1424-59F6-C982-50AE3D2F03E3}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2238,6 +2262,62 @@ Global
 		{66614C26-314C-4B91-9071-76133422CFEF}.Release|ARM64.Build.0 = Release|ARM64
 		{66614C26-314C-4B91-9071-76133422CFEF}.Release|x64.ActiveCfg = Release|x64
 		{66614C26-314C-4B91-9071-76133422CFEF}.Release|x64.Build.0 = Release|x64
+		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Debug|ARM64.Build.0 = Debug|ARM64
+		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Debug|x64.ActiveCfg = Debug|x64
+		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Debug|x64.Build.0 = Debug|x64
+		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Release|ARM64.ActiveCfg = Release|ARM64
+		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Release|ARM64.Build.0 = Release|ARM64
+		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Release|x64.ActiveCfg = Release|x64
+		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Release|x64.Build.0 = Release|x64
+		{E09AA983-C755-474F-83D6-A5CDF528C070}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{E09AA983-C755-474F-83D6-A5CDF528C070}.Debug|ARM64.Build.0 = Debug|ARM64
+		{E09AA983-C755-474F-83D6-A5CDF528C070}.Debug|x64.ActiveCfg = Debug|x64
+		{E09AA983-C755-474F-83D6-A5CDF528C070}.Debug|x64.Build.0 = Debug|x64
+		{E09AA983-C755-474F-83D6-A5CDF528C070}.Release|ARM64.ActiveCfg = Release|ARM64
+		{E09AA983-C755-474F-83D6-A5CDF528C070}.Release|ARM64.Build.0 = Release|ARM64
+		{E09AA983-C755-474F-83D6-A5CDF528C070}.Release|x64.ActiveCfg = Release|x64
+		{E09AA983-C755-474F-83D6-A5CDF528C070}.Release|x64.Build.0 = Release|x64
+		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Debug|ARM64.Build.0 = Debug|ARM64
+		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Debug|x64.ActiveCfg = Debug|x64
+		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Debug|x64.Build.0 = Debug|x64
+		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Release|ARM64.ActiveCfg = Release|ARM64
+		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Release|ARM64.Build.0 = Release|ARM64
+		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Release|x64.ActiveCfg = Release|x64
+		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Release|x64.Build.0 = Release|x64
+		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Debug|x64.ActiveCfg = Debug|x64
+		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Debug|x64.Build.0 = Debug|x64
+		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Release|ARM64.Build.0 = Release|ARM64
+		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Release|x64.ActiveCfg = Release|x64
+		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Release|x64.Build.0 = Release|x64
+		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Debug|ARM64.Build.0 = Debug|ARM64
+		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Debug|x64.ActiveCfg = Debug|x64
+		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Debug|x64.Build.0 = Debug|x64
+		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Release|ARM64.ActiveCfg = Release|ARM64
+		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Release|ARM64.Build.0 = Release|ARM64
+		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Release|x64.ActiveCfg = Release|x64
+		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Release|x64.Build.0 = Release|x64
+		{D1160404-D3D1-497A-883A-4059C07C2273}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D1160404-D3D1-497A-883A-4059C07C2273}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D1160404-D3D1-497A-883A-4059C07C2273}.Debug|x64.ActiveCfg = Debug|x64
+		{D1160404-D3D1-497A-883A-4059C07C2273}.Debug|x64.Build.0 = Debug|x64
+		{D1160404-D3D1-497A-883A-4059C07C2273}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D1160404-D3D1-497A-883A-4059C07C2273}.Release|ARM64.Build.0 = Release|ARM64
+		{D1160404-D3D1-497A-883A-4059C07C2273}.Release|x64.ActiveCfg = Release|x64
+		{D1160404-D3D1-497A-883A-4059C07C2273}.Release|x64.Build.0 = Release|x64
+		{40F6D69D-E321-400F-A767-5628C7AE453D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{40F6D69D-E321-400F-A767-5628C7AE453D}.Debug|ARM64.Build.0 = Debug|ARM64
+		{40F6D69D-E321-400F-A767-5628C7AE453D}.Debug|x64.ActiveCfg = Debug|x64
+		{40F6D69D-E321-400F-A767-5628C7AE453D}.Debug|x64.Build.0 = Debug|x64
+		{40F6D69D-E321-400F-A767-5628C7AE453D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{40F6D69D-E321-400F-A767-5628C7AE453D}.Release|ARM64.Build.0 = Release|ARM64
+		{40F6D69D-E321-400F-A767-5628C7AE453D}.Release|x64.ActiveCfg = Release|x64
+		{40F6D69D-E321-400F-A767-5628C7AE453D}.Release|x64.Build.0 = Release|x64
 		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|ARM64.Build.0 = Debug|ARM64
 		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|x64.ActiveCfg = Debug|x64
@@ -2314,6 +2394,14 @@ Global
 		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Release|ARM64.Build.0 = Release|ARM64
 		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Release|x64.ActiveCfg = Release|x64
 		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Release|x64.Build.0 = Release|x64
+		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Debug|ARM64.Build.0 = Debug|ARM64
+		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Debug|x64.ActiveCfg = Debug|x64
+		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Debug|x64.Build.0 = Debug|x64
+		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Release|ARM64.ActiveCfg = Release|ARM64
+		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Release|ARM64.Build.0 = Release|ARM64
+		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Release|x64.ActiveCfg = Release|x64
+		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Release|x64.Build.0 = Release|x64
 		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Debug|ARM64.Build.0 = Debug|ARM64
 		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Debug|x64.ActiveCfg = Debug|x64
@@ -2358,6 +2446,34 @@ Global
 		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Release|ARM64.Build.0 = Release|ARM64
 		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Release|x64.ActiveCfg = Release|x64
 		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Release|x64.Build.0 = Release|x64
+		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Debug|x64.ActiveCfg = Debug|x64
+		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Debug|x64.Build.0 = Debug|x64
+		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Release|ARM64.Build.0 = Release|ARM64
+		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Release|x64.ActiveCfg = Release|x64
+		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Release|x64.Build.0 = Release|x64
+		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Debug|ARM64.Build.0 = Debug|ARM64
+		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Debug|x64.ActiveCfg = Debug|x64
+		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Debug|x64.Build.0 = Debug|x64
+		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Release|ARM64.Build.0 = Release|ARM64
+		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Release|x64.ActiveCfg = Release|x64
+		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Release|x64.Build.0 = Release|x64
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|ARM64.Build.0 = Debug|ARM64
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|x64.ActiveCfg = Debug|x64
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|x64.Build.0 = Debug|x64
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|x64.Deploy.0 = Debug|x64
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|ARM64.ActiveCfg = Release|ARM64
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|ARM64.Build.0 = Release|ARM64
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|ARM64.Deploy.0 = Release|ARM64
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.ActiveCfg = Release|x64
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.Build.0 = Release|x64
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.Deploy.0 = Release|x64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|ARM64.Build.0 = Debug|ARM64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|x64.ActiveCfg = Debug|x64
@@ -2398,6 +2514,18 @@ Global
 		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}.Release|ARM64.Build.0 = Release|ARM64
 		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}.Release|x64.ActiveCfg = Release|x64
 		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}.Release|x64.Build.0 = Release|x64
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|ARM64.Build.0 = Debug|ARM64
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|x64.ActiveCfg = Debug|x64
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|x64.Build.0 = Debug|x64
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|x64.Deploy.0 = Debug|x64
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|ARM64.ActiveCfg = Release|ARM64
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|ARM64.Build.0 = Release|ARM64
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|ARM64.Deploy.0 = Release|ARM64
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|x64.ActiveCfg = Release|x64
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|x64.Build.0 = Release|x64
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|x64.Deploy.0 = Release|x64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Debug|x64.ActiveCfg = Debug|x64
@@ -2446,6 +2574,14 @@ Global
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Release|ARM64.Build.0 = Release|ARM64
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Release|x64.ActiveCfg = Release|x64
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Release|x64.Build.0 = Release|x64
+		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|ARM64.Build.0 = Debug|ARM64
+		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|x64.ActiveCfg = Debug|x64
+		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|x64.Build.0 = Debug|x64
+		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.ActiveCfg = Release|ARM64
+		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.Build.0 = Release|ARM64
+		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.ActiveCfg = Release|x64
+		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.Build.0 = Release|x64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.ActiveCfg = Debug|x64
@@ -2460,14 +2596,6 @@ Global
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|ARM64.ActiveCfg = Release|ARM64
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.ActiveCfg = Release|x64
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.Build.0 = Release|x64
-		{9C88FE7A-1424-59F6-C982-50AE3D2F03E3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{9C88FE7A-1424-59F6-C982-50AE3D2F03E3}.Debug|ARM64.Build.0 = Debug|ARM64
-		{9C88FE7A-1424-59F6-C982-50AE3D2F03E3}.Debug|x64.ActiveCfg = Debug|x64
-		{9C88FE7A-1424-59F6-C982-50AE3D2F03E3}.Debug|x64.Build.0 = Debug|x64
-		{9C88FE7A-1424-59F6-C982-50AE3D2F03E3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{9C88FE7A-1424-59F6-C982-50AE3D2F03E3}.Release|ARM64.Build.0 = Release|ARM64
-		{9C88FE7A-1424-59F6-C982-50AE3D2F03E3}.Release|x64.ActiveCfg = Release|x64
-		{9C88FE7A-1424-59F6-C982-50AE3D2F03E3}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2697,6 +2825,13 @@ Global
 		{66614C26-314C-4B91-9071-76133422CFEF} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
 		{3846508C-77EB-4034-A702-F8BB263C4F79} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
+		{6CE438DF-C245-4997-A360-0A0939E4BA34} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{E09AA983-C755-474F-83D6-A5CDF528C070} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{6D56B64D-FF1F-488F-AFED-9B9854A5D399} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{92EC89E4-9972-453A-8A1A-3A9E230C146A} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{D1160404-D3D1-497A-883A-4059C07C2273} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{40F6D69D-E321-400F-A767-5628C7AE453D} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{F3D09629-59A2-4924-A4B9-D6BFAA2C1B49} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{305DD37E-C85D-4B08-AAFE-7381FA890463} = {F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}
 		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24} = {F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}
@@ -2708,26 +2843,31 @@ Global
 		{7520A2FE-00A2-49B8-83ED-DB216E874C04} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
 		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
+		{79775343-7A3D-445D-9104-3DD5B2893DF9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{89D0E199-B17A-418C-B2F8-7375B6708357} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC}
 		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{C0CE3B5E-16D3-495D-B335-CA791B660162} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{605E914B-7232-4789-AF46-BF5D3DDFC14E} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE} = {9873BA05-4C41-4819-9283-CF45D795431B}
 		{7F5B9557-5878-4438-A721-3E28296BA193} = {9873BA05-4C41-4819-9283-CF45D795431B}
 		{DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{0A84F764-3A88-44CD-AA96-41BDBD48627B} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
 		{E4585179-2AC1-4D5F-A3FF-CFC5392F694C} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
 		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
+		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{08F9155D-B6DC-46E5-9C83-AF60B655898B} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{4382A954-179A-4078-92AF-715187DFFF50} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{EBED240C-8702-452D-B764-6DB9DA9179AF} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
+		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
-		{9C88FE7A-1424-59F6-C982-50AE3D2F03E3} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
--- a/README.md
+++ b/README.md
@@ -35,19 +35,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.

 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.91%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.90%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysUserSetup-0.90.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysUserSetup-0.90.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysSetup-0.90.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysSetup-0.90.0-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.92%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.91%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysUserSetup-0.91.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysUserSetup-0.91.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysSetup-0.91.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysSetup-0.91.0-arm64.exe
 
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.90.0-x64.exe][ptUserX64] | 2A6036F5B2D454084E55816C306E1E57EF1D14C916691CBDA42B469797605CE0 |
-| Per user - ARM64     | [PowerToysUserSetup-0.90.0-arm64.exe][ptUserArm64] | AB2E4DC87A9D764BE897C5170E2890E174C89CA912A1916FA3AE1E427536EA4A |
-| Machine wide - x64   | [PowerToysSetup-0.90.0-x64.exe][ptMachineX64] | 12801C44F43D0CC61E90DF1EFDC40E4F3C88341E0199D5B20791042D9B173DCF |
-| Machine wide - ARM64 | [PowerToysSetup-0.90.0-arm64.exe][ptMachineArm64] | 2998007C8FCD7BD2770767C6502AAA2CC75B85EC30DE62986EC7005EB0014EDB |
+| Per user - x64       | [PowerToysUserSetup-0.91.0-x64.exe][ptUserX64] | 190DD702EDE2D3AC27A253DF8BC2416B1AF05E6594FF25CABEE844E6D3C8CCB0 |
+| Per user - ARM64     | [PowerToysUserSetup-0.91.0-arm64.exe][ptUserArm64] | BE6C964C40147B5F7838E51A13837347756CC45E6AC5BC0DD11AF9AF605ABDCD |
+| Machine wide - x64   | [PowerToysSetup-0.91.0-x64.exe][ptMachineX64] | 2308D896D9A66C56B98AC8B3CE9B7C945C7A2315551E36C118C7ECAC4A6D05C2 |
+| Machine wide - ARM64 | [PowerToysSetup-0.91.0-arm64.exe][ptMachineArm64] | 28BD1FEFA22C52279C6B600E677B425B014D1F9190EA449D6C63FC2702092DA3 |

 This is our preferred method.

@@ -93,92 +93,164 @@ For guidance on developing for PowerToys, please read the [developer docs](/doc/

 Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.

-### 0.90 - March 2025 Update
+### 0.91 - May 2025 Update

 In this release, we focused on new features, stability, and automation.

 **✨Highlights**

-![Gif for Command Palette](doc/images/overview/CmdPal_Hero.gif)
+ - We focused on greatly improving Command Palette's performance and fixing a large amount of bugs. Some new features we've added are:
+ - Added the ability for Command Palette to search any file using a fallback command.
+ - Added the ability to make the Command Palette global hotkey a low-level keyboard hook.
+ - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from Command Palette.
+ - You can now define custom formats in the Date and Time plugins of PT Run and Command Palette. Thanks [@htcfreek](https://github.com/htcfreek)!

- New module: Command Palette ("CmdPal") -  Created as the evolution of PowerToys Run with extensibility at the forefront, Command Palette is a quick launcher with a richer display and additional capabilities without sacrificing performance, allowing you to start anything with the shortcut **Win+Alt+Space**! Thanks [@zadjii-msft](https://github.com/zadjii-msft), [@niels9001](https://github.com/niels9001), [@michael-hawker](https://github.com/michael-hawker), [@joadoumie](https://github.com/joadoumie), [@plante-msft](https://github.com/plante-msft), [@ethanfangg](https://github.com/ethanfangg) and [@krschau](https://github.com/krschau)!
- - Enhanced the Color Picker by switching from WPF UI to .NET WPF, resulting in improved themes and visual consistency across different modes. Thanks [@mantaionut](https://github.com/mantaionut)! Thanks [@Jay-o-Way](https://github.com/Jay-o-Way) and [@niels9001](https://github.com/niels9001) for helping with the review!
- - Added the ability to delete files directly from Peek, enhancing file management efficiency. Thanks [@daverayment](https://github.com/daverayment) and thanks [@htcfreek](https://github.com/htcfreek) for the review!
- - Added support for variables in template filenames, enabling dynamic elements like date components and environment variables for enhanced customization in New+. Thanks [@cgaarden](https://github.com/cgaarden)!
+### Advanced Paste
+
+ - Fixed an issue where Advanced Paste failed to create the OCR engine for certain English language tags (e.g., en-CA) by initializing the OCR engine with the user profile language. Thanks [@cryolithic](https://github.com/cryolithic)!

 ### Color Picker

- - Replaced WPF UI with .NET WPF for the Color Picker, enhancing compatibility and improving theme support. Thanks [@mantaionut](https://github.com/mantaionut)! Thanks [@Jay-o-Way](https://github.com/Jay-o-Way) and [@niels9001](https://github.com/niels9001) for helping with the review!
+ - Fixed an issue where a resource leak caused hangs or crashes by properly disposing of the Graphics object. Thanks [@dcog989](https://github.com/dcog989)!
+ - Fixed an issue where Color Picker exited on Backspace keypress by ensuring it only closes when focused and aligning Escape/Backspace behavior. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Added support for Oklab and Oklch color formats in Color Picker. Thanks [@lemonyte](https://github.com/lemonyte)!
+
+### Command Not Found
+
+ - Updated the WinGet Command Not Found script to only enable the experimental features if they actually exist.

 ### Command Palette

- Introduced the Windows Command Palette ("CmdPal"), the next iteration of PowerToys Run, designed with extensibility at its core. CmdPal includes features such as searching for installed apps, shell commands, files and WinGet package installation. This module aims to provide a more powerful and flexible launcher experience. Thanks [@zadjii-msft](https://github.com/zadjii-msft), [@niels9001](https://github.com/niels9001), [@michael-hawker](https://github.com/michael-hawker), [@joadoumie](https://github.com/joadoumie), [@plante-msft](https://github.com/plante-msft), and the whole team!
-
-### FancyZones
-
- - Fixed a bug where deleting a layout resulted in incorrect data being written to the JSON file.
- - Fixed a bug where layout hotkeys were displayed incorrectly, ensuring the hotkey list does not include invalid entries.
- - Fixed an issue where the "None" option was missing in the editor layout.
+ - Updated bug template to include Command Palette module.
+ - Fixed an issue where the toast window was not scaled for DPI, causing layout issues under display scaling.
+ - Fixed an issue where Up/Down keyboard navigation didn't move selection when caret was at position 0, and add continuous navigation like PT Run v1. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Updated the Time and Date extension code to simplify it and improve clarity.
+ - Fixed an issue where capitalization in the command causes failure when trying to go to the mouse pointer, resolved by adjusting the command to lowercase.
+ - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from Command Palette. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added setting to enable/disable system tray icon in CmdPal and align terminology with Windows 11. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed an alias update issue by removing the old alias when a new one is set.
+ - Resolved GitHub casing conflict by migrating Exts and exts into a new ext directory, ensuring consistent structure across platforms and preventing path fragmentation.
+ - Fix an issue where the 'Create New Extension' command generated empty file names.
+ - Added the ability to make the global hotkey a low-level keyboard hook.
+ - Added support for JUMBO thumbnails, enabling access to high-resolution icons.
+ - Fixed crashes when CmdPal auto-hid itself while an MSAL dialog was opened, by preventing CmdPal from hiding if it's disabled.
+ - Added support for immediately selecting search text when a page is loaded.
+ - Fixed a bug where extension settings pages failed to reload on reopen by updating the settings form when extension settings are saved.
+ - Fixed an issue where the Command Palette failed to launch from the runner.
+ - Refactored and ported the PowerToys Run v1 calculator logic into Command Palette, added settings support, and improved fallback behavior.
+ - Re-added support for list item keyboard shortcuts.
+ - Enhanced accessibility in Command Palette by adding proper labels, refining animations, improving localization, and fixed a11y related issues.
+ - Ported custom format support to the Time and Date plugin, reordered and cleaned up settings, improved error messaging, and fixed edge-case crashes for more robust and user-friendly behavior. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added fallback item for system command.
+ - Fixed a bug in Windows System Command where the key prompt incorrectly displayed "Empty" for the "Open Recycle Bin" action. Thanks [@jironemo](https://github.com/jironemo)!
+ - Fixed an issue where the 'more commands' list showed commands that shouldn't be visible. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed an issue where the details view in Command Palette displayed an oversized icon and misaligned text, aligning it with Windows Search behavior.
+ - Fixed a bug where empty screen content and command bar commands were cut off when using long labels, ensuring proper layout and visibility.
+ - Improved CmdPal’s WinGet integration by fixing version display for installed packages, enabling updates with icons, and migrating the preview winget API to a stable version.
+ - Fixed a bug where commands for ContentPage didn't update until after exit, by ensuring context menus are fully initialized when they change.
+ - Added fallback support to the TimeDate extension, enabling direct date/time queries without pre-selecting the command.
+ - Added import of Common.Dotnet.AotCompatibility.props across multiple CmdPal project files to enhance AOT compilation support.
+ - Fixed a crash in CmdPal settings caused by a null HotKey when settings.json is missing or lacks a defined hotkey. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Added support for filterable, nested context menus in CmdPal, including a search box to maintain focus behavior.
+ - Refactored CmdPal classes to improve JSON serialization and introduced new serialization contexts for better performance and maintainability.
+ - Added support for ahead-of-time (AoT) compilation.
+ - Added retry mechanism for CmdPal launch.
+ - Removed some unused files from CmdPal.Common to simplify codebase and facilitate marking it as AoT-compatible.
+ - Fixed a bug where a race condition in the update of SearchText caused the cursor in the input box to automatically jump to the end of the line, ensuring SearchText is only updated after it has actually been changed.
+ - Added support for searching any file in fallback command.
+ - Cleaned up AoT-related code to prevent duplicate operations during testing.
+ - Reduced CmdPal load time by parallelizing extension startup and adding timeouts to prevent misbehaving extensions from blocking others.
+ - Enhanced UI behavior by dismissing the details pane when the list gets emptied, avoiding inconsistent visual states.
+ - Added support to unset the fallback command in CmdPal when no matching command is found, ensuring cleaner reload behavior.
+ - Fixed a leak in the CmdPal extension template by addressing improper ComServer use.
+ - Prevented CmdPal window from maximizing on title bar double-click to maintain intended window behavior. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed an issue where the Settings UI launched too small by making window dimensions DPI-aware and enforcing minimum width and height using WinUIEx.
+ - Fixed white flash and one-time animation issues in CmdPal by cloaking the window instead of hiding it.
+ - Fixed a bug where all extension settings were fetched on startup by lazy-loading extension settings, reducing initialization overhead.
+ - Added support for protecting CmdPal from crashes on Adaptive Card parse failure.
+ - Replaced shell:AppsFolder with URI activation in CmdPal to improve reliability.
+ - Added ability to open CmdPal settings from PowerToys Settings.
+ - Added ability for CmdPal to observe and dynamically update extension details by tracking property changes on the selected item.
+ - Bumped the toolkit version used in the CmdPal extension template to 0.2.0.

 ### Image Resizer

- - Fixed warnings in ImageResizer regarding the use of variables "shellItem" and "itemName" without being initialized.
+ - Fixed an issue where deleting an Image Resizer preset removed the wrong preset.

-### Mouse Without Borders
+### Keyboard Manager

- - Enhanced the logger to properly track the file path for easier debugging.
- - Refactored the "Common" class into distinct individual classes to enhance maintainability, and updated all references and unit tests to reflect these changes. Thanks [@mikeclayton](https://github.com/mikeclayton) for this!
+ - Fixed an issue where a modifier key, when set without specifying left or right, would get stuck due to incorrect key handling, by tracking the pressed keys and sending the correct key accordingly. Thanks [@mantaionut](https://github.com/mantaionut)!

-### New+
+### PowerRename

- - Added support for variables in template filenames, including date/time components, parent folder name, and environment variables. Thanks [@cgaarden](https://github.com/cgaarden)!
-
-### Peek
-
- - Added the ability to delete the file currently being previewed in Peek, including navigation updates and handling for deleted items. Thanks [@daverayment](https://github.com/daverayment) and thanks [@htcfreek](https://github.com/htcfreek) for your help reviewing this!
+ - Enhanced PowerRename's time formatting capabilities by adding 12-hour time format patterns with AM/PM support. Thanks [@bitmap4](https://github.com/bitmap4)!

 ### PowerToys Run

- - Fixed an issue where duplicated applications were shown by ensuring the shell link helper opens .ink files non-exclusively and correctly retrieves the "FullPath". Thanks [@htcfreek](https://github.com/htcfreek) and [@davidegiacometti](https://github.com/davidegiacometti) for review!
- - Fixed an issue where applying round corners on Windows 11 build 22000 caused crashes.
- - Async the OnRename method to unblock the thread. Thanks [@davidegiacometti](https://github.com/davidegiacometti) for review!
- - Added support for using `sq` instead of `^2` in the Unit Converter. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Added support for custom formats in the "Time and Date" plugin and improves error messages for invalid input formats. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fix two crashes: one for WFT on very early dates and another for calculating the week of the month on very late dates (e.g., 31.12.9999), and reorder UI settings. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fix an issue where capitalization in the command causes failure when trying to go to the mouse pointer, resolved by adjusting the command to lowercase.
+ - Added version details to plugin error messages for 'Loading error' and 'Init error'. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Enhanced result model by adding support for preventing usage-based ordering, giving plugin developers greater control over sorting behavior. Thanks [@CoreyHayward](https://github.com/CoreyHayward) and [@htcfreek](https://github.com/htcfreek)!
+
+### Quick Accent
+
+ - Updated the letter mapping in GetDefaultLetterKeyEPO, replacing "ǔ" with "ŭ" for the VK_U key to accurately reflect Esperanto phonetics. Thanks [@OlegKharchevkin](https://github.com/OlegKharchevkin)!
+ - Fixed an issue where Quick Accent did not work properly when using the on-screen keyboard. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+
+### Registry Preview
+
+ - Enhanced Registry Preview to support pasting registry keys and values without manually writing the file header, and added a new button for resetting the app. Thanks [@htcfreek](https://github.com/htcfreek)!

 ### Settings

- - Disabled the spell check feature in the text boxes of plugin settings for PowerToys Run. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Fixed an issue where InfoBars for release notes errors were not displayed properly, and added a retry button. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fix an issue where the Settings app randomly showed a blank icon in the taskbar by deferring icon assignment until the window is activated.
+ - Added the ability to maximize the "What's New" window for a more comfortable reading experience.

 ### Workspaces

- - Fixed an issue where some minimized packaged apps (e.g., Microsoft ToDo, Settings) were not snapshotted.
+ - Fixed bugs where Steam games were not captured or launched correctly by updating window filtering and integrating Steam URL protocol handling.

 ### Documentation

- - Added the FirefoxBookmark plugin to the list of Third-Party plugins for PowerToys Run. Thanks [@8LWXpg](https://github.com/8LWXpg)!
- - Added the SVGL third-party plugin to PowerToys Run, enabling users to search, browse, and copy SVG logos. Thanks [@SameerJS6](https://github.com/SameerJS6)!
- - Added Monaco usage for the Registry Preview.
+ - Added QuickNotes to the third-party plugins documentation for PowerToys Run. Thanks [@ruslanlap](https://github.com/ruslanlap)!
+ - Added Weather and Pomodoro plugins to the PowerToys Run third-party plugin documentation. Thanks [@ruslanlap](https://github.com/ruslanlap)!
+ - Added the Linear plugin to PowerToys Run's third-party plugin documentation. Thanks [@vednig](https://github.com/vednig)!
+ - Fixed formatting issues in documentation files and updated contributor and team member information. Thanks [@DanielEScherzer](https://github.com/DanielEScherzer) and [@RokyZevon](https://github.com/RokyZevon)!

 ### Development

- - Updated WinGet configuration file location and extension. Thanks [@mdanish-kh](https://github.com/mdanish-kh)!
- - Removed the Markdown file bypass to ensure CI runs for commits that only update Markdown files.
- - Fixed an issue where the default generated file path exceeded the length limit of 260 characters for EnvironmentVariablesUILib.csproj, causing build failures.
- - Upgraded WindowsAppSDK to 1.6.250205002 and CsWinRT to 2.2.0. Thanks [@htcfreek](https://github.com/htcfreek) for review!
- - Upgraded XamlStyler to 3.2501.8 and dotnet-consolidate to 4.2.0. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Updated .NET Packages from 9.0.2 to 9.0.3.
- - Optimized the UI Test Automation Framework and added UI test cases for the Hosts File Editor module.
- - Added fuzz testing for RegistryPreview.
- - Added new UI tests for the FancyZones editor, including tests for creating, duplicating, editing, and deleting layouts.
- - Added telemetry code to measure the module editor open time and evaluate the benefits of applying AOT.
+ - Updated GitHub Action to install .NET 9 for MSStore release support.
+ - Updated version placeholder in bug_report.yml to prevent incorrect v0.70.0 versioning in issue reports.
+ - Updated GitHub Action to upgrade actions/setup-dotnet from version 3 to version 4 for MSStore release.
+ - Added securityContext to WinGet configuration files, allowing invocation from user context and prompting a single UAC for elevated resources in a separate process. Thanks [@mdanish-kh](https://github.com/mdanish-kh)!
+ - Changed log file extensions from .txt to .log to support proper file associations and tooling compatibility, and added logs for Workspace. Thanks [@benwa](https://github.com/benwa)!
+ - Upgraded testing framework dependencies and aligned package versions across components.
+ - Upgraded dependencies to fix vulnerabilities.
+ - Enhanced repository security by pinning GitHub Actions and Docker tags to immutable full-length commits and integrating automated dependency vulnerability scanning via Dependency Review Workflow. Thanks [@Nick2bad4u](https://github.com/Nick2bad4u)!
+ - Upgraded Boost dependencies to a newer version.
+ - Upgraded toolkit to the latest version, suppressed AoT-related warnings.
+ - Fixed an issue where missing signing for newly added files caused build failures.
+ - Update release pipeline to prevent publishing private symbols for 100 years.
+ - Introduced fuzzing for PowerRename to improve reliability and added setup guidance for extending fuzzing to other C++ modules.
+ - Added centralized pre-creation of generated folders for all .csproj projects to prevent build failures.
+ - Updated WinAppSDK to the latest 1.7 version.
+ - Upgraded Boost dependencies to the latest version for the PowerRename Fuzzing project.
+ - Updated the ADO area path in tsa.json to resolve TSA pipeline errors caused by a deprecated path.
+ - Initiated AoT support for CmdPal with foundational work in progress.
+  
+### Tool/General

+ - Added support for automating bug report creation by generating a pre-filled GitHub issue URL with system and diagnostic information. Thanks [@donlaci](https://github.com/donlaci)!
+ - Added scripts to locally build the installer, ensuring the CmdPal can also be launched in a local environment.
+ - Removed export PFX logic to eliminate hardcoded password usage and resolve PSScriptAnalyzer security warning.
+ - Added PowerShell script and CI integration to enforce consistent use of Common.Dotnet.CsWinRT.props across all C# projects under the src folder.
+   
+### What is being planned for version 0.92

- 
-### What is being planned for version 0.91
+For [v0.92][github-next-release-work], we'll work on the items below:

-For [v0.91][github-next-release-work], we'll work on the items below:
-
- - New module: File Actions Menu
+ - Continued Command Palette polish
 - New UI Automation tests
 - Working on installer upgrades
 - Upgrading Keyboard Manager's editor UI
--- a/src/Common.Dotnet.AotCompatibility.props
+++ b/src/Common.Dotnet.AotCompatibility.props
@@ -7,6 +7,6 @@
    <CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>

    <!-- Suppress DynamicallyAccessedMemberTypes.PublicParameterlessConstructor in fallback code path of Windows SDK projection -->
-    <WarningsNotAsErrors>IL2081, CsWinRT1028</WarningsNotAsErrors>
+    <WarningsNotAsErrors>IL2081</WarningsNotAsErrors>
  </PropertyGroup>
 </Project>
--- a/src/Common.Dotnet.FuzzTest.props
+++ b/src/Common.Dotnet.FuzzTest.props
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Some items may be set in Directory.Build.props in root -->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- OneFuzz does not currently support testing with .NET 9.
-       As a temporary workaround, create a .NET 8 project and use file links 
-       to include the code that needs testing. -->
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-  </PropertyGroup>
-</Project>
--- a/src/common/ManagedCommon/Logger.cs
+++ b/src/common/ManagedCommon/Logger.cs
@@ -28,7 +28,9 @@ namespace ManagedCommon
         * If you want to publish it with Native AOT enabled (or publish as a single file).
         * You need to find another way to remove Assembly.Location usage.
         */
-        private static readonly string Version = "2.0.0.0";
+#pragma warning disable IL3000 // Avoid accessing Assembly file path when publishing as a single file
+        private static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location).ProductVersion;
+#pragma warning restore IL3000 // Avoid accessing Assembly file path when publishing as a single file

        /// <summary>
        /// Initializes the logger and sets the path for logging.
--- a/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
+++ b/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
@@ -37,6 +37,17 @@ namespace Microsoft.PowerToys.Telemetry
        public void WriteEvent<T>(T telemetryEvent)
            where T : EventBase, IEvent
        {
+            if (DataDiagnosticsSettings.GetEnabledValue())
+            {
+                this.Write<T>(
+                    telemetryEvent.EventName,
+                    new EventSourceOptions()
+                    {
+                        Keywords = ProjectKeywordMeasure,
+                        Tags = ProjectTelemetryTagProductAndServicePerformance,
+                    },
+                    telemetryEvent);
+            }
        }
    }
 }
--- a/src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/AdvancedPaste.FuzzTests.csproj
+++ b/src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/AdvancedPaste.FuzzTests.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<!-- Look at Directory.Build.props in root for common stuff as well -->
-	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-	<Import Project="..\..\..\Common.Dotnet.FuzzTest.props" />
 	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
--- a/src/modules/Hosts/Hosts.FuzzTests/Hosts.FuzzTests.csproj
+++ b/src/modules/Hosts/Hosts.FuzzTests/Hosts.FuzzTests.csproj
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<!-- Look at Directory.Build.props in root for common stuff as well -->
-	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-	<Import Project="..\..\..\Common.Dotnet.FuzzTest.props" />
-
 	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
--- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Program.cs
+++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Program.cs
@@ -14,12 +14,11 @@ namespace TemplateCmdPalExtension;
 public class Program
 {
    [MTAThread]
-    public static void Main(string[] args)
+    public static async Task Main(string[] args)
    {
        if (args.Length > 0 && args[0] == "-RegisterProcessAsComServer")
        {
-            global::Shmuelie.WinRTServer.ComServer server = new();
-
+            await using global::Shmuelie.WinRTServer.ComServer server = new();
            ManualResetEvent extensionDisposedEvent = new(false);
            
            // We are instantiating an extension instance once above, and returning it every time the callback in RegisterExtension below is called.
@@ -32,8 +31,6 @@ public class Program
            // This will make the main thread wait until the event is signalled by the extension class.
            // Since we have single instance of the extension object, we exit as soon as it is disposed.
            extensionDisposedEvent.WaitOne();
-            server.Stop();
-            server.UnsafeDispose();
        }
        else
        {
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Assets/template.zip
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Assets/template.zip
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandItemViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandItemViewModel.cs
@@ -190,7 +190,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
            contextItem.SlowInitializeProperties();
        });

-        if (!string.IsNullOrEmpty(model.Command?.Name))
+        if (!string.IsNullOrEmpty(model.Command.Name))
        {
            _defaultCommandContextItem = new(new CommandContextItem(model.Command!), PageContext)
            {
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs
@@ -5,6 +5,7 @@
 using System.Collections.Immutable;
 using System.Collections.Specialized;
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.CmdPal.Ext.Apps;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -36,6 +37,15 @@ public partial class MainListPage : DynamicListPage,

        // The all apps page will kick off a BG thread to start loading apps.
        // We just want to know when it is done.
+        var allApps = AllAppsCommandProvider.Page;
+        allApps.PropChanged += (s, p) =>
+        {
+            if (p.PropertyName == nameof(allApps.IsLoading))
+            {
+                IsLoading = ActuallyLoading();
+            }
+        };
+
        WeakReferenceMessenger.Default.Register<ClearSearchMessage>(this);
        WeakReferenceMessenger.Default.Register<UpdateFallbackItemsMessage>(this);

@@ -113,7 +123,8 @@ public partial class MainListPage : DynamicListPage,
            // with a list of all our commands & apps.
            if (_filteredItems == null)
            {
-                _filteredItems = commands;
+                IEnumerable<IListItem> apps = AllAppsCommandProvider.Page.GetItems();
+                _filteredItems = commands.Concat(apps);
            }

            // Produce a list of everything that matches the current filter.
@@ -145,7 +156,8 @@ public partial class MainListPage : DynamicListPage,
    private bool ActuallyLoading()
    {
        var tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
-        return tlcManager.IsLoading;
+        var allApps = AllAppsCommandProvider.Page;
+        return allApps.IsLoading || tlcManager.IsLoading;
    }

    // Almost verbatim ListHelpers.ScoreListItem, but also accounting for the
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs
@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.

 using System.Text.Json;
+using AdaptiveCards.ObjectModel.WinUI3;
+using AdaptiveCards.Templating;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Models;
@@ -24,11 +26,121 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag

    public string DataJson { get; protected set; } = "{}";

+    public AdaptiveCardParseResult? Card { get; private set; }
+
    public override void InitializeProperties()
    {
+        var model = _formModel.Unsafe;
+        if (model == null)
+        {
+            return;
+        }
+
+        try
+        {
+            TemplateJson = model.TemplateJson;
+            StateJson = model.StateJson;
+            DataJson = model.DataJson;
+
+            AdaptiveCardTemplate template = new(TemplateJson);
+            var cardJson = template.Expand(DataJson);
+            Card = AdaptiveCard.FromJsonString(cardJson);
+        }
+        catch (Exception e)
+        {
+            // If we fail to parse the card JSON, then display _our own card_
+            // with the exception
+            AdaptiveCardTemplate template = new(ErrorCardJson);
+            var serializeString = (string? s) => JsonSerializer.Serialize(s, JsonSerializationContext.Default.String);
+
+            // todo: we could probably stick Card.Errors in there too
+            var dataJson = $$"""
+{
+    "error_message": {{serializeString(e.Message)}},
+    "error_stack": {{serializeString(e.StackTrace)}},
+    "inner_exception": {{serializeString(e.InnerException?.Message)}},
+    "template_json": {{serializeString(TemplateJson)}},
+    "data_json": {{serializeString(DataJson)}}
+}
+""";
+            var cardJson = template.Expand(dataJson);
+            Card = AdaptiveCard.FromJsonString(cardJson);
+        }
+
+        UpdateProperty(nameof(Card));
    }

-    public void HandleSubmit()
+    public void HandleSubmit(IAdaptiveActionElement action, JsonObject inputs)
    {
+        if (action is AdaptiveOpenUrlAction openUrlAction)
+        {
+            WeakReferenceMessenger.Default.Send<LaunchUriMessage>(new(openUrlAction.Url));
+            return;
+        }
+
+        if (action is AdaptiveSubmitAction or AdaptiveExecuteAction)
+        {
+            // Get the data and inputs
+            var dataString = (action as AdaptiveSubmitAction)?.DataJson.Stringify() ?? string.Empty;
+            var inputString = inputs.Stringify();
+
+            _ = Task.Run(() =>
+            {
+                try
+                {
+                    var model = _formModel.Unsafe!;
+                    if (model != null)
+                    {
+                        var result = model.SubmitForm(inputString, dataString);
+                        WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
+                    }
+                }
+                catch (Exception ex)
+                {
+                    ShowException(ex);
+                }
+            });
+        }
    }
+
+    private static readonly string ErrorCardJson = """
+{
+    "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+    "type": "AdaptiveCard",
+    "version": "1.5",
+    "body": [
+        {
+            "type": "TextBlock",
+            "text": "Error parsing form from extension",
+            "wrap": true,
+            "style": "heading",
+            "size": "ExtraLarge",
+            "weight": "Bolder",
+            "color": "Attention"
+        },
+        {
+            "type": "TextBlock",
+            "wrap": true,
+            "text": "${error_message}",
+            "color": "Attention"
+        },
+        {
+            "type": "TextBlock",
+            "text": "${error_stack}",
+            "fontType": "Monospace"
+        },
+        {
+            "type": "TextBlock",
+            "wrap": true,
+            "text": "Inner exception:"
+        },
+        {
+            "type": "TextBlock",
+            "wrap": true,
+            "text": "${inner_exception}",
+            "color": "Attention"
+        }
+    ]
+}
+""";
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ListViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ListViewModel.cs
@@ -328,19 +328,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
    }

    [RelayCommand]
-    private void UpdateSelectedItem(ListItemViewModel? item)
-    {
-        if (item != null)
-        {
-            SetSelectedItem(item);
-        }
-        else
-        {
-            ClearSelectedItem();
-        }
-    }
-
-    private void SetSelectedItem(ListItemViewModel item)
+    private void UpdateSelectedItem(ListItemViewModel item)
    {
        if (!item.SafeSlowInit())
        {
@@ -369,23 +357,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
           });
    }

-    private void ClearSelectedItem()
-    {
-        // GH #322:
-        // For inexplicable reasons, if you try updating the command bar and
-        // the details on the same UI thread tick as updating the list, we'll
-        // explode
-        DoOnUiThread(
-           () =>
-           {
-               WeakReferenceMessenger.Default.Send<UpdateCommandBarMessage>(new(null));
-
-               WeakReferenceMessenger.Default.Send<HideDetailsMessage>();
-
-               TextToSuggest = string.Empty;
-           });
-    }
-
    public override void InitializeProperties()
    {
        base.InitializeProperties();
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj
@@ -17,6 +17,8 @@
  <ItemGroup>
    <PackageReference Include="CommunityToolkit.Common" />
    <PackageReference Include="CommunityToolkit.Mvvm" />
+    <PackageReference Include="AdaptiveCards.Templating" />
+    <PackageReference Include="AdaptiveCards.ObjectModel.WinUI3" GeneratePathProperty="true" />

    <PackageReference Include="Microsoft.Windows.CsWin32">
      <PrivateAssets>all</PrivateAssets>
@@ -31,6 +33,8 @@
    <ProjectReference Include="..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
    <ProjectReference Include="..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />

+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj" />
+
    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />

  </ItemGroup>
@@ -71,9 +75,9 @@
    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
    <PublishTrimmed>true</PublishTrimmed>
    <PublishSingleFile>true</PublishSingleFile>
-    --><!--<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>--><!-- 
+    --><!-- <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling> --><!--
    <PublishAot>true</PublishAot>
-	  <EnableMsixTooling>true</EnableMsixTooling>
+	<EnableMsixTooling>true</EnableMsixTooling>
  </PropertyGroup>-->

 </Project>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelCommandManager.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelCommandManager.cs
@@ -4,7 +4,6 @@

 using System.Collections.Immutable;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
@@ -54,44 +53,53 @@ public partial class TopLevelCommandManager : ObservableObject,
        {
            CommandProviderWrapper wrapper = new(provider, _taskScheduler);
            _builtInCommands.Add(wrapper);
-            var commands = await LoadTopLevelCommandsFromProvider(wrapper);
-            lock (TopLevelCommands)
-            {
-                foreach (var c in commands)
-                {
-                    TopLevelCommands.Add(c);
-                }
-            }
+            await LoadTopLevelCommandsFromProvider(wrapper);
        }

        return true;
    }

    // May be called from a background thread
-    private async Task<IEnumerable<TopLevelViewModel>> LoadTopLevelCommandsFromProvider(CommandProviderWrapper commandProvider)
+    private async Task LoadTopLevelCommandsFromProvider(CommandProviderWrapper commandProvider)
    {
        WeakReference<IPageContext> weakSelf = new(this);

        await commandProvider.LoadTopLevelCommands(_serviceProvider, weakSelf);

        var settings = _serviceProvider.GetService<SettingsModel>()!;
-
-        List<TopLevelViewModel> commands = [];
-
-        foreach (var item in commandProvider.TopLevelItems)
+        var makeAndAdd = (ICommandItem? i, bool fallback) =>
        {
-            commands.Add(item);
-        }
+            var commandItemViewModel = new CommandItemViewModel(new(i), weakSelf);
+            var topLevelViewModel = new TopLevelViewModel(commandItemViewModel, fallback, commandProvider.ExtensionHost, commandProvider.ProviderId, settings, _serviceProvider);

-        foreach (var item in commandProvider.FallbackItems)
-        {
-            commands.Add(item);
-        }
+            lock (TopLevelCommands)
+            {
+                TopLevelCommands.Add(topLevelViewModel);
+            }
+        };
+
+        await Task.Factory.StartNew(
+            () =>
+            {
+                lock (TopLevelCommands)
+                {
+                    foreach (var item in commandProvider.TopLevelItems)
+                    {
+                        TopLevelCommands.Add(item);
+                    }
+
+                    foreach (var item in commandProvider.FallbackItems)
+                    {
+                        TopLevelCommands.Add(item);
+                    }
+                }
+            },
+            CancellationToken.None,
+            TaskCreationOptions.None,
+            _taskScheduler);

        commandProvider.CommandsChanged -= CommandProvider_CommandsChanged;
        commandProvider.CommandsChanged += CommandProvider_CommandsChanged;
-
-        return commands;
    }

    // By all accounts, we're already on a background thread (the COM call
@@ -231,71 +239,25 @@ public partial class TopLevelCommandManager : ObservableObject,

    private async Task StartExtensionsAndGetCommands(IEnumerable<IExtensionWrapper> extensions)
    {
-        var timer = new Stopwatch();
-        timer.Start();
-
-        // Start all extensions in parallel
-        var startTasks = extensions.Select(StartExtensionWithTimeoutAsync);
-
-        // Wait for all extensions to start
-        var wrappers = (await Task.WhenAll(startTasks)).Where(wrapper => wrapper != null).Select(w => w!).ToList();
-
-        foreach (var wrapper in wrappers)
+        // TODO This most definitely needs a lock
+        foreach (var extension in extensions)
        {
-            _extensionCommandProviders.Add(wrapper!);
-        }
-
-        // Load the commands from the providers in parallel
-        var loadTasks = wrappers.Select(LoadCommandsWithTimeoutAsync);
-
-        var commandSets = (await Task.WhenAll(loadTasks)).Where(results => results != null).Select(r => r!).ToList();
-
-        lock (TopLevelCommands)
-        {
-            foreach (var commands in commandSets)
+            Logger.LogDebug($"Starting {extension.PackageFullName}");
+            try
            {
-                foreach (var c in commands)
-                {
-                    TopLevelCommands.Add(c);
-                }
+                // start it ...
+                await extension.StartExtensionAsync();
+
+                // ... and fetch the command provider from it.
+                CommandProviderWrapper wrapper = new(extension, _taskScheduler);
+                _extensionCommandProviders.Add(wrapper);
+                await LoadTopLevelCommandsFromProvider(wrapper);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(ex.ToString());
            }
        }
-
-        timer.Stop();
-        Logger.LogDebug($"Loading extensions took {timer.ElapsedMilliseconds} ms");
-    }
-
-    private async Task<CommandProviderWrapper?> StartExtensionWithTimeoutAsync(IExtensionWrapper extension)
-    {
-        Logger.LogDebug($"Starting {extension.PackageFullName}");
-        try
-        {
-            await extension.StartExtensionAsync().WaitAsync(TimeSpan.FromSeconds(10));
-            return new CommandProviderWrapper(extension, _taskScheduler);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"Failed to start extension {extension.PackageFullName}: {ex}");
-            return null; // Return null for failed extensions
-        }
-    }
-
-    private async Task<IEnumerable<TopLevelViewModel>?> LoadCommandsWithTimeoutAsync(CommandProviderWrapper wrapper)
-    {
-        try
-        {
-            return await LoadTopLevelCommandsFromProvider(wrapper!).WaitAsync(TimeSpan.FromSeconds(10));
-        }
-        catch (TimeoutException)
-        {
-            Logger.LogError($"Loading commands from {wrapper!.ExtensionHost?.Extension?.PackageFullName} timed out");
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"Failed to load commands for extension {wrapper!.ExtensionHost?.Extension?.PackageFullName}: {ex}");
-        }
-
-        return null;
    }

    private void ExtensionService_OnExtensionRemoved(IExtensionService sender, IEnumerable<IExtensionWrapper> extensions)
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs
@@ -2,13 +2,23 @@
 // The 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 ManagedCommon;
 using Microsoft.CmdPal.Common.Helpers;
 using Microsoft.CmdPal.Common.Services;
 using Microsoft.CmdPal.Ext.Apps;
-
+using Microsoft.CmdPal.Ext.Bookmarks;
+using Microsoft.CmdPal.Ext.Calc;
 using Microsoft.CmdPal.Ext.Indexer;
+using Microsoft.CmdPal.Ext.Registry;
 using Microsoft.CmdPal.Ext.Shell;
+using Microsoft.CmdPal.Ext.System;
+using Microsoft.CmdPal.Ext.TimeDate;
+using Microsoft.CmdPal.Ext.WebSearch;
+using Microsoft.CmdPal.Ext.WindowsServices;
+using Microsoft.CmdPal.Ext.WindowsSettings;
+using Microsoft.CmdPal.Ext.WindowsTerminal;
+using Microsoft.CmdPal.Ext.WindowWalker;
+using Microsoft.CmdPal.Ext.WinGet;
 using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.BuiltinCommands;
 using Microsoft.CmdPal.UI.ViewModels.Models;
@@ -99,19 +109,41 @@ public partial class App : Application
        // Built-in Commands. Order matters - this is the order they'll be presented by default.
        var allApps = new AllAppsCommandProvider();
        services.AddSingleton<ICommandProvider>(allApps);
-
        services.AddSingleton<ICommandProvider, ShellCommandsProvider>();
+        services.AddSingleton<ICommandProvider, CalculatorCommandProvider>();
        services.AddSingleton<ICommandProvider, IndexerCommandsProvider>();
+        services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();

        // TODO GH #527 re-enable the clipboard commands
        // services.AddSingleton<ICommandProvider, ClipboardHistoryCommandsProvider>();
+        services.AddSingleton<ICommandProvider, WindowWalkerCommandsProvider>();
+        services.AddSingleton<ICommandProvider, WebSearchCommandsProvider>();

        // GH #38440: Users might not have WinGet installed! Or they might have
        // a ridiculously old version. Or might be running as admin.
        // We shouldn't explode in the App ctor if we fail to instantiate an
        // instance of PackageManager, which will happen in the static ctor
        // for WinGetStatics
+        try
+        {
+            var winget = new WinGetExtensionCommandsProvider();
+            var callback = allApps.LookupApp;
+            winget.SetAllLookup(callback);
+            services.AddSingleton<ICommandProvider>(winget);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError("Couldn't load winget");
+            Logger.LogError(ex.ToString());
+        }
+
+        services.AddSingleton<ICommandProvider, WindowsTerminalCommandsProvider>();
+        services.AddSingleton<ICommandProvider, WindowsSettingsCommandsProvider>();
+        services.AddSingleton<ICommandProvider, RegistryCommandsProvider>();
+        services.AddSingleton<ICommandProvider, WindowsServicesCommandsProvider>();
        services.AddSingleton<ICommandProvider, BuiltInsCommandProvider>();
+        services.AddSingleton<ICommandProvider, TimeDateCommandsProvider>();
+        services.AddSingleton<ICommandProvider, SystemCommandExtensionProvider>();

        // Models
        services.AddSingleton<TopLevelCommandManager>();
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/AdaptiveCardsConfig.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/AdaptiveCardsConfig.cs
@@ -0,0 +1,342 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using AdaptiveCards.Rendering.WinUI3;
+
+namespace Microsoft.CmdPal.UI.Controls;
+
+public sealed class AdaptiveCardsConfig
+{
+    public static AdaptiveHostConfig Light { get; }
+
+    public static AdaptiveHostConfig Dark { get; }
+
+    static AdaptiveCardsConfig()
+    {
+        Light = AdaptiveHostConfig.FromJsonString(LightHostConfigString).HostConfig;
+        Dark = AdaptiveHostConfig.FromJsonString(DarkHostConfigString).HostConfig;
+    }
+
+    public static readonly string DarkHostConfigString = """
+{
+  "spacing": {
+    "small": 4,
+    "default": 8,
+    "medium": 20,
+    "large": 30,
+    "extraLarge": 40,
+    "padding": 8
+  },
+  "separator": {
+    "lineThickness": 0,
+    "lineColor": "#C8FFFFFF"
+  },
+  "supportsInteractivity": true,
+  "fontTypes": {
+    "default": {
+      "fontFamily": "'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif",
+      "fontSizes": {
+        "small": 12,
+        "default": 12,
+        "medium": 14,
+        "large": 20,
+        "extraLarge": 26
+      },
+      "fontWeights": {
+        "lighter": 200,
+        "default": 400,
+        "bolder": 600
+      }
+    },
+    "monospace": {
+      "fontFamily": "'Courier New', Courier, monospace",
+      "fontSizes": {
+        "small": 12,
+        "default": 12,
+        "medium": 14,
+        "large": 18,
+        "extraLarge": 26
+      },
+      "fontWeights": {
+        "lighter": 200,
+        "default": 400,
+        "bolder": 600
+      }
+    }
+  },
+  "containerStyles": {
+    "default": {
+      "backgroundColor": "#00000000",
+      "borderColor": "#00000000",
+      "foregroundColors": {
+        "default": {
+          "default": "#FFFFFF",
+          "subtle": "#C8FFFFFF"
+        },
+        "accent": {
+          "default": "#0063B1",
+          "subtle": "#880063B1"
+        },
+        "attention": {
+          "default": "#FF5555",
+          "subtle": "#DDFF5555"
+        },
+        "good": {
+          "default": "#54a254",
+          "subtle": "#DD54a254"
+        },
+        "warning": {
+          "default": "#c3ab23",
+          "subtle": "#DDc3ab23"
+        }
+      }
+    },
+    "emphasis": {
+      "backgroundColor": "#09FFFFFF",
+      "borderColor": "#09FFFFFF",
+      "foregroundColors": {
+        "default": {
+          "default": "#FFFFFF",
+          "subtle": "#C8FFFFFF"
+        },
+        "accent": {
+          "default": "#2E89FC",
+          "subtle": "#882E89FC"
+        },
+        "attention": {
+          "default": "#FF5555",
+          "subtle": "#DDFF5555"
+        },
+        "good": {
+          "default": "#54a254",
+          "subtle": "#DD54a254"
+        },
+        "warning": {
+          "default": "#c3ab23",
+          "subtle": "#DDc3ab23"
+        }
+      }
+    }
+  },
+  "imageSizes": {
+    "small": 16,
+    "medium": 24,
+    "large": 32
+  },
+  "actions": {
+    "maxActions": 5,
+    "spacing": "default",
+    "buttonSpacing": 8,
+    "showCard": {
+      "actionMode": "inline",
+      "inlineTopMargin": 8
+    },
+    "actionsOrientation": "horizontal",
+    "actionAlignment": "stretch"
+  },
+  "adaptiveCard": {
+    "allowCustomStyle": false
+  },
+  "imageSet": {
+    "imageSize": "medium",
+    "maxImageHeight": 100
+  },
+  "factSet": {
+    "title": {
+      "color": "default",
+      "size": "default",
+      "isSubtle": false,
+      "weight": "bolder",
+      "wrap": true,
+      "maxWidth": 150
+    },
+    "value": {
+      "color": "default",
+      "size": "default",
+      "isSubtle": false,
+      "weight": "default",
+      "wrap": true
+    },
+    "spacing": 8
+  },
+  "textStyles": {
+    "heading": {
+      "size": "large",
+      "weight": "bolder",
+      "color": "default",
+      "isSubtle": false,
+      "fontType": "default"
+    },
+    "columnHeader": {
+      "size": "medium",
+      "weight": "bolder",
+      "color": "default",
+      "isSubtle": false,
+      "fontType": "default"
+    }
+  }
+}
+""";
+
+    public static readonly string LightHostConfigString = """
+{
+  "spacing": {
+    "small": 4,
+    "default": 8,
+    "medium": 20,
+    "large": 30,
+    "extraLarge": 40,
+    "padding": 8
+  },
+  "separator": {
+    "lineThickness": 0,
+    "lineColor": "#606060"
+  },
+  "supportsInteractivity": true,
+  "fontTypes": {
+    "default": {
+      "fontFamily": "'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif",
+      "fontSizes": {
+        "small": 12,
+        "default": 12,
+        "medium": 14,
+        "large": 20,
+        "extraLarge": 26
+      },
+      "fontWeights": {
+        "lighter": 200,
+        "default": 400,
+        "bolder": 600
+      }
+    },
+    "monospace": {
+      "fontFamily": "'Courier New', Courier, monospace",
+      "fontSizes": {
+        "small": 12,
+        "default": 12,
+        "medium": 14,
+        "large": 18,
+        "extraLarge": 26
+      },
+      "fontWeights": {
+        "lighter": 200,
+        "default": 400,
+        "bolder": 600
+      }
+    }
+  },
+  "containerStyles": {
+    "default": {
+      "backgroundColor": "#00000000",
+      "borderColor": "#00000000",
+      "foregroundColors": {
+        "default": {
+          "default": "#E6000000",
+          "subtle": "#99000000"
+        },
+        "accent": {
+          "default": "#0063B1",
+          "subtle": "#880063B1"
+        },
+        "attention": {
+          "default": "#C00000",
+          "subtle": "#DDC00000"
+        },
+        "good": {
+          "default": "#54a254",
+          "subtle": "#DD54a254"
+        },
+        "warning": {
+          "default": "#c3ab23",
+          "subtle": "#DDc3ab23"
+        }
+      }
+    },
+    "emphasis": {
+      "backgroundColor": "#80F6F6F6",
+      "borderColor": "#80F6F6F6",
+      "foregroundColors": {
+        "default": {
+          "default": "#E6000000",
+          "subtle": "#99000000"
+        },
+        "accent": {
+          "default": "#2E89FC",
+          "subtle": "#882E89FC"
+        },
+        "attention": {
+          "default": "#C00000",
+          "subtle": "#DDC00000"
+        },
+        "good": {
+          "default": "#54a254",
+          "subtle": "#DD54a254"
+        },
+        "warning": {
+          "default": "#c3ab23",
+          "subtle": "#DDc3ab23"
+        }
+      }
+    }
+  },
+  "imageSizes": {
+    "small": 16,
+    "medium": 24,
+    "large": 32
+  },
+  "actions": {
+    "maxActions": 5,
+    "spacing": "default",
+    "buttonSpacing": 8,
+    "showCard": {
+      "actionMode": "inline",
+      "inlineTopMargin": 8
+    },
+    "actionsOrientation": "horizontal",
+    "actionAlignment": "stretch"
+  },
+  "adaptiveCard": {
+    "allowCustomStyle": false
+  },
+  "imageSet": {
+    "imageSize": "medium",
+    "maxImageHeight": 100
+  },
+  "factSet": {
+    "title": {
+      "color": "default",
+      "size": "default",
+      "isSubtle": false,
+      "weight": "bolder",
+      "wrap": true,
+      "maxWidth": 150
+    },
+    "value": {
+      "color": "default",
+      "size": "default",
+      "isSubtle": false,
+      "weight": "default",
+      "wrap": true
+    },
+    "spacing": 8
+  },
+  "textStyles": {
+    "heading": {
+      "size": "large",
+      "weight": "bolder",
+      "color": "default",
+      "isSubtle": false,
+      "fontType": "default"
+    },
+    "columnHeader": {
+      "size": "medium",
+      "weight": "bolder",
+      "color": "default",
+      "isSubtle": false,
+      "fontType": "default"
+    }
+  }
+}
+""";
+}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContentFormControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContentFormControl.xaml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Microsoft.CmdPal.UI.Controls.ContentFormControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.CmdPal.UI.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    xmlns:viewmodels="using:Microsoft.CmdPal.UI.ViewModels"
+    Background="Transparent"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <ResourceDictionary x:Name="CardOverrideStyles">
+            <Style x:Key="Adaptive.TextBlock" TargetType="TextBlock">
+                <Setter Property="IsTextSelectionEnabled" Value="True" />
+            </Style>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <Grid x:Name="ContentGrid" />
+</UserControl>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContentFormControl.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContentFormControl.xaml.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using AdaptiveCards.ObjectModel.WinUI3;
+using AdaptiveCards.Rendering.WinUI3;
+using Microsoft.CmdPal.UI.ViewModels;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.CmdPal.UI.Controls;
+
+public sealed partial class ContentFormControl : UserControl
+{
+    private static readonly AdaptiveCardRenderer _renderer;
+    private ContentFormViewModel? _viewModel;
+
+    // LOAD-BEARING: if you don't hang onto a reference to the RenderedAdaptiveCard
+    // then the GC might clean it up sometime, even while the card is in the UI
+    // tree. If this gets GC'd, then it'll revoke our Action handler, and the
+    // form will do seemingly nothing.
+    private RenderedAdaptiveCard? _renderedCard;
+
+    public ContentFormViewModel? ViewModel { get => _viewModel; set => AttachViewModel(value); }
+
+    static ContentFormControl()
+    {
+        // We can't use `CardOverrideStyles` here yet, because we haven't called InitializeComponent once.
+        // But also, the default value isn't `null` here. It's... some other default empty value.
+        // So clear it out so that we know when the first time we get created is
+        _renderer = new AdaptiveCardRenderer()
+        {
+            OverrideStyles = null,
+        };
+    }
+
+    public ContentFormControl()
+    {
+        this.InitializeComponent();
+        var lightTheme = ActualTheme == Microsoft.UI.Xaml.ElementTheme.Light;
+        _renderer.HostConfig = lightTheme ? AdaptiveCardsConfig.Light : AdaptiveCardsConfig.Dark;
+
+        // 5% BODGY: if we set this multiple times over the lifetime of the app,
+        // then the second call will explode, because "CardOverrideStyles is already the child of another element".
+        // SO only set this once.
+        if (_renderer.OverrideStyles == null)
+        {
+            _renderer.OverrideStyles = CardOverrideStyles;
+        }
+
+        // TODO in the future, we should handle ActualThemeChanged and replace
+        // our rendered card with one for that theme. But today is not that day
+    }
+
+    private void AttachViewModel(ContentFormViewModel? vm)
+    {
+        if (_viewModel != null)
+        {
+            _viewModel.PropertyChanged -= ViewModel_PropertyChanged;
+        }
+
+        _viewModel = vm;
+
+        if (_viewModel != null)
+        {
+            _viewModel.PropertyChanged += ViewModel_PropertyChanged;
+
+            var c = _viewModel.Card;
+            if (c != null)
+            {
+                DisplayCard(c);
+            }
+        }
+    }
+
+    private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+    {
+        if (ViewModel == null)
+        {
+            return;
+        }
+
+        if (e.PropertyName == nameof(ViewModel.Card))
+        {
+            var c = ViewModel.Card;
+            if (c != null)
+            {
+                DisplayCard(c);
+            }
+        }
+    }
+
+    private void DisplayCard(AdaptiveCardParseResult result)
+    {
+        _renderedCard = _renderer.RenderAdaptiveCard(result.AdaptiveCard);
+        ContentGrid.Children.Clear();
+        if (_renderedCard.FrameworkElement != null)
+        {
+            ContentGrid.Children.Add(_renderedCard.FrameworkElement);
+        }
+
+        _renderedCard.Action += Rendered_Action;
+    }
+
+    private void Rendered_Action(RenderedAdaptiveCard sender, AdaptiveActionEventArgs args) =>
+        ViewModel?.HandleSubmit(args.Action, args.Inputs.AsJson());
+}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/HotkeySettingsControlHook.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/HotkeySettingsControlHook.cs
@@ -12,7 +12,7 @@ public delegate bool IsActive();

 public delegate bool FilterAccessibleKeyboardEvents(int key, UIntPtr extraInfo);

-public partial class HotkeySettingsControlHook : IDisposable
+public class HotkeySettingsControlHook : IDisposable
 {
    private const int WmKeyDown = 0x100;
    private const int WmKeyUp = 0x101;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/NativeKeyboardHelper.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/NativeKeyboardHelper.cs
@@ -5,81 +5,82 @@
 using System;
 using System.Runtime.InteropServices;

-namespace Microsoft.PowerToys.Settings.UI.Helpers;
-
-public static partial class NativeKeyboardHelper
+namespace Microsoft.PowerToys.Settings.UI.Helpers
 {
-    [StructLayout(LayoutKind.Sequential)]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-    public struct INPUT
+    internal static class NativeKeyboardHelper
    {
-        public INPUTTYPE type;
-        public InputUnion data;
-
-        public static int Size
+        [StructLayout(LayoutKind.Sequential)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+        internal struct INPUT
        {
-            get { return Marshal.SizeOf<INPUT>(); }
+            internal INPUTTYPE type;
+            internal InputUnion data;
+
+            internal static int Size
+            {
+                get { return Marshal.SizeOf(typeof(INPUT)); }
+            }
+        }
+
+        [StructLayout(LayoutKind.Explicit)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+        internal struct InputUnion
+        {
+            [FieldOffset(0)]
+            internal MOUSEINPUT mi;
+            [FieldOffset(0)]
+            internal KEYBDINPUT ki;
+            [FieldOffset(0)]
+            internal HARDWAREINPUT hi;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+        internal struct MOUSEINPUT
+        {
+            internal int dx;
+            internal int dy;
+            internal int mouseData;
+            internal uint dwFlags;
+            internal uint time;
+            internal UIntPtr dwExtraInfo;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+        internal struct KEYBDINPUT
+        {
+            internal short wVk;
+            internal short wScan;
+            internal uint dwFlags;
+            internal int time;
+            internal UIntPtr dwExtraInfo;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+        internal struct HARDWAREINPUT
+        {
+            internal int uMsg;
+            internal short wParamL;
+            internal short wParamH;
+        }
+
+        internal enum INPUTTYPE : uint
+        {
+            INPUT_MOUSE = 0,
+            INPUT_KEYBOARD = 1,
+            INPUT_HARDWARE = 2,
+        }
+
+        [Flags]
+        internal enum KeyEventF
+        {
+            KeyDown = 0x0000,
+            ExtendedKey = 0x0001,
+            KeyUp = 0x0002,
+            Unicode = 0x0004,
+            Scancode = 0x0008,
        }
    }
-
-    [StructLayout(LayoutKind.Explicit)]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-    public struct InputUnion
-    {
-        [FieldOffset(0)]
-        public MOUSEINPUT mi;
-        [FieldOffset(0)]
-        public KEYBDINPUT ki;
-        [FieldOffset(0)]
-        public HARDWAREINPUT hi;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-    public struct MOUSEINPUT
-    {
-        public int dx;
-        public int dy;
-        public int mouseData;
-        public uint dwFlags;
-        public uint time;
-        public UIntPtr dwExtraInfo;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-    public struct KEYBDINPUT
-    {
-        public short wVk;
-        public short wScan;
-        public uint dwFlags;
-        public int time;
-        public UIntPtr dwExtraInfo;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-    public struct HARDWAREINPUT
-    {
-        public int uMsg;
-        public short wParamL;
-        public short wParamH;
-    }
-
-    public enum INPUTTYPE : uint
-    {
-        INPUT_MOUSE = 0,
-        INPUT_KEYBOARD = 1,
-        INPUT_HARDWARE = 2,
-    }
-
-    [Flags]
-    public enum KeyEventF
-    {
-        KeyDown = 0x0000,
-        ExtendedKey = 0x0001,
-        KeyUp = 0x0002,
-        Unicode = 0x0004,
-        Scancode = 0x0008,
-    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/NativeMethods.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/NativeMethods.cs
@@ -3,10 +3,11 @@
 // See the LICENSE file in the project root for more information.

 using System.Runtime.InteropServices;
+using System.Text;

 namespace Microsoft.PowerToys.Settings.UI.Helpers;

-public static partial class NativeMethods
+public static class NativeMethods
 {
    private const int WS_POPUP = 1 << 31; // 0x80000000
    internal const int GWL_STYLE = -16;
@@ -16,11 +17,65 @@ public static partial class NativeMethods
    internal const int SW_SHOWMAXIMIZED = 3;
    internal const int SW_HIDE = 0;

-    [LibraryImport("user32.dll")]
-    public static partial uint SendInput(uint nInputs, NativeKeyboardHelper.INPUT[] pInputs, int cbSize);
+    [DllImport("user32.dll")]
+    internal static extern IntPtr GetActiveWindow();

-    [LibraryImport("user32.dll")]
+    [DllImport("user32.dll")]
+    internal static extern bool SetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
+
+    [DllImport("user32.dll")]
+    internal static extern bool GetWindowPlacement(IntPtr hWnd, out WINDOWPLACEMENT lpwndpl);
+
+    [DllImport("user32.dll")]
+    internal static extern uint SendInput(uint nInputs, NativeKeyboardHelper.INPUT[] pInputs, int cbSize);
+
+    [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall, SetLastError = true)]
+    internal static extern short GetAsyncKeyState(int vKey);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    internal static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+    [DllImport("user32.dll")]
+    internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+    // [DllImport("shell32.dll")]
+    // internal static extern IntPtr SHBrowseForFolderW(ref ShellGetFolder.BrowseInformation browseInfo);
+    [DllImport("shell32.dll")]
+    internal static extern int SHGetPathFromIDListW(IntPtr pidl, IntPtr pszPath);
+
+    // [DllImport("Comdlg32.dll", CharSet = CharSet.Unicode)]
+    // internal static extern bool GetOpenFileName([In, Out] OpenFileName openFileName);
 #pragma warning disable CA1401 // P/Invokes should not be visible
-    public static partial short GetAsyncKeyState(int vKey);
+    [DllImport("user32.dll")]
+    public static extern bool ShowWindow(System.IntPtr hWnd, int nCmdShow);
+
+    [DllImport("user32.dll")]
+    public static extern int GetDpiForWindow(System.IntPtr hWnd);
+
+    [DllImport("user32.dll")]
+    public static extern bool IsWindowVisible(IntPtr hWnd);
+
+    [DllImport("user32.dll")]
+    public static extern bool AllowSetForegroundWindow(int dwProcessId);
+
+    [System.Runtime.InteropServices.DllImport("User32.dll")]
+    public static extern bool SetForegroundWindow(IntPtr handle);
+
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+    public static extern IntPtr LoadLibrary(string dllToLoad);
+
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+    public static extern bool FreeLibrary(IntPtr hModule);
+
 #pragma warning restore CA1401 // P/Invokes should not be visible
+
+    [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+
+    internal static extern bool SystemParametersInfo(int uiAction, int uiParam, StringBuilder pvParam, int fWinIni);
+
+    public static void SetPopupStyle(IntPtr hwnd)
+    {
+        _ = SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) | WS_POPUP);
+    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
@@ -5,6 +5,7 @@
    xmlns:controls="using:Microsoft.CmdPal.UI.Controls"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
    x:Name="ShortcutContentControl"
    mc:Ignorable="d">
    <Grid MinWidth="498" MinHeight="220">
@@ -65,6 +66,11 @@
                    IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsWarningAltGr, Mode=OneWay}"
                    Severity="Warning" />
            </Grid>
+            <tk7controls:MarkdownTextBlock
+                x:Uid="InvalidShortcutWarningLabel"
+                Background="Transparent"
+                FontSize="12"
+                Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
        </StackPanel>
    </Grid>
 </UserControl>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
@@ -5,6 +5,7 @@
    xmlns:controls="using:Microsoft.CmdPal.UI.Controls"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
    d:DesignHeight="300"
    d:DesignWidth="400"
    mc:Ignorable="d">
@@ -35,5 +36,10 @@
                </DataTemplate>
            </ItemsControl.ItemTemplate>
        </ItemsControl>
+        <tk7controls:MarkdownTextBlock
+            Grid.Column="1"
+            VerticalAlignment="Center"
+            Background="Transparent"
+            Text="{x:Bind Text}" />
    </Grid>
 </UserControl>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml
@@ -12,6 +12,7 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:local="using:Microsoft.CmdPal.UI"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkit="using:CommunityToolkit.WinUI.UI.Controls"
    xmlns:viewmodels="using:Microsoft.CmdPal.UI.ViewModels"
    Background="Transparent"
    mc:Ignorable="d">
@@ -36,21 +37,37 @@

            <DataTemplate x:Key="FormContentTemplate" x:DataType="viewmodels:ContentFormViewModel">
                <Grid Margin="0,4,4,4" Padding="12,8,8,8">
+                    <cmdPalControls:ContentFormControl ViewModel="{x:Bind}" />
                </Grid>
            </DataTemplate>

            <DataTemplate x:Key="MarkdownContentTemplate" x:DataType="viewmodels:ContentMarkdownViewModel">
                <Grid Margin="0,4,4,4" Padding="12,8,8,8">
+                    <toolkit:MarkdownTextBlock
+                        Background="Transparent"
+                        Header3FontSize="12"
+                        Header3FontWeight="Normal"
+                        Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        IsTextSelectionEnabled="True"
+                        Text="{x:Bind Body, Mode=OneWay}" />
                </Grid>
            </DataTemplate>

            <DataTemplate x:Key="NestedFormContentTemplate" x:DataType="viewmodels:ContentFormViewModel">
                <Grid>
+                    <cmdPalControls:ContentFormControl ViewModel="{x:Bind}" />
                </Grid>
            </DataTemplate>

            <DataTemplate x:Key="NestedMarkdownContentTemplate" x:DataType="viewmodels:ContentMarkdownViewModel">
                <Grid>
+                    <toolkit:MarkdownTextBlock
+                        Background="Transparent"
+                        Header3FontSize="12"
+                        Header3FontWeight="Normal"
+                        Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        IsTextSelectionEnabled="True"
+                        Text="{x:Bind Body, Mode=OneWay}" />
                </Grid>
            </DataTemplate>

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs
@@ -124,12 +124,14 @@ public sealed partial class ListPage : Page,
    [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "VS is too aggressive at pruning methods bound in XAML")]
    private void ItemsList_SelectionChanged(object sender, SelectionChangedEventArgs e)
    {
-        var vm = ViewModel;
-        var li = ItemsList.SelectedItem as ListItemViewModel;
-        _ = Task.Run(() =>
+        if (ItemsList.SelectedItem is ListItemViewModel item)
        {
-            vm?.UpdateSelectedItemCommand.Execute(li);
-        });
+            var vm = ViewModel;
+            _ = Task.Run(() =>
+            {
+                vm?.UpdateSelectedItemCommand.Execute(item);
+            });
+        }

        // There's mysterious behavior here, where the selection seemingly
        // changes to _nothing_ when we're backspacing to a single character.
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/GpoValueChecker.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/GpoValueChecker.cs
@@ -2,6 +2,13 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Bookmarks;
+using Microsoft.UI.Xaml.Documents;
 using Microsoft.Win32;

 namespace Microsoft.CmdPal.UI.Helpers;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml
@@ -1,4 +1,4 @@
-<winuiex:WindowEx
+<Window
    x:Class="Microsoft.CmdPal.UI.MainWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -6,13 +6,8 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:pages="using:Microsoft.CmdPal.UI.Pages"
    xmlns:viewmodels="using:Microsoft.CmdPal.UI.ViewModels"
-    xmlns:winuiex="using:WinUIEx"
-    Width="800"
-    Height="480"
-    MinWidth="320"
-    MinHeight="240"
    Activated="MainWindow_Activated"
    Closed="MainWindow_Closed"
    mc:Ignorable="d">
    <pages:ShellPage x:Name="RootShellPage" />
-</winuiex:WindowEx>
+</Window>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
@@ -25,17 +25,15 @@ using Windows.UI;
 using Windows.UI.WindowManagement;
 using Windows.Win32;
 using Windows.Win32.Foundation;
-using Windows.Win32.Graphics.Dwm;
 using Windows.Win32.UI.Input.KeyboardAndMouse;
 using Windows.Win32.UI.Shell;
 using Windows.Win32.UI.WindowsAndMessaging;
 using WinRT;
-using WinUIEx;
 using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;

 namespace Microsoft.CmdPal.UI;

-public sealed partial class MainWindow : WindowEx,
+public sealed partial class MainWindow : Window,
    IRecipient<DismissMessage>,
    IRecipient<ShowWindowMessage>,
    IRecipient<HideWindowMessage>,
@@ -84,6 +82,7 @@ public sealed partial class MainWindow : WindowEx,

        this.SetIcon();
        AppWindow.Title = RS_.GetString("AppName");
+        AppWindow.Resize(new SizeInt32 { Width = 1000, Height = 620 });
        PositionCentered();
        SetAcrylic();

@@ -233,16 +232,6 @@ public sealed partial class MainWindow : WindowEx,
        PositionCentered(display);

        PInvoke.ShowWindow(hwnd, SHOW_WINDOW_CMD.SW_SHOW);
-
-        // instead of showing the window, uncloak it from DWM
-        // This will make it visible to the user, without the animation or frames for
-        // loading XAML with composition
-        unsafe
-        {
-            BOOL value = false;
-            PInvoke.DwmSetWindowAttribute(_hwnd, DWMWINDOWATTRIBUTE.DWMWA_CLOAK, (void*)&value, (uint)sizeof(BOOL));
-        }
-
        PInvoke.SetForegroundWindow(hwnd);
        PInvoke.SetActiveWindow(hwnd);
    }
@@ -300,7 +289,7 @@ public sealed partial class MainWindow : WindowEx,
        ShowHwnd(message.Hwnd, settings.SummonOn);
    }

-    public void Receive(HideWindowMessage message) => HideWindow();
+    public void Receive(HideWindowMessage message) => PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_HIDE);

    public void Receive(QuitMessage message) =>

@@ -308,21 +297,7 @@ public sealed partial class MainWindow : WindowEx,
        DispatcherQueue.TryEnqueue(() => Close());

    public void Receive(DismissMessage message) =>
-        HideWindow();
-
-    private void HideWindow()
-    {
-        // Hide our window
-
-        // Instead of hiding the window, cloak it from DWM
-        // This will make it invisible to the user, such that we can show it again
-        // by uncloaking it, which avoids an unnecessary "flicker in" that XAML does
-        unsafe
-        {
-            BOOL value = true;
-            PInvoke.DwmSetWindowAttribute(_hwnd, DWMWINDOWATTRIBUTE.DWMWA_CLOAK, (void*)&value, (uint)sizeof(BOOL));
-        }
-    }
+        PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_HIDE);

    internal void MainWindow_Closed(object sender, WindowEventArgs args)
    {
@@ -411,9 +386,7 @@ public sealed partial class MainWindow : WindowEx,
                return;
            }

-            // This will DWM cloak our window:
-            HideWindow();
-
+            PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_HIDE);
            PowerToysTelemetry.Log.WriteEvent(new CmdPalDismissedOnLostFocus());
        }

@@ -431,6 +404,11 @@ public sealed partial class MainWindow : WindowEx,
        // know till the message is being handled.
        WeakReferenceMessenger.Default.Send<HotkeySummonMessage>(new(commandId, _hwnd));

+#pragma warning disable SA1310 // Field names should not contain underscore
+    private const uint DOT_KEY = 0xBE;
+    private const uint WM_HOTKEY = 0x0312;
+#pragma warning restore SA1310 // Field names should not contain underscore
+
    private void UnregisterHotkeys()
    {
        _keyboardListener.ClearHotkeys();
@@ -501,24 +479,10 @@ public sealed partial class MainWindow : WindowEx,
        var isRootHotkey = string.IsNullOrEmpty(commandId);
        PowerToysTelemetry.Log.WriteEvent(new CmdPalHotkeySummoned(isRootHotkey));

-        var isVisible = this.Visible;
-        unsafe
-        {
-            // We need to check if our window is cloaked or not. A cloaked window is still
-            // technically visible, because SHOW/HIDE != iconic (minimized) != cloaked
-            // (these are all separate states)
-            long attr = 0;
-            PInvoke.DwmGetWindowAttribute(_hwnd, DWMWINDOWATTRIBUTE.DWMWA_CLOAKED, &attr, sizeof(long));
-            if (attr == 1 /* DWM_CLOAKED_APP */)
-            {
-                isVisible = false;
-            }
-        }
-
        // Note to future us: the wParam will have the index of the hotkey we registered.
        // We can use that in the future to differentiate the hotkeys we've pressed
        // so that we can bind hotkeys to individual commands
-        if (!isVisible || !isRootHotkey)
+        if (!this.Visible || !isRootHotkey)
        {
            Activate();

@@ -526,16 +490,7 @@ public sealed partial class MainWindow : WindowEx,
        }
        else if (isRootHotkey)
        {
-            // If there's a debugger attached...
-            if (System.Diagnostics.Debugger.IsAttached)
-            {
-                // ... then manually hide our window. When debugged, we won't get the cool cloaking,
-                // but that's the price to pay for having the HWND not light-dismiss while we're debugging.
-                PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_HIDE);
-                return;
-            }
-
-            HideWindow();
+            PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_HIDE);
        }
    }

@@ -547,10 +502,7 @@ public sealed partial class MainWindow : WindowEx,
    {
        switch (uMsg)
        {
-            // Prevent the window from maximizing when double-clicking the title bar area
-            case PInvoke.WM_NCLBUTTONDBLCLK:
-                return (LRESULT)IntPtr.Zero;
-            case PInvoke.WM_HOTKEY:
+            case WM_HOTKEY:
                {
                    var hotkeyIndex = (int)wParam.Value;
                    if (hotkeyIndex < _hotkeys.Count)
@@ -566,6 +518,22 @@ public sealed partial class MainWindow : WindowEx,

                        var hotkey = _hotkeys[hotkeyIndex];
                        HandleSummon(hotkey.CommandId);
+
+                        // var isRootHotkey = string.IsNullOrEmpty(hotkey.CommandId);
+
+                        // // Note to future us: the wParam will have the index of the hotkey we registered.
+                        // // We can use that in the future to differentiate the hotkeys we've pressed
+                        // // so that we can bind hotkeys to individual commands
+                        // if (!this.Visible || !isRootHotkey)
+                        // {
+                        //     Activate();
+
+                        // Summon(hotkey.CommandId);
+                        // }
+                        // else if (isRootHotkey)
+                        // {
+                        //     PInvoke.ShowWindow(hwnd, SHOW_WINDOW_CMD.SW_HIDE);
+                        // }
                    }

                    return (LRESULT)IntPtr.Zero;
@@ -624,7 +592,7 @@ public sealed partial class MainWindow : WindowEx,
                _largeIcon = GetAppIconHandle();
                _trayIconData = new NOTIFYICONDATAW()
                {
-                    cbSize = (uint)Marshal.SizeOf<NOTIFYICONDATAW>(),
+                    cbSize = (uint)Marshal.SizeOf(typeof(NOTIFYICONDATAW)),
                    hWnd = _hwnd,
                    uID = MY_NOTIFY_ID,
                    uFlags = NOTIFY_ICON_DATA_FLAGS.NIF_MESSAGE | NOTIFY_ICON_DATA_FLAGS.NIF_ICON | NOTIFY_ICON_DATA_FLAGS.NIF_TIP,
@@ -661,11 +629,7 @@ public sealed partial class MainWindow : WindowEx,

    private DestroyIconSafeHandle GetAppIconHandle()
    {
-        // var exePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
-
-        // todo: use the path to the current assembly
-        // Really?
-        var exePath = Path.Combine(AppContext.BaseDirectory, "Microsoft.CmdPal.UI.exe");
+        var exePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
        DestroyIconSafeHandle largeIcon;
        PInvoke.ExtractIconEx(exePath, 0, out largeIcon, out _, 1);
        return largeIcon;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
@@ -23,19 +23,8 @@
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
  </PropertyGroup>

-  <PropertyGroup>
-    <SelfContained>true</SelfContained>
-    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-    <PublishTrimmed>true</PublishTrimmed>
-    <PublishSingleFile>false</PublishSingleFile>
-    <DisableRuntimeMarshalling>false</DisableRuntimeMarshalling>
-    <PublishAot>true</PublishAot>
-    <EnableMsixTooling>true</EnableMsixTooling>
-  </PropertyGroup>
-  
  <PropertyGroup>
    <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
-    <EnablePreviewFeatures>true</EnablePreviewFeatures>
  </PropertyGroup>

  <PropertyGroup>
@@ -72,11 +61,12 @@
    <PackageReference Include="CommunityToolkit.WinUI.Converters" />
    <PackageReference Include="CommunityToolkit.WinUI.Animations" />
    <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
+    <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" />
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
-	<PackageReference Include="WinUIEx" />
+
    <PackageReference Include="Microsoft.Windows.CsWin32">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
@@ -90,6 +80,9 @@
    <PackageReference Include="System.Text.Json" />

    <!-- LOAD BEARING: GeneratePathProperty=true on BOTH the AC dependencies. Don't forget the AdaptiveCardsWorkaround below -->
+    <PackageReference Include="AdaptiveCards.ObjectModel.WinUI3" GeneratePathProperty="true" />
+    <PackageReference Include="AdaptiveCards.Rendering.WinUI3" GeneratePathProperty="True" />
+    <PackageReference Include="AdaptiveCards.Templating" />
    <PackageReference Include="System.Text.RegularExpressions" />
  </ItemGroup>

@@ -104,13 +97,26 @@

  <ItemGroup>
    <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj" />
    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj" />
    <ProjectReference Include="..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
    <ProjectReference Include="..\Microsoft.CmdPal.UI.ViewModels\Microsoft.CmdPal.UI.ViewModels.csproj" />

    <ProjectReference Include="..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
-    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Shell\Microsoft.CmdPal.Ext.Shell.csproj" />
+
    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Bookmark\Microsoft.CmdPal.Ext.Bookmarks.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Shell\Microsoft.CmdPal.Ext.Shell.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.TimeDate\Microsoft.CmdPal.Ext.TimeDate.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowsServices\Microsoft.CmdPal.Ext.WindowsServices.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowsSettings\Microsoft.CmdPal.Ext.WindowsSettings.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowsTerminal\Microsoft.CmdPal.Ext.WindowsTerminal.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj" />

    <ProjectReference Include="..\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj">
      <ReferenceOutputAssembly>True</ReferenceOutputAssembly>
@@ -162,6 +168,13 @@
  <!-- <AdaptiveCardsWorkaround> -->
  <!-- Workaround for Adaptive Cards not supporting correct RIDs when using .NET 8.
       Don't forget GeneratePathProperty on the AdaptiveCards PackageReference's above -->
+  <PropertyGroup>
+    <AdaptiveCardsNative>runtimes\win10-$(Platform)\native</AdaptiveCardsNative>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="$(PkgAdaptiveCards_ObjectModel_WinUI3)\$(AdaptiveCardsNative)\AdaptiveCards.ObjectModel.WinUI3.dll" Link="AdaptiveCards.ObjectModel.WinUI3.dll" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="$(PkgAdaptiveCards_Rendering_WinUI3)\$(AdaptiveCardsNative)\AdaptiveCards.Rendering.WinUI3.dll" Link="AdaptiveCards.Rendering.WinUI3.dll" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
  <ItemGroup>
    <Content Update="..\Microsoft.CmdPal.UI.ViewModels\Assets\template.zip">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt
@@ -1,6 +1,7 @@
 GetPhysicallyInstalledSystemMemory
 GlobalMemoryStatusEx
 GetSystemInfo
+CoCreateInstance
 GetForegroundWindow
 SetForegroundWindow
 GetWindowRect
@@ -20,21 +21,18 @@ SetActiveWindow
 MonitorFromWindow
 GetMonitorInfo
 GetDpiForMonitor
+SHCreateStreamOnFileEx
 CoAllowSetForegroundWindow
-WM_HOTKEY
-WM_NCLBUTTONDBLCLK
+SHCreateStreamOnFileEx
+SHLoadIndirectString

 Shell_NotifyIcon
 LoadIcon
 WM_USER
 WM_WINDOWPOSCHANGING
 RegisterWindowMessageW
-
+GetModuleHandleW
 ExtractIconEx
 WM_RBUTTONUP
 WM_LBUTTONUP
 WM_LBUTTONDBLCLK
-
-DwmGetWindowAttribute
-DwmSetWindowAttribute
-DWM_CLOAKED_APP
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
@@ -10,6 +10,7 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:help="using:Microsoft.CmdPal.UI.Helpers"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkit="using:CommunityToolkit.WinUI.UI.Controls"
    xmlns:ui="using:CommunityToolkit.WinUI"
    xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
    Background="Transparent"
@@ -97,6 +98,13 @@
                        Visibility="{x:Bind HasTags, Mode=OneWay}">
                        <ItemsControl.ItemsPanel>
                            <ItemsPanelTemplate>
+                                <toolkit:WrapPanel
+                                    x:Name="TagsWrapPanel"
+                                    MinWidth="0"
+                                    Padding="0"
+                                    HorizontalSpacing="4"
+                                    Orientation="Horizontal"
+                                    VerticalSpacing="4" />
                            </ItemsPanelTemplate>
                        </ItemsControl.ItemsPanel>
                    </ItemsControl>
@@ -366,6 +374,16 @@
                            TextWrapping="WrapWholeWords"
                            Visibility="{x:Bind ViewModel.Details.Title, Converter={StaticResource StringNotEmptyToVisibilityConverter}, Mode=OneWay}" />

+                        <toolkit:MarkdownTextBlock
+                            Grid.Row="2"
+                            Margin="0,12,0,24"
+                            Background="Transparent"
+                            Header3FontSize="12"
+                            Header3FontWeight="Normal"
+                            Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            IsTextSelectionEnabled="True"
+                            Text="{x:Bind ViewModel.Details.Body, Mode=OneWay}" />
+
                        <ItemsRepeater
                            Grid.Row="3"
                            ItemTemplate="{StaticResource DetailsDataTemplateSelector}"
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
@@ -418,6 +418,9 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
    {
        _ = DispatcherQueue.TryEnqueue(() =>
        {
+            // Also hide our details pane about here, if we had one
+            HideDetails();
+
            if (_settingsWindow == null)
            {
                _settingsWindow = new SettingsWindow();
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-arm64.pubxml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-arm64.pubxml
@@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <PublishSingleFile>False</PublishSingleFile>
    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-    <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">True</PublishTrimmed>
-    <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
+    <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed>
+    <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">False</PublishTrimmed>
  </PropertyGroup>
 </Project>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-x64.pubxml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-x64.pubxml
@@ -6,13 +6,14 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
  <PropertyGroup>
    <PublishProtocol>FileSystem</PublishProtocol>
    <Platform>x64</Platform>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &lt; 8">win10-x64</RuntimeIdentifier>
    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">True</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'True'">True</PublishReadyToRun>
-    <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">True</PublishTrimmed>
-    <PublishTrimmed Condition="'$(Configuration)' != 'True'">True</PublishTrimmed>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+    <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed>
+    <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">False</PublishTrimmed>
  </PropertyGroup>
 </Project>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<winuiex:WindowEx
+<Window
    x:Class="Microsoft.CmdPal.UI.Settings.SettingsWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,18 +7,13 @@
    xmlns:local="using:Microsoft.CmdPal.UI.Settings"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ui="using:CommunityToolkit.WinUI"
-    xmlns:winuiex="using:WinUIEx"
    Title="SettingsWindow"
-    Width="1280"
-    Height="720"
-    MinWidth="480"
-    MinHeight="480"
    Activated="Window_Activated"
    Closed="Window_Closed"
    mc:Ignorable="d">
-    <winuiex:WindowEx.SystemBackdrop>
+    <Window.SystemBackdrop>
        <MicaBackdrop />
-    </winuiex:WindowEx.SystemBackdrop>
+    </Window.SystemBackdrop>
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition Height="Auto" />
@@ -42,10 +37,10 @@
                Height="16"
                Source="ms-appx:///Assets/icon.svg" />
            <TextBlock
-                x:Uid="CmdPalSettingsHeader"
                Margin="12,0,0,0"
                VerticalAlignment="Center"
-                Style="{StaticResource CaptionTextBlockStyle}" />
+                Style="{StaticResource CaptionTextBlockStyle}"
+                Text="Command Palette Settings" />
        </StackPanel>
        <NavigationView
            x:Name="NavView"
@@ -105,4 +100,4 @@
            </Grid>
        </NavigationView>
    </Grid>
-</winuiex:WindowEx>
+</Window>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs
@@ -11,12 +11,11 @@ using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Windows.Graphics;
-using WinUIEx;
 using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;

 namespace Microsoft.CmdPal.UI.Settings;

-public sealed partial class SettingsWindow : WindowEx,
+public sealed partial class SettingsWindow : Window,
    IRecipient<NavigateToExtensionSettingsMessage>,
    IRecipient<QuitMessage>
 {
@@ -71,6 +70,7 @@ public sealed partial class SettingsWindow : WindowEx,

    private void PositionCentered()
    {
+        AppWindow.Resize(new SizeInt32 { Width = 1280, Height = 720 });
        var displayArea = DisplayArea.GetFromWindowId(AppWindow.Id, DisplayAreaFallback.Nearest);
        if (displayArea is not null)
        {
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<winuiex:WindowEx
+<Window
    x:Class="Microsoft.CmdPal.UI.ToastWindow"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,18 +7,17 @@
    xmlns:local="using:Microsoft.CmdPal.UI"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ui="using:CommunityToolkit.WinUI"
-    xmlns:winuiex="using:WinUIEx"
    Title="Command Palette Toast"
    mc:Ignorable="d">
-    <winuiex:WindowEx.SystemBackdrop>
+    <Window.SystemBackdrop>
        <DesktopAcrylicBackdrop />
-    </winuiex:WindowEx.SystemBackdrop>
+    </Window.SystemBackdrop>
    <Grid x:Name="ToastGrid">
        <!--  This padding is used to calculate the dimensions of the ToastWindow  -->
        <TextBlock
            x:Name="ToastText"
-            Padding="12,12,24,20"
+            Padding="16,16,36,24"
            Text="{x:Bind ViewModel.ToastMessage, Mode=OneWay}"
            TextAlignment="Center" />
    </Grid>
-</winuiex:WindowEx>
+</Window>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml.cs
@@ -17,12 +17,11 @@ using Windows.Win32.Foundation;
 using Windows.Win32.Graphics.Gdi;
 using Windows.Win32.UI.HiDpi;
 using Windows.Win32.UI.WindowsAndMessaging;
-using WinUIEx;
 using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;

 namespace Microsoft.CmdPal.UI;

-public sealed partial class ToastWindow : WindowEx,
+public sealed partial class ToastWindow : Window,
    IRecipient<QuitMessage>
 {
    private readonly HWND _hwnd;
@@ -65,7 +64,19 @@ public sealed partial class ToastWindow : WindowEx,

    private void PositionCentered()
    {
-        this.SetWindowSize(ToastText.ActualWidth, ToastText.ActualHeight);
+        var intSize = new SizeInt32
+        {
+            Width = Convert.ToInt32(ToastText.ActualWidth),
+            Height = Convert.ToInt32(ToastText.ActualHeight),
+        };
+
+        var scaleAdjustment = GetScaleFactor(_hwnd);
+        var scaled = new SizeInt32
+        {
+            Width = (int)Math.Round(intSize.Width * scaleAdjustment),
+            Height = (int)Math.Round(intSize.Height * scaleAdjustment),
+        };
+        AppWindow.Resize(scaled);

        var displayArea = DisplayArea.GetFromWindowId(AppWindow.Id, DisplayAreaFallback.Nearest);
        if (displayArea is not null)
@@ -75,7 +86,7 @@ public sealed partial class ToastWindow : WindowEx,

            var monitorHeight = displayArea.WorkArea.Height;
            var windowHeight = AppWindow.Size.Height;
-            centeredPosition.Y = monitorHeight - (windowHeight + 8); // Align with other shell toasts, like the volume indicator.
+            centeredPosition.Y = monitorHeight - (windowHeight * 2);
            AppWindow.Move(centeredPosition);
        }
    }
--- a/src/modules/cmdpal/README.md
+++ b/src/modules/cmdpal/README.md
@@ -9,7 +9,7 @@ By default, CmdPal is bound to <kbd>Win+Alt+Space</kbd>.

 The fastest way to get started is just to run the "Create extension" command in the palette itself. That'll prompt you for a project name and a Display Name, and where you want to place your project. Then just open the `sln` it produces. You should be ready to go 🙂. 

-The official API documentation can be found [on this docs site](https://learn.microsoft.com/windows/powertoys/command-palette/extensibility-overview).
+The official API documentation can be found [on this docs site](TODO! Add docs link when we have one)

 We've also got samples, so that you can see how the APIs in-action. 

--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsSettings.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsSettings.cs
@@ -71,7 +71,7 @@ public class AllAppsSettings : JsonSettingsManager

    internal static string SettingsJsonPath()
    {
-        var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
+        string directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
        Directory.CreateDirectory(directory);

        // now, the state is just next to the exe
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCache.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCache.cs
@@ -12,7 +12,7 @@ using Microsoft.CmdPal.Ext.Apps.Utils;

 namespace Microsoft.CmdPal.Ext.Apps;

-public sealed partial class AppCache : IDisposable
+public sealed class AppCache : IDisposable
 {
    private Win32ProgramFileSystemWatchers _win32ProgramRepositoryHelper;

--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCommand.cs
@@ -2,16 +2,11 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.CmdPal.Ext.Apps.Programs;
 using Microsoft.CmdPal.Ext.Apps.Properties;
-using Microsoft.CmdPal.Ext.Apps.Utils;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Win32;
-using Windows.Win32.System.Com;
-using Windows.Win32.UI.Shell;
 using WyHash;

 namespace Microsoft.CmdPal.Ext.Apps;
@@ -30,30 +25,25 @@ internal sealed partial class AppCommand : InvokableCommand

    internal static async Task StartApp(string aumid)
    {
+        var appManager = new ApplicationActivationManager();
+        const ActivateOptions noFlags = ActivateOptions.None;
        await Task.Run(() =>
        {
-            unsafe
+            try
+            {
+                appManager.ActivateApplication(aumid, /*queryArguments*/ string.Empty, noFlags, out var unusedPid);
+            }
+            catch (System.Exception)
            {
-                IApplicationActivationManager* appManager = null;
-                PInvoke.CoCreateInstance(
-                    typeof(ApplicationActivationManager).GUID,
-                    null,
-                    CLSCTX.CLSCTX_INPROC_SERVER,
-                    out appManager);
-
-                using var handle = new SafeComHandle((IntPtr)appManager);
-
-                appManager->ActivateApplication(
-                    aumid,
-                    string.Empty,
-                    ACTIVATEOPTIONS.AO_NONE,
-                    out var unusedPid);
            }
        }).ConfigureAwait(false);
    }

    internal static async Task StartExe(string path)
    {
+        var appManager = new ApplicationActivationManager();
+
+        // const ActivateOptions noFlags = ActivateOptions.None;
        await Task.Run(() =>
        {
            Process.Start(new ProcessStartInfo(path) { UseShellExecute = true });
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj
@@ -1,15 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-	<Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
-
-	<PropertyGroup>
+  <PropertyGroup>
    <RootNamespace>Microsoft.CmdPal.Ext.Apps</RootNamespace>
    <Nullable>enable</Nullable>
    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	<PublishAot>true</PublishAot>
  </PropertyGroup>

  <ItemGroup>
@@ -53,14 +49,4 @@
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
-	
-	<ItemGroup>
-		<AdditionalFiles Include="NativeMethods.txt" />
-		<AdditionalFiles Include="NativeMethods.json" />
-	</ItemGroup>
-	
-	<PropertyGroup>
-		<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
-		<EnablePreviewFeatures>true</EnablePreviewFeatures>
-	</PropertyGroup>
 </Project>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/NativeMethods.json
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/NativeMethods.json
@@ -1,7 +0,0 @@
-{
-  "$schema": "https://aka.ms/CsWin32.schema.json",
-  "allowMarshaling": false,
-  "comInterop": {
-    "preserveSigMethods": [ "*" ]
-  }
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/NativeMethods.txt
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/NativeMethods.txt
@@ -1,20 +1,19 @@
-IStream
+GetPhysicallyInstalledSystemMemory
+GlobalMemoryStatusEx
+GetSystemInfo
 CoCreateInstance
-IApplicationActivationManager
-ApplicationActivationManager
+SetForegroundWindow
+IsIconic
+RegisterHotKey
+SetWindowLongPtr
+CallWindowProc
+ShowWindow
+SetForegroundWindow
+SetFocus
+SetActiveWindow
+MonitorFromWindow
+GetMonitorInfo
 SHCreateStreamOnFileEx
-SHCreateItemFromParsingName
-IShellItem
-ISequentialStream
-SHLoadIndirectString
-IAppxFactory
-AppxFactory
-IAppxManifestReader
-IAppxManifestApplicationsEnumerator
-IAppxManifestApplication
-IAppxManifestProperties
-IShellLinkW
-ShellLink
-IPersistFile
-CoTaskMemFree
-IUnknown
+CoAllowSetForegroundWindow
+SHCreateStreamOnFileEx
+SHLoadIndirectString
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/AppxFactory.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/AppxFactory.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+// Reference : https://stackoverflow.com/questions/32122679/getting-icon-of-modern-windows-app-from-a-desktop-application
+[Guid("5842a140-ff9f-4166-8f5c-62f5b7b0c781")]
+[ComImport]
+public class AppxFactory
+{
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/AppxPackageHelper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/AppxPackageHelper.cs
@@ -2,64 +2,42 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using System.Collections.Generic;
-using Microsoft.CmdPal.Ext.Apps.Utils;
-using Microsoft.UI.Xaml.Controls;
-using Windows.Services.Maps;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.Storage.Packaging.Appx;
+using System.Runtime.InteropServices;
 using Windows.Win32.System.Com;
+using static Microsoft.CmdPal.Ext.Apps.Utils.Native;

 namespace Microsoft.CmdPal.Ext.Apps.Programs;

 public static class AppxPackageHelper
 {
-    internal static unsafe List<IntPtr> GetAppsFromManifest(IStream* stream)
+    private static readonly IAppxFactory AppxFactory = (IAppxFactory)new AppxFactory();
+
+    // This function returns a list of attributes of applications
+    internal static IEnumerable<IAppxManifestApplication> GetAppsFromManifest(IStream stream)
    {
-        PInvoke.CoCreateInstance(typeof(AppxFactory).GUID, null, CLSCTX.CLSCTX_INPROC_SERVER, out IAppxFactory* appxFactory).ThrowOnFailure();
+        var reader = AppxFactory.CreateManifestReader(stream);
+        var manifestApps = reader.GetApplications();

-        using var handle = new SafeComHandle((IntPtr)appxFactory);
-
-        IAppxManifestReader* reader = null;
-        IAppxManifestApplicationsEnumerator* manifestApps = null;
-        var result = new List<IntPtr>();
-
-        appxFactory->CreateManifestReader(stream, &reader);
-        using var readerHandle = new SafeComHandle((IntPtr)reader);
-
-        reader->GetApplications(&manifestApps);
-        using var manifestAppsHandle = new SafeComHandle((IntPtr)manifestApps);
-
-        while (true)
+        while (manifestApps.GetHasCurrent())
        {
-            manifestApps->GetHasCurrent(out var hasCurrent);
-            if (hasCurrent == false)
-            {
-                break;
-            }
-
-            IAppxManifestApplication* manifestApp;
-            manifestApps->GetCurrent(&manifestApp);
-
-            manifestApp->GetStringValue("AppListEntry", out var appListEntryPtr).ThrowOnFailure();
-            var appListEntry = appListEntryPtr.ToString();
-
+            var manifestApp = manifestApps.GetCurrent();
+            var hr = manifestApp.GetStringValue("AppListEntry", out var appListEntry);
+            _ = CheckHRAndReturnOrThrow(hr, appListEntry);
            if (appListEntry != "none")
            {
-                result.Add((IntPtr)manifestApp);
-            }
-            else if (manifestApp != null)
-            {
-                manifestApp->Release();
+                yield return manifestApp;
            }

-            manifestApps->MoveNext(out var hasNext);
-            if (hasNext == false)
-            {
-                break;
-            }
+            manifestApps.MoveNext();
+        }
+    }
+
+    internal static T CheckHRAndReturnOrThrow<T>(HRESULT hr, T result)
+    {
+        if (hr != HRESULT.S_OK)
+        {
+            Marshal.ThrowExceptionForHR((int)hr);
        }

        return result;
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IApplicationActivationManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IApplicationActivationManager.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.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+// Reference : https://github.com/MicrosoftEdge/edge-launcher/blob/108e63df0b4cb5cd9d5e45aa7a264690851ec51d/MIcrosoftEdgeLauncherCsharp/Program.cs
+[Flags]
+public enum ActivateOptions
+{
+    None = 0x00000000,
+    DesignMode = 0x00000001,
+    NoErrorUI = 0x00000002,
+    NoSplashScreen = 0x00000004,
+}
+
+// ApplicationActivationManager
+[ComImport]
+[Guid("2e941141-7f97-4756-ba1d-9decde894a3d")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IApplicationActivationManager
+{
+    IntPtr ActivateApplication([In] string appUserModelId, [In] string arguments, [In] ActivateOptions options, [Out] out uint processId);
+
+    IntPtr ActivateForFile([In] string appUserModelId, [In] IntPtr /*IShellItemArray* */ itemArray, [In] string verb, [Out] out uint processId);
+
+    IntPtr ActivateForProtocol([In] string appUserModelId, [In] IntPtr /* IShellItemArray* */itemArray, [Out] out uint processId);
+}
+
+// Application Activation Manager Class
+[ComImport]
+[Guid("45BA127D-10A8-46EA-8AB7-56EA9078943C")]
+public class ApplicationActivationManager : IApplicationActivationManager
+{
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)/*, PreserveSig*/]
+    public extern IntPtr ActivateApplication([In] string appUserModelId, [In] string arguments, [In] ActivateOptions options, [Out] out uint processId);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public extern IntPtr ActivateForFile([In] string appUserModelId, [In] IntPtr /*IShellItemArray* */ itemArray, [In] string verb, [Out] out uint processId);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public extern IntPtr ActivateForProtocol([In] string appUserModelId, [In] IntPtr /* IShellItemArray* */itemArray, [Out] out uint processId);
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxFactory.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxFactory.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+using Windows.Win32.System.Com;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+[Guid("BEB94909-E451-438B-B5A7-D79E767B75D8")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAppxFactory
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Implements COM Interface")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Implements COM Interface")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Implements COM Interface")]
+    void _VtblGap0_2(); // skip 2 methods
+
+    internal IAppxManifestReader CreateManifestReader(IStream inputStream);
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestApplication.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestApplication.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+using static Microsoft.CmdPal.Ext.Apps.Utils.Native;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+[Guid("5DA89BF4-3773-46BE-B650-7E744863B7E8")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAppxManifestApplication
+{
+    [PreserveSig]
+    HRESULT GetStringValue([MarshalAs(UnmanagedType.LPWStr)] string name, [MarshalAs(UnmanagedType.LPWStr)] out string value);
+
+    [PreserveSig]
+    HRESULT GetAppUserModelId([MarshalAs(UnmanagedType.LPWStr)] out string value);
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestApplicationsEnumerator.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestApplicationsEnumerator.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+[Guid("9EB8A55A-F04B-4D0D-808D-686185D4847A")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAppxManifestApplicationsEnumerator
+{
+    IAppxManifestApplication GetCurrent();
+
+    bool GetHasCurrent();
+
+    bool MoveNext();
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestProperties.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestProperties.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+using static Microsoft.CmdPal.Ext.Apps.Utils.Native;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+[Guid("03FAF64D-F26F-4B2C-AAF7-8FE7789B8BCA")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAppxManifestProperties
+{
+    [PreserveSig]
+    HRESULT GetBoolValue([MarshalAs(UnmanagedType.LPWStr)] string name, out bool value);
+
+    [PreserveSig]
+    HRESULT GetStringValue([MarshalAs(UnmanagedType.LPWStr)] string name, [MarshalAs(UnmanagedType.LPWStr)] out string value);
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestReader.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestReader.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+[Guid("4E1BD148-55A0-4480-A3D1-15544710637C")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAppxManifestReader
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Implements COM Interface")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Implements COM Interface")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Implements COM Interface")]
+    void _VtblGap0_1(); // skip 1 method
+
+    IAppxManifestProperties GetProperties();
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Implements COM Interface")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Implements COM Interface")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Implements COM Interface")]
+    void _VtblGap1_5(); // skip 5 methods
+
+    IAppxManifestApplicationsEnumerator GetApplications();
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/ReparsePoint.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/ReparsePoint.cs
@@ -5,7 +5,6 @@
 using System;
 using System.ComponentModel;
 using System.IO;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;

@@ -17,7 +16,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Programs;
 /// <summary>
 /// Provides access to NTFS reparse points in .Net.
 /// </summary>
-public static partial class ReparsePoint
+public static class ReparsePoint
 {
 #pragma warning disable SA1310 // Field names should not contain underscore

@@ -37,7 +36,7 @@ public static partial class ReparsePoint
 #pragma warning restore SA1310 // Field names should not contain underscore

    [Flags]
-    internal enum FileAccessType : uint
+    private enum FileAccessType : uint
    {
        DELETE = 0x00010000,
        READ_CONTROL = 0x00020000,
@@ -101,7 +100,7 @@ public static partial class ReparsePoint
    }

    [Flags]
-    internal enum FileShareType : uint
+    private enum FileShareType : uint
    {
        None = 0x00000000,
        Read = 0x00000001,
@@ -109,7 +108,7 @@ public static partial class ReparsePoint
        Delete = 0x00000004,
    }

-    internal enum CreationDisposition : uint
+    private enum CreationDisposition : uint
    {
        New = 1,
        CreateAlways = 2,
@@ -119,7 +118,7 @@ public static partial class ReparsePoint
    }

    [Flags]
-    internal enum FileAttributes : uint
+    private enum FileAttributes : uint
    {
        Readonly = 0x00000001,
        Hidden = 0x00000002,
@@ -196,9 +195,8 @@ public static partial class ReparsePoint
        public AppExecutionAliasReparseTagBufferLayoutVersion Version;
    }

-    [LibraryImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    internal static partial bool DeviceIoControl(
+    [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+    private static extern bool DeviceIoControl(
        IntPtr hDevice,
        uint dwIoControlCode,
        IntPtr inBuffer,
@@ -208,9 +206,8 @@ public static partial class ReparsePoint
        out int pBytesReturned,
        IntPtr lpOverlapped);

-    [LibraryImport("kernel32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf8)]
-    [return: MarshalAs(UnmanagedType.SysInt)]
-    internal static partial IntPtr CreateFile(
+    [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+    private static extern IntPtr CreateFile(
        string lpFileName,
        FileAccessType dwDesiredAccess,
        FileShareType dwShareMode,
@@ -287,18 +284,15 @@ public static partial class ReparsePoint
                        ThrowLastWin32Error("Unable to get information about reparse point.");
                    }

-                    unsafe
+                    AppExecutionAliasReparseTagHeader aliasReparseHeader = Marshal.PtrToStructure<AppExecutionAliasReparseTagHeader>(outBuffer);
+
+                    if (aliasReparseHeader.ReparseTag == IO_REPARSE_TAG_APPEXECLINK)
                    {
-                        var aliasReparseHeader = Unsafe.Read<AppExecutionAliasReparseTagHeader>((void*)outBuffer);
+                        var metadata = AppExecutionAliasMetadata.FromPersistedRepresentationIntPtr(
+                            outBuffer,
+                            aliasReparseHeader.Version);

-                        if (aliasReparseHeader.ReparseTag == IO_REPARSE_TAG_APPEXECLINK)
-                        {
-                            var metadata = AppExecutionAliasMetadata.FromPersistedRepresentationIntPtr(
-                                outBuffer,
-                                aliasReparseHeader.Version);
-
-                            return metadata.ExePath;
-                        }
+                        return metadata.ExePath;
                    }

                    return null;
@@ -325,65 +319,61 @@ public static partial class ReparsePoint

        public static AppExecutionAliasMetadata FromPersistedRepresentationIntPtr(IntPtr reparseDataBufferPtr, AppExecutionAliasReparseTagBufferLayoutVersion version)
        {
-            unsafe
+            var dataOffset = Marshal.SizeOf(typeof(AppExecutionAliasReparseTagHeader));
+            var dataBufferPtr = reparseDataBufferPtr + dataOffset;
+
+            string? packageFullName = null;
+            string? packageFamilyName = null;
+            string? aumid = null;
+            string? exePath = null;
+
+            VerifyVersion(version);
+
+            switch (version)
            {
-                var dataOffset = Unsafe.SizeOf<AppExecutionAliasReparseTagHeader>();
+                case AppExecutionAliasReparseTagBufferLayoutVersion.Initial:
+                    packageFullName = Marshal.PtrToStringUni(dataBufferPtr);
+                    if (packageFullName is not null)
+                    {
+                        dataBufferPtr += Encoding.Unicode.GetByteCount(packageFullName) + Encoding.Unicode.GetByteCount("\0");
+                        aumid = Marshal.PtrToStringUni(dataBufferPtr);

-                var dataBufferPtr = reparseDataBufferPtr + dataOffset;
-
-                string? packageFullName = null;
-                string? packageFamilyName = null;
-                string? aumid = null;
-                string? exePath = null;
-
-                VerifyVersion(version);
-
-                switch (version)
-                {
-                    case AppExecutionAliasReparseTagBufferLayoutVersion.Initial:
-                        packageFullName = Marshal.PtrToStringUni(dataBufferPtr);
-                        if (packageFullName is not null)
+                        if (aumid is not null)
                        {
-                            dataBufferPtr += Encoding.Unicode.GetByteCount(packageFullName) + Encoding.Unicode.GetByteCount("\0");
-                            aumid = Marshal.PtrToStringUni(dataBufferPtr);
-
-                            if (aumid is not null)
-                            {
-                                dataBufferPtr += Encoding.Unicode.GetByteCount(aumid) + Encoding.Unicode.GetByteCount("\0");
-                                exePath = Marshal.PtrToStringUni(dataBufferPtr);
-                            }
+                            dataBufferPtr += Encoding.Unicode.GetByteCount(aumid) + Encoding.Unicode.GetByteCount("\0");
+                            exePath = Marshal.PtrToStringUni(dataBufferPtr);
                        }
+                    }

-                        break;
+                    break;

-                    case AppExecutionAliasReparseTagBufferLayoutVersion.PackageFamilyName:
-                    case AppExecutionAliasReparseTagBufferLayoutVersion.MultiAppTypeSupport:
-                        packageFamilyName = Marshal.PtrToStringUni(dataBufferPtr);
+                case AppExecutionAliasReparseTagBufferLayoutVersion.PackageFamilyName:
+                case AppExecutionAliasReparseTagBufferLayoutVersion.MultiAppTypeSupport:
+                    packageFamilyName = Marshal.PtrToStringUni(dataBufferPtr);

-                        if (packageFamilyName is not null)
+                    if (packageFamilyName is not null)
+                    {
+                        dataBufferPtr += Encoding.Unicode.GetByteCount(packageFamilyName) + Encoding.Unicode.GetByteCount("\0");
+                        aumid = Marshal.PtrToStringUni(dataBufferPtr);
+
+                        if (aumid is not null)
                        {
-                            dataBufferPtr += Encoding.Unicode.GetByteCount(packageFamilyName) + Encoding.Unicode.GetByteCount("\0");
-                            aumid = Marshal.PtrToStringUni(dataBufferPtr);
+                            dataBufferPtr += Encoding.Unicode.GetByteCount(aumid) + Encoding.Unicode.GetByteCount("\0");

-                            if (aumid is not null)
-                            {
-                                dataBufferPtr += Encoding.Unicode.GetByteCount(aumid) + Encoding.Unicode.GetByteCount("\0");
-
-                                exePath = Marshal.PtrToStringUni(dataBufferPtr);
-                            }
+                            exePath = Marshal.PtrToStringUni(dataBufferPtr);
                        }
+                    }

-                        break;
-                }
-
-                return new AppExecutionAliasMetadata
-                {
-                    PackageFullName = packageFullName ?? string.Empty,
-                    PackageFamilyName = packageFamilyName ?? string.Empty,
-                    Aumid = aumid ?? string.Empty,
-                    ExePath = exePath ?? string.Empty,
-                };
+                    break;
            }
+
+            return new AppExecutionAliasMetadata
+            {
+                PackageFullName = packageFullName ?? string.Empty,
+                PackageFamilyName = packageFamilyName ?? string.Empty,
+                Aumid = aumid ?? string.Empty,
+                ExePath = exePath ?? string.Empty,
+            };
        }

        private static void VerifyVersion(AppExecutionAliasReparseTagBufferLayoutVersion version)
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWP.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWP.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

@@ -6,13 +6,12 @@ using System;
 using System.Collections.Generic;
 using System.IO.Abstractions;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Xml.Linq;
 using Microsoft.CmdPal.Ext.Apps.Utils;
 using Windows.Win32;
 using Windows.Win32.Foundation;
-using Windows.Win32.Storage.Packaging.Appx;
 using Windows.Win32.System.Com;
+using static Microsoft.CmdPal.Ext.Apps.Utils.Native;

 namespace Microsoft.CmdPal.Ext.Apps.Programs;

@@ -54,7 +53,7 @@ public partial class UWP
        FamilyName = package.FamilyName;
    }

-    public unsafe void InitializeAppInfo(string installedLocation)
+    public void InitializeAppInfo(string installedLocation)
    {
        Location = installedLocation;
        LocationLocalized = ShellLocalization.Instance.GetLocalizedPath(installedLocation);
@@ -64,32 +63,26 @@ public partial class UWP
        InitPackageVersion(namespaces);

        const uint noAttribute = 0x80;
-        const uint sTGM_READ = 0x00000000;

-        IStream* stream = null;
-        using var streamHandle = new SafeComHandle((IntPtr)stream);
+        var access = (uint)STGM.READ;
+        var hResult = PInvoke.SHCreateStreamOnFileEx(path, access, noAttribute, false, null, out IStream stream);

-        try
+        // S_OK
+        if (hResult == 0)
        {
-            PInvoke.SHCreateStreamOnFileEx(path, sTGM_READ, noAttribute, false, null, &stream).ThrowOnFailure();
-
-            Apps = AppxPackageHelper.GetAppsFromManifest(stream).Select(appInManifest =>
-            {
-                using var appHandle = new SafeComHandle((IntPtr)appInManifest);
-                return new UWPApplication((IAppxManifestApplication*)appInManifest, this);
-            }).Where(a =>
+            Apps = AppxPackageHelper.GetAppsFromManifest(stream).Select(appInManifest => new UWPApplication(appInManifest, this)).Where(a =>
            {
                var valid =
-                    !string.IsNullOrEmpty(a.UserModelId) &&
-                    !string.IsNullOrEmpty(a.DisplayName) &&
-                    a.AppListEntry != "none";
+                !string.IsNullOrEmpty(a.UserModelId) &&
+                !string.IsNullOrEmpty(a.DisplayName) &&
+                a.AppListEntry != "none";
+
                return valid;
            }).ToList();
        }
-        catch (Exception)
+        else
        {
            Apps = Array.Empty<UWPApplication>();
-            return;
        }
    }

@@ -130,7 +123,7 @@ public partial class UWP
        var support = Environment.OSVersion.Version.Major >= windows10.Major;
        if (support)
        {
-            var applications = CurrentUserPackages().SelectMany(p =>
+            var applications = CurrentUserPackages().AsParallel().SelectMany(p =>
            {
                UWP u;
                try
@@ -138,7 +131,7 @@ public partial class UWP
                    u = new UWP(p);
                    u.InitializeAppInfo(p.InstalledLocation);
                }
-                catch (Exception)
+                catch (Exception )
                {
                    return Array.Empty<UWPApplication>();
                }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs
@@ -6,15 +6,13 @@ using System;
 using System.Collections.Generic;
 using System.IO.Abstractions;
 using System.Linq;
-using System.Runtime.InteropServices;
+using System.Text;
 using System.Xml;
 using Microsoft.CmdPal.Ext.Apps.Commands;
 using Microsoft.CmdPal.Ext.Apps.Properties;
 using Microsoft.CmdPal.Ext.Apps.Utils;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.Storage.Packaging.Appx;
+using static Microsoft.CmdPal.Ext.Apps.Utils.Native;
 using PackageVersion = Microsoft.CmdPal.Ext.Apps.Programs.UWP.PackageVersion;

 namespace Microsoft.CmdPal.Ext.Apps.Programs;
@@ -97,27 +95,27 @@ public class UWPApplication : IProgram
        return commands;
    }

-    internal unsafe UWPApplication(IAppxManifestApplication* manifestApp, UWP package)
+    public UWPApplication(IAppxManifestApplication manifestApp, UWP package)
    {
        ArgumentNullException.ThrowIfNull(manifestApp);

-        var hr = manifestApp->GetAppUserModelId(out var tmpUserModelIdPtr);
-        UserModelId = ComFreeHelper.GetStringAndFree(hr, tmpUserModelIdPtr);
+        var hr = manifestApp.GetAppUserModelId(out var tmpUserModelId);
+        UserModelId = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpUserModelId);

-        manifestApp->GetAppUserModelId(out var tmpUniqueIdentifierPtr);
-        UniqueIdentifier = ComFreeHelper.GetStringAndFree(hr, tmpUniqueIdentifierPtr);
+        hr = manifestApp.GetAppUserModelId(out var tmpUniqueIdentifier);
+        UniqueIdentifier = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpUniqueIdentifier);

-        manifestApp->GetStringValue("DisplayName", out var tmpDisplayNamePtr);
-        DisplayName = ComFreeHelper.GetStringAndFree(hr, tmpDisplayNamePtr);
+        hr = manifestApp.GetStringValue("DisplayName", out var tmpDisplayName);
+        DisplayName = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpDisplayName);

-        manifestApp->GetStringValue("Description", out var tmpDescriptionPtr);
-        Description = ComFreeHelper.GetStringAndFree(hr, tmpDescriptionPtr);
+        hr = manifestApp.GetStringValue("Description", out var tmpDescription);
+        Description = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpDescription);

-        manifestApp->GetStringValue("BackgroundColor", out var tmpBackgroundColorPtr);
-        BackgroundColor = ComFreeHelper.GetStringAndFree(hr, tmpBackgroundColorPtr);
+        hr = manifestApp.GetStringValue("BackgroundColor", out var tmpBackgroundColor);
+        BackgroundColor = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpBackgroundColor);

-        manifestApp->GetStringValue("EntryPoint", out var tmpEntryPointPtr);
-        EntryPoint = ComFreeHelper.GetStringAndFree(hr, tmpEntryPointPtr);
+        hr = manifestApp.GetStringValue("EntryPoint", out var tmpEntryPoint);
+        EntryPoint = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpEntryPoint);

        Package = package ?? throw new ArgumentNullException(nameof(package));

@@ -165,7 +163,7 @@ public class UWPApplication : IProgram
        return false;
    }

-    internal unsafe string ResourceFromPri(string packageFullName, string resourceReference)
+    internal string ResourceFromPri(string packageFullName, string resourceReference)
    {
        const string prefix = "ms-resource:";

@@ -199,8 +197,30 @@ public class UWPApplication : IProgram
                parsedFallback = prefix + "///" + key;
            }

-            if (string.IsNullOrEmpty(parsedFallback))
+            var outBuffer = new StringBuilder(128);
+            var source = $"@{{{packageFullName}? {parsed}}}";
+            var capacity = (uint)outBuffer.Capacity;
+            var hResult = SHLoadIndirectString(source, outBuffer, capacity, IntPtr.Zero);
+            if (hResult != HRESULT.S_OK)
            {
+                if (!string.IsNullOrEmpty(parsedFallback))
+                {
+                    var sourceFallback = $"@{{{packageFullName}? {parsedFallback}}}";
+                    hResult = SHLoadIndirectString(sourceFallback, outBuffer, capacity, IntPtr.Zero);
+                    if (hResult == HRESULT.S_OK)
+                    {
+                        var loaded = outBuffer.ToString();
+                        if (!string.IsNullOrEmpty(loaded))
+                        {
+                            return loaded;
+                        }
+                        else
+                        {
+                            return string.Empty;
+                        }
+                    }
+                }
+
                // https://github.com/Wox-launcher/Wox/issues/964
                // known hresult 2147942522:
                // 'Microsoft Corporation' violates pattern constraint of '\bms-resource:.{1,256}'.
@@ -209,40 +229,17 @@ public class UWPApplication : IProgram
                // Microsoft.BingFoodAndDrink_3.0.4.336_x64__8wekyb3d8bbwe: ms-resource:AppDescription
                return string.Empty;
            }
-
-            var capacity = 1024U;
-            PWSTR outBuffer = new PWSTR((char*)(void*)Marshal.AllocHGlobal((int)capacity * sizeof(char)));
-            var source = $"@{{{packageFullName}? {parsed}}}";
-            void* reserved = null;
-
-            try
+            else
            {
-                PInvoke.SHLoadIndirectString(source, outBuffer, capacity, ref reserved).ThrowOnFailure();
-
                var loaded = outBuffer.ToString();
-                return string.IsNullOrEmpty(loaded) ? string.Empty : loaded;
-            }
-            catch (Exception)
-            {
-                try
+                if (!string.IsNullOrEmpty(loaded))
                {
-                    var sourceFallback = $"@{{{packageFullName}?{parsedFallback}}}";
-                    PInvoke.SHLoadIndirectString(sourceFallback, outBuffer, capacity, ref reserved).ThrowOnFailure();
-                    var loaded = outBuffer.ToString();
-                    return string.IsNullOrEmpty(loaded) ? string.Empty : loaded;
+                    return loaded;
                }
-                catch (Exception)
+                else
                {
-                    // ProgramLogger.Exception($"Unable to load resource {resourceReference} from {packageFullName}", new InvalidOperationException(), GetType(), packageFullName);
                    return string.Empty;
                }
-                finally
-                {
-                }
-            }
-            finally
-            {
-                Marshal.FreeHGlobal((IntPtr)outBuffer.Value);
            }
        }
        else
@@ -258,13 +255,13 @@ public class UWPApplication : IProgram
            { PackageVersion.Windows8, "SmallLogo" },
        };

-    internal unsafe string LogoUriFromManifest(IAppxManifestApplication* app)
+    internal string LogoUriFromManifest(IAppxManifestApplication app)
    {
        if (_logoKeyFromVersion.TryGetValue(Package.Version, out var key))
        {
-            var hr = app->GetStringValue(key, out var logoUriFromAppPtr);
-
-            return logoUriFromAppPtr.ToString();
+            var hr = app.GetStringValue(key, out var logoUriFromApp);
+            _ = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, logoUriFromApp);
+            return logoUriFromApp;
        }
        else
        {
@@ -349,7 +346,7 @@ public class UWPApplication : IProgram
            var prefix = path.Substring(0, end);
            var paths = new List<string> { };
            const int appIconSize = 36;
-            var targetSizes = new List<int> { 16, 24, 30, 36, 44, 60, 72, 96, 128, 180, 256 };
+            var targetSizes = new List<int> { 16, 24, 30, 36, 44, 60, 72, 96, 128, 180, 256 }.AsParallel();
            var pathFactorPairs = new Dictionary<string, int>();

            foreach (var factor in targetSizes)
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs
@@ -374,17 +374,15 @@ public class Win32Program : IProgram

            return program;
        }
-        catch (System.IO.FileLoadException ex)
+        catch (System.IO.FileLoadException)
        {
-            ExtensionHost.LogMessage(ex.ToString());
            return InvalidProgram;
        }

        // Only do a catch all in production. This is so make developer aware of any unhandled exception and add the exception handling in.
        // Error caused likely due to trying to get the description of the program
-        catch (Exception ex)
+        catch (Exception)
        {
-            ExtensionHost.LogMessage(ex.ToString());
            return InvalidProgram;
        }
    }
@@ -459,7 +457,6 @@ public class Win32Program : IProgram
            case ApplicationType.Win32Application:
                app = ExeProgram(path);
                break;
-
            case ApplicationType.ShortcutApplication:
                app = LnkProgram(path);
                break;
@@ -828,15 +825,17 @@ public class Win32Program : IProgram

            // Get all paths but exclude all normal .Executables
            paths.UnionWith(sources
+                .AsParallel()
                .SelectMany(source => source.IsEnabled ? source.GetPaths() : Enumerable.Empty<string>())
                .Where(programPath => disabledProgramsList.All(x => x.UniqueIdentifier != programPath))
                .Where(path => !ExecutableApplicationExtensions.Contains(Extension(path))));
            runCommandPaths.UnionWith(runCommandSources
+                .AsParallel()
                .SelectMany(source => source.IsEnabled ? source.GetPaths() : Enumerable.Empty<string>())
                .Where(programPath => disabledProgramsList.All(x => x.UniqueIdentifier != programPath)));

-            var programs = paths.Select(source => GetProgramFromPath(source));
-            var runCommandPrograms = runCommandPaths.Select(source => GetRunCommandProgramFromPath(source));
+            var programs = paths.AsParallel().Select(source => GetProgramFromPath(source));
+            var runCommandPrograms = runCommandPaths.AsParallel().Select(source => GetRunCommandProgramFromPath(source));

            return DeduplicatePrograms(programs.Concat(runCommandPrograms).Where(program => program?.Valid == true));
        }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/FileSystemWatcherWrapper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/FileSystemWatcherWrapper.cs
@@ -8,7 +8,7 @@ using System.IO;
 namespace Microsoft.CmdPal.Ext.Apps.Storage;

 // File System Watcher Wrapper class which implements the IFileSystemWatcherWrapper interface
-public sealed partial class FileSystemWatcherWrapper : FileSystemWatcher, IFileSystemWatcherWrapper
+public sealed class FileSystemWatcherWrapper : FileSystemWatcher, IFileSystemWatcherWrapper
 {
    public FileSystemWatcherWrapper()
    {
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/ListRepository`1.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/ListRepository`1.cs
@@ -67,6 +67,11 @@ public class ListRepository<T> : IRepository<T>, IEnumerable<T>
        }
    }

+    public ParallelQuery<T> AsParallel()
+    {
+        return _items.Values.AsParallel();
+    }
+
    public bool Contains(T item)
    {
        if (item is not null)
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/PackageRepository.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/PackageRepository.cs
@@ -15,7 +15,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Storage;
 /// A repository for storing packaged applications such as UWP apps or appx packaged desktop apps.
 /// This repository will also monitor for changes to the PackageCatalog and update the repository accordingly
 /// </summary>
-internal sealed partial class PackageRepository : ListRepository<UWPApplication>, IProgramRepository
+internal sealed class PackageRepository : ListRepository<UWPApplication>, IProgramRepository
 {
    private readonly IPackageCatalog _packageCatalog;

--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramFileSystemWatchers.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramFileSystemWatchers.cs
@@ -9,7 +9,7 @@ using System.Linq;

 namespace Microsoft.CmdPal.Ext.Apps.Storage;

-internal sealed partial class Win32ProgramFileSystemWatchers : IDisposable
+internal sealed class Win32ProgramFileSystemWatchers : IDisposable
 {
    public string[] PathsToWatch { get; set; }

--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramRepository.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramRepository.cs
@@ -6,17 +6,19 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.IO.Abstractions;
 using System.Threading.Tasks;
 using Microsoft.CmdPal.Ext.Apps.Programs;
 using Win32Program = Microsoft.CmdPal.Ext.Apps.Programs.Win32Program;

 namespace Microsoft.CmdPal.Ext.Apps.Storage;

-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
-internal sealed partial class Win32ProgramRepository : ListRepository<Programs.Win32Program>, IProgramRepository
+internal sealed class Win32ProgramRepository : ListRepository<Programs.Win32Program>, IProgramRepository
 {
+    private static readonly IFileSystem FileSystem = new FileSystem();
+    private static readonly IPath Path = FileSystem.Path;
+
    private const string LnkExtension = ".lnk";
    private const string UrlExtension = ".url";

--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ComFreeHelper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ComFreeHelper.cs
@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.System.Com;
-
-namespace Microsoft.CmdPal.Ext.Apps.Utils;
-
-public static class ComFreeHelper
-{
-    internal static unsafe string GetStringAndFree(HRESULT hr, PWSTR ptr)
-    {
-        hr.ThrowOnFailure();
-        try
-        {
-            return ptr.ToString();
-        }
-        finally
-        {
-            PInvoke.CoTaskMemFree(ptr);
-        }
-    }
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/Native.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/Native.cs
@@ -0,0 +1,157 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Microsoft.CmdPal.Ext.Apps.Utils;
+
+[SuppressMessage("Interoperability", "CA1401:P/Invokes should not be visible", Justification = "We want plugins to share this NativeMethods class, instead of each one creating its own.")]
+public sealed class Native
+{
+    [DllImport("shlwapi.dll", CharSet = CharSet.Unicode)]
+    public static extern int SHLoadIndirectString(string pszSource, StringBuilder pszOutBuf, int cchOutBuf, nint ppvReserved);
+
+    [DllImport("shell32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+    public static extern int SHCreateItemFromParsingName([MarshalAs(UnmanagedType.LPWStr)] string path, nint pbc, ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out IShellItem shellItem);
+
+    [DllImport("shlwapi.dll", CharSet = CharSet.Unicode)]
+    public static extern HRESULT SHCreateStreamOnFileEx(string fileName, STGM grfMode, uint attributes, bool create, System.Runtime.InteropServices.ComTypes.IStream reserved, out System.Runtime.InteropServices.ComTypes.IStream stream);
+
+    [DllImport("shlwapi.dll", CharSet = CharSet.Unicode)]
+    public static extern HRESULT SHLoadIndirectString(string pszSource, StringBuilder pszOutBuf, uint cchOutBuf, nint ppvReserved);
+
+    public enum HRESULT : uint
+    {
+        /// <summary>
+        /// Operation successful.
+        /// </summary>
+        S_OK = 0x00000000,
+
+        /// <summary>
+        /// Operation successful. (negative condition/no operation)
+        /// </summary>
+        S_FALSE = 0x00000001,
+
+        /// <summary>
+        /// Not implemented.
+        /// </summary>
+        E_NOTIMPL = 0x80004001,
+
+        /// <summary>
+        /// No such interface supported.
+        /// </summary>
+        E_NOINTERFACE = 0x80004002,
+
+        /// <summary>
+        /// Pointer that is not valid.
+        /// </summary>
+        E_POINTER = 0x80004003,
+
+        /// <summary>
+        /// Operation aborted.
+        /// </summary>
+        E_ABORT = 0x80004004,
+
+        /// <summary>
+        /// Unspecified failure.
+        /// </summary>
+        E_FAIL = 0x80004005,
+
+        /// <summary>
+        /// Unexpected failure.
+        /// </summary>
+        E_UNEXPECTED = 0x8000FFFF,
+
+        /// <summary>
+        /// General access denied error.
+        /// </summary>
+        E_ACCESSDENIED = 0x80070005,
+
+        /// <summary>
+        /// Handle that is not valid.
+        /// </summary>
+        E_HANDLE = 0x80070006,
+
+        /// <summary>
+        /// Failed to allocate necessary memory.
+        /// </summary>
+        E_OUTOFMEMORY = 0x8007000E,
+
+        /// <summary>
+        /// One or more arguments are not valid.
+        /// </summary>
+        E_INVALIDARG = 0x80070057,
+
+        /// <summary>
+        /// The operation was canceled by the user. (Error source 7 means Win32.)
+        /// </summary>
+        /// <SeeAlso href="https://learn.microsoft.com/windows/win32/debug/system-error-codes--1000-1299-"/>
+        /// <SeeAlso href="https://en.wikipedia.org/wiki/HRESULT"/>
+        E_CANCELLED = 0x800704C7,
+    }
+
+    public static class ShellItemTypeConstants
+    {
+        /// <summary>
+        /// Guid for type IShellItem.
+        /// </summary>
+        public static readonly Guid ShellItemGuid = new("43826d1e-e718-42ee-bc55-a1e261c37bfe");
+
+        /// <summary>
+        /// Guid for type IShellItem2.
+        /// </summary>
+        public static readonly Guid ShellItem2Guid = new("7E9FB0D3-919F-4307-AB2E-9B1860310C93");
+    }
+
+    /// <summary>
+    /// The following are ShellItem DisplayName types.
+    /// </summary>
+    [Flags]
+    public enum SIGDN : uint
+    {
+        NORMALDISPLAY = 0,
+        PARENTRELATIVEPARSING = 0x80018001,
+        PARENTRELATIVEFORADDRESSBAR = 0x8001c001,
+        DESKTOPABSOLUTEPARSING = 0x80028000,
+        PARENTRELATIVEEDITING = 0x80031001,
+        DESKTOPABSOLUTEEDITING = 0x8004c000,
+        FILESYSPATH = 0x80058000,
+        URL = 0x80068000,
+    }
+
+    [ComImport]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    [Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")]
+    public interface IShellItem
+    {
+        void BindToHandler(
+            nint pbc,
+            [MarshalAs(UnmanagedType.LPStruct)] Guid bhid,
+            [MarshalAs(UnmanagedType.LPStruct)] Guid riid,
+            out nint ppv);
+
+        void GetParent(out IShellItem ppsi);
+
+        void GetDisplayName(SIGDN sigdnName, [MarshalAs(UnmanagedType.LPWStr)] out string ppszName);
+
+        void GetAttributes(uint sfgaoMask, out uint psfgaoAttribs);
+
+        void Compare(IShellItem psi, uint hint, out int piOrder);
+    }
+
+    /// <summary>
+    /// <see href="https://learn.microsoft.com/windows/win32/stg/stgm-constants">see all STGM values</see>
+    /// </summary>
+    [Flags]
+    public enum STGM : long
+    {
+        READ = 0x00000000L,
+        WRITE = 0x00000001L,
+        READWRITE = 0x00000002L,
+        CREATE = 0x00001000L,
+    }
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/SafeComHandle.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/SafeComHandle.cs
@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.CmdPal.Ext.Apps.Utils;
-
-public partial class SafeComHandle : SafeHandle
-{
-    public SafeComHandle()
-        : base(IntPtr.Zero, ownsHandle: true)
-    {
-    }
-
-    public SafeComHandle(IntPtr handle)
-        : base(IntPtr.Zero, ownsHandle: true)
-    {
-        SetHandle(handle);
-    }
-
-    public override bool IsInvalid => handle == IntPtr.Zero;
-
-    protected override bool ReleaseHandle()
-    {
-        Marshal.Release(handle);
-        return true;
-    }
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ShellLinkHelper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ShellLinkHelper.cs
@@ -4,16 +4,122 @@

 using System;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
 using System.Text;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.System.Com;
-using Windows.Win32.UI.Shell;

 namespace Microsoft.CmdPal.Ext.Apps.Utils;

 public class ShellLinkHelper : IShellLinkHelper
 {
+    [Flags]
+    private enum SLGP_FLAGS
+    {
+        SLGP_SHORTPATH = 0x1,
+        SLGP_UNCPRIORITY = 0x2,
+        SLGP_RAWPATH = 0x4,
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching COM")]
+    private struct WIN32_FIND_DATAW
+    {
+        public uint dwFileAttributes;
+        public long ftCreationTime;
+        public long ftLastAccessTime;
+        public long ftLastWriteTime;
+        public uint nFileSizeHigh;
+        public uint nFileSizeLow;
+        public uint dwReserved0;
+        public uint dwReserved1;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
+        public string cFileName;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 14)]
+        public string cAlternateFileName;
+    }
+
+    [Flags]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Implements COM Interface")]
+    public enum SLR_FLAGS
+    {
+        SLR_NO_UI = 0x1,
+        SLR_ANY_MATCH = 0x2,
+        SLR_UPDATE = 0x4,
+        SLR_NOUPDATE = 0x8,
+        SLR_NOSEARCH = 0x10,
+        SLR_NOTRACK = 0x20,
+        SLR_NOLINKINFO = 0x40,
+        SLR_INVOKE_MSI = 0x80,
+    }
+
+    // Reference : http://www.pinvoke.net/default.aspx/Interfaces.IShellLinkW
+
+    // The IShellLink interface allows Shell links to be created, modified, and resolved
+    [ComImport]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    [Guid("000214F9-0000-0000-C000-000000000046")]
+    private interface IShellLinkW
+    {
+        /// <summary>Retrieves the path and file name of a Shell link object</summary>
+        void GetPath([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, int cchMaxPath, ref WIN32_FIND_DATAW pfd, SLGP_FLAGS fFlags);
+
+        /// <summary>Retrieves the list of item identifiers for a Shell link object</summary>
+        void GetIDList(out nint ppidl);
+
+        /// <summary>Sets the pointer to an item identifier list (PIDL) for a Shell link object.</summary>
+        void SetIDList(nint pidl);
+
+        /// <summary>Retrieves the description string for a Shell link object</summary>
+        void GetDescription([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszName, int cchMaxName);
+
+        /// <summary>Sets the description for a Shell link object. The description can be any application-defined string</summary>
+        void SetDescription([MarshalAs(UnmanagedType.LPWStr)] string pszName);
+
+        /// <summary>Retrieves the name of the working directory for a Shell link object</summary>
+        void GetWorkingDirectory([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszDir, int cchMaxPath);
+
+        /// <summary>Sets the name of the working directory for a Shell link object</summary>
+        void SetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)] string pszDir);
+
+        /// <summary>Retrieves the command-line arguments associated with a Shell link object</summary>
+        void GetArguments([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszArgs, int cchMaxPath);
+
+        /// <summary>Sets the command-line arguments for a Shell link object</summary>
+        void SetArguments([MarshalAs(UnmanagedType.LPWStr)] string pszArgs);
+
+        /// <summary>Retrieves the hot key for a Shell link object</summary>
+        void GetHotkey(out short pwHotkey);
+
+        /// <summary>Sets a hot key for a Shell link object</summary>
+        void SetHotkey(short wHotkey);
+
+        /// <summary>Retrieves the show command for a Shell link object</summary>
+        void GetShowCmd(out int piShowCmd);
+
+        /// <summary>Sets the show command for a Shell link object. The show command sets the initial show state of the window.</summary>
+        void SetShowCmd(int iShowCmd);
+
+        /// <summary>Retrieves the location (path and index) of the icon for a Shell link object</summary>
+        void GetIconLocation([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszIconPath, int cchIconPath, out int piIcon);
+
+        /// <summary>Sets the location (path and index) of the icon for a Shell link object</summary>
+        void SetIconLocation([MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, int iIcon);
+
+        /// <summary>Sets the relative path to the Shell link object</summary>
+        void SetRelativePath([MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, int dwReserved);
+
+        /// <summary>Attempts to find the target of a Shell link, even if it has been moved or renamed</summary>
+        void Resolve(ref nint hwnd, SLR_FLAGS fFlags);
+
+        /// <summary>Sets the path and file name of a Shell link object</summary>
+        void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile);
+    }
+
+    [ComImport]
+    [Guid("00021401-0000-0000-C000-000000000046")]
+    private class ShellLink
+    {
+    }
+
    // Contains the description of the app
    public string Description { get; set; } = string.Empty;

@@ -23,71 +129,60 @@ public class ShellLinkHelper : IShellLinkHelper
    public bool HasArguments { get; set; }

    // Retrieve the target path using Shell Link
-    public unsafe string RetrieveTargetPath(string path)
+    public string RetrieveTargetPath(string path)
    {
-        var target = string.Empty;
-
-        const int MAX_PATH = 260;
-        IShellLinkW* link = null;
-
-        PInvoke.CoCreateInstance(typeof(ShellLink).GUID, null, CLSCTX.CLSCTX_INPROC_SERVER, out link).ThrowOnFailure();
-        using var linkHandle = new SafeComHandle((IntPtr)link);
-
+        var link = new ShellLink();
        const int STGM_READ = 0;

-        IPersistFile* persistFile = null;
-        Guid iid = typeof(IPersistFile).GUID;
-        ((IUnknown*)link)->QueryInterface(&iid, (void**)&persistFile);
-        if (persistFile != null)
+        try
        {
-            using var persistFileHandle = new SafeComHandle((IntPtr)persistFile);
-
-            try
-            {
-                persistFile->Load(path, STGM_READ);
-            }
-            catch (System.IO.FileNotFoundException)
-            {
-                // Log.Exception($"Failed to load {path}, {e.Message}", e, GetType());
-                return string.Empty;
-            }
+            ((IPersistFile)link).Load(path, STGM_READ);
+        }
+        catch (System.IO.FileNotFoundException)
+        {
+            // Log.Exception("Path could not be retrieved", ex, GetType(), path);
+            return string.Empty;
        }

-        var hwnd = HWND.Null;
-        const uint SLR_NO_UI = 0x1;
-        link->Resolve(hwnd, SLR_NO_UI);
+        var hwnd = default(nint);
+        ((IShellLinkW)link).Resolve(ref hwnd, 0);

-        PWSTR pBuffer = null;
-        link->GetPath(pBuffer, MAX_PATH, null, 0x1);
+        const int MAX_PATH = 260;
+        var buffer = new StringBuilder(MAX_PATH);

-        target = pBuffer.ToString();
+        var data = default(WIN32_FIND_DATAW);
+        ((IShellLinkW)link).GetPath(buffer, buffer.Capacity, ref data, SLGP_FLAGS.SLGP_SHORTPATH);
+        var target = buffer.ToString();

        // To set the app description
        if (!string.IsNullOrEmpty(target))
        {
-            PWSTR pszName = null;
+            buffer = new StringBuilder(MAX_PATH);
            try
            {
-                var desHr = link->GetDescription(pszName, MAX_PATH).ThrowOnFailure();
-                Description = ComFreeHelper.GetStringAndFree(desHr, pszName);
+                ((IShellLinkW)link).GetDescription(buffer, MAX_PATH);
+                Description = buffer.ToString();
            }
            catch (Exception)
            {
-                    // Log.Exception($"Failed to fetch description for {target}, {e.Message}", e, GetType());
+                // Log.Exception($"Failed to fetch description for {target}, {e.Message}", e, GetType());
                Description = string.Empty;
            }

-            PWSTR pszArgs = null;
-            var argHr = link->GetArguments(pszArgs, MAX_PATH);
-            Arguments = ComFreeHelper.GetStringAndFree(argHr, pszArgs);
+            var argumentBuffer = new StringBuilder(MAX_PATH);
+            ((IShellLinkW)link).GetArguments(argumentBuffer, argumentBuffer.Capacity);
+            Arguments = argumentBuffer.ToString();

            // Set variable to true if the program takes in any arguments
-            if (Arguments.Length != 0)
+            if (argumentBuffer.Length != 0)
            {
                HasArguments = true;
            }
        }

+        // To release unmanaged memory
+        Marshal.ReleaseComObject(link);
+
        return target;
    }
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ShellLocalization.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ShellLocalization.cs
@@ -4,8 +4,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.IO;
-using Windows.Win32;
-using Windows.Win32.UI.Shell;
+using static Microsoft.CmdPal.Ext.Apps.Utils.Native;

 namespace Microsoft.CmdPal.Ext.Apps.Utils;

@@ -24,7 +23,7 @@ public class ShellLocalization
    /// </summary>
    /// <param name="path">Path to the shell item (e. g. shortcut 'File Explorer.lnk').</param>
    /// <returns>The localized name as string or <see cref="string.Empty"/>.</returns>
-    public unsafe string GetLocalizedName(string path)
+    public string GetLocalizedName(string path)
    {
        var lowerInvariantPath = path.ToLowerInvariant();

@@ -34,32 +33,18 @@ public class ShellLocalization
            return value;
        }

-        void* shellItemPtrVoid = null;
-
-        try
-        {
-            var retCode = PInvoke.SHCreateItemFromParsingName(path, null, typeof(IShellItem).GUID, out shellItemPtrVoid).ThrowOnFailure();
-
-            using var shellItemHandle = new SafeComHandle((IntPtr)shellItemPtrVoid);
-
-            IShellItem* shellItemPtr = (IShellItem*)shellItemPtrVoid;
-
-            var hr = shellItemPtr->GetDisplayName(SIGDN.SIGDN_NORMALDISPLAY, out var filenamePtr);
-
-            var filename = ComFreeHelper.GetStringAndFree(hr, filenamePtr);
-
-            if (filename == null)
-            {
-                return string.Empty;
-            }
-
-            _ = _localizationCache.TryAdd(lowerInvariantPath, filename);
-            return filename;
-        }
-        catch (Exception)
+        var shellItemType = ShellItemTypeConstants.ShellItemGuid;
+        var retCode = SHCreateItemFromParsingName(path, nint.Zero, ref shellItemType, out var shellItem);
+        if (retCode != 0)
        {
            return string.Empty;
        }
+
+        shellItem.GetDisplayName(SIGDN.NORMALDISPLAY, out var filename);
+
+        _ = _localizationCache.TryAdd(lowerInvariantPath, filename);
+
+        return filename;
    }

    /// <summary>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Commands/OpenPropertiesCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Commands/OpenPropertiesCommand.cs
@@ -3,12 +3,15 @@
 // See the LICENSE file in the project root for more information.

 using System;
-using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using ManagedCommon;
 using Microsoft.CmdPal.Ext.Indexer.Data;
 using Microsoft.CmdPal.Ext.Indexer.Native;
 using Microsoft.CmdPal.Ext.Indexer.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.UI.Shell;
 using Windows.Win32.UI.WindowsAndMessaging;

 namespace Microsoft.CmdPal.Ext.Indexer.Commands;
@@ -19,17 +22,30 @@ internal sealed partial class OpenPropertiesCommand : InvokableCommand

    private static unsafe bool ShowFileProperties(string filename)
    {
-        var info = new NativeMethods.SHELLEXECUTEINFOW
+        var propertiesPtr = Marshal.StringToHGlobalUni("properties");
+        var filenamePtr = Marshal.StringToHGlobalUni(filename);
+
+        try
        {
-            cbSize = Unsafe.SizeOf<NativeMethods.SHELLEXECUTEINFOW>(),
-            lpVerb = "properties",
-            lpFile = filename,
+            var filenamePCWSTR = new PCWSTR((char*)filenamePtr);
+            var propertiesPCWSTR = new PCWSTR((char*)propertiesPtr);

-            nShow = (int)NativeMethods.SHOW_WINDOW_CMD.SW_SHOW,
-            fMask = NativeHelpers.SEEMASKINVOKEIDLIST,
-        };
+            var info = new SHELLEXECUTEINFOW
+            {
+                cbSize = (uint)Marshal.SizeOf<SHELLEXECUTEINFOW>(),
+                lpVerb = propertiesPCWSTR,
+                lpFile = filenamePCWSTR,
+                nShow = (int)SHOW_WINDOW_CMD.SW_SHOW,
+                fMask = NativeHelpers.SEEMASKINVOKEIDLIST,
+            };

-        return NativeMethods.ShellExecuteEx(ref info);
+            return PInvoke.ShellExecuteEx(ref info);
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(filenamePtr);
+            Marshal.FreeHGlobal(propertiesPtr);
+        }
    }

    internal OpenPropertiesCommand(IndexerItem item)
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Commands/OpenWithCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Commands/OpenWithCommand.cs
@@ -2,11 +2,14 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using Microsoft.CmdPal.Ext.Indexer.Data;
 using Microsoft.CmdPal.Ext.Indexer.Native;
 using Microsoft.CmdPal.Ext.Indexer.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.UI.Shell;
 using Windows.Win32.UI.WindowsAndMessaging;

 namespace Microsoft.CmdPal.Ext.Indexer.Commands;
@@ -17,17 +20,30 @@ internal sealed partial class OpenWithCommand : InvokableCommand

    private static unsafe bool OpenWith(string filename)
    {
-        var info = new NativeMethods.SHELLEXECUTEINFOW
+        var filenamePtr = Marshal.StringToHGlobalUni(filename);
+        var verbPtr = Marshal.StringToHGlobalUni("openas");
+
+        try
        {
-            cbSize = Unsafe.SizeOf<NativeMethods.SHELLEXECUTEINFOW>(),
-            lpVerb = "openas",
-            lpFile = filename,
+            var filenamePCWSTR = new PCWSTR((char*)filenamePtr);
+            var verbPCWSTR = new PCWSTR((char*)verbPtr);

-            nShow = (int)NativeMethods.SHOW_WINDOW_CMD.SW_SHOWNORMAL,
-            fMask = NativeHelpers.SEEMASKINVOKEIDLIST,
-        };
+            var info = new SHELLEXECUTEINFOW
+            {
+                cbSize = (uint)Marshal.SizeOf<SHELLEXECUTEINFOW>(),
+                lpVerb = verbPCWSTR,
+                lpFile = filenamePCWSTR,
+                nShow = (int)SHOW_WINDOW_CMD.SW_SHOWNORMAL,
+                fMask = NativeHelpers.SEEMASKINVOKEIDLIST,
+            };

-        return NativeMethods.ShellExecuteEx(ref info);
+            return PInvoke.ShellExecuteEx(ref info);
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(filenamePtr);
+            Marshal.FreeHGlobal(verbPtr);
+        }
    }

    internal OpenWithCommand(IndexerItem item)
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/FallbackOpenFileItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/FallbackOpenFileItem.cs
@@ -2,10 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
-using System.Globalization;
 using System.IO;
-using System.Text;
 using Microsoft.CmdPal.Ext.Indexer.Data;
 using Microsoft.CmdPal.Ext.Indexer.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -13,14 +10,8 @@ using Windows.Storage.Streams;

 namespace Microsoft.CmdPal.Ext.Indexer;

-internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System.IDisposable
+internal sealed partial class FallbackOpenFileItem : FallbackCommandItem
 {
-    private readonly CompositeFormat fallbackItemSearchPageTitleCompositeFormat = CompositeFormat.Parse(Resources.Indexer_fallback_searchPage_title);
-
-    private readonly SearchEngine _searchEngine = new();
-
-    private uint _queryCookie = 10;
-
    public FallbackOpenFileItem()
        : base(new NoOpCommand(), Resources.Indexer_Find_Path_fallback_display_title)
    {
@@ -30,20 +21,8 @@ internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System

    public override void UpdateQuery(string query)
    {
-        if (string.IsNullOrWhiteSpace(query))
-        {
-            Command = new NoOpCommand();
-            Title = string.Empty;
-            Subtitle = string.Empty;
-            Icon = null;
-            MoreCommands = null;
-
-            return;
-        }
-
        if (Path.Exists(query))
        {
-            // Exit 1: The query is a direct path to a file. Great! Return it.
            var item = new IndexerItem() { FullPath = query, FileName = Path.GetFileName(query) };
            var listItemForUs = new IndexerListItem(item, IncludeBrowseCommand.AsDefault);
            Command = listItemForUs.Command;
@@ -64,65 +43,12 @@ internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System
            catch
            {
            }
-
-            return;
        }
        else
        {
-            _queryCookie++;
-
-            try
-            {
-                _searchEngine.Query(query, _queryCookie);
-                var results = _searchEngine.FetchItems(0, 20, _queryCookie, out var _);
-
-                if (results.Count == 0 || ((results[0] as IndexerListItem) == null))
-                {
-                    // Exit 2: We searched for the file, and found nothing. Oh well.
-                    // Hide ourselves.
-                    Title = string.Empty;
-                    Subtitle = string.Empty;
-                    Command = new NoOpCommand();
-                    return;
-                }
-
-                if (results.Count == 1)
-                {
-                    // Exit 3: We searched for the file, and found exactly one thing. Awesome!
-                    // Return it.
-                    Title = results[0].Title;
-                    Subtitle = results[0].Subtitle;
-                    Icon = results[0].Icon;
-                    Command = results[0].Command;
-                    MoreCommands = results[0].MoreCommands;
-
-                    return;
-                }
-
-                // Exit 4: We found more than one result. Make our command take
-                // us to the file search page, prepopulated with this search.
-                var indexerPage = new IndexerPage(query, _searchEngine, _queryCookie, results);
-                Title = string.Format(CultureInfo.CurrentCulture, fallbackItemSearchPageTitleCompositeFormat, query);
-                Icon = Icons.FileExplorer;
-                Subtitle = Resources.Indexer_Subtitle;
-                Command = indexerPage;
-
-                return;
-            }
-            catch
-            {
-                Title = string.Empty;
-                Subtitle = string.Empty;
-                Icon = null;
-                Command = new NoOpCommand();
-                MoreCommands = null;
-            }
+            Title = string.Empty;
+            Subtitle = string.Empty;
+            Command = new NoOpCommand();
        }
    }
-
-    public void Dispose()
-    {
-        _searchEngine.Dispose();
-        GC.SuppressFinalize(this);
-    }
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/DataSourceManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/DataSourceManager.cs
@@ -3,16 +3,17 @@
 // See the LICENSE file in the project root for more information.

 using System;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
 using ManagedCommon;
-using Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-using Microsoft.CmdPal.Ext.Indexer.Native;
+using Windows.Win32;
+using Windows.Win32.System.Com;
+using Windows.Win32.System.Search;

 namespace Microsoft.CmdPal.Ext.Indexer.Indexer;

 internal static class DataSourceManager
 {
+    private static readonly Guid CLSIDCollatorDataSource = new("9E175B8B-F52A-11D8-B9A5-505054503030");
+
    private static IDBInitialize _dataSource;

    public static IDBInitialize GetDataSource()
@@ -27,30 +28,20 @@ internal static class DataSourceManager

    private static bool InitializeDataSource()
    {
-        uint clsctxInProcServer = 0x17;
-
-        var hr = NativeMethods.CoCreateInstance(NativeHelpers.CsWin32GUID.CLSIDCollatorDataSource, IntPtr.Zero, clsctxInProcServer, typeof(IDBInitialize).GUID, out var dataSourceObjPtr);
+        var hr = PInvoke.CoCreateInstance(CLSIDCollatorDataSource, null, CLSCTX.CLSCTX_INPROC_SERVER, typeof(IDBInitialize).GUID, out var dataSourceObj);
        if (hr != 0)
        {
            Logger.LogError("CoCreateInstance failed: " + hr);
            return false;
        }

-        if (dataSourceObjPtr == IntPtr.Zero)
-        {
-            Logger.LogError("CoCreateInstance failed: dataSourceObjPtr is null");
-            return false;
-        }
-
-        var comWrappers = new StrategyBasedComWrappers();
-        _dataSource = (IDBInitialize)comWrappers.GetOrCreateObjectForComInstance(dataSourceObjPtr, CreateObjectFlags.None);
-
-        if (_dataSource == null)
+        if (dataSourceObj == null)
        {
            Logger.LogError("CoCreateInstance failed: dataSourceObj is null");
            return false;
        }

+        _dataSource = (IDBInitialize)dataSourceObj;
        _dataSource.Initialize();

        return true;
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/OleDB/DBPROP.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/OleDB/DBPROP.cs
@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information.

 using System.Runtime.InteropServices;
-using Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-using Microsoft.CmdPal.Ext.Indexer.Native;
 using Windows.Win32.Storage.IndexServer;
 using Windows.Win32.System.Com.StructuredStorage;

@@ -18,6 +16,6 @@ internal struct DBPROP
    public uint dwOptions;
    public uint dwStatus;
    public DBID colid;
-    public PropVariant vValue;
+    public PROPVARIANT vValue;
 #pragma warning restore SA1307 // Accessible fields should begin with upper-case letter
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/OleDB/IRowset.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/OleDB/IRowset.cs
@@ -4,39 +4,40 @@

 using System;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;

 namespace Microsoft.CmdPal.Ext.Indexer.Indexer.OleDB;

+[ComImport]
 [Guid("0c733a7c-2a1c-11ce-ade5-00aa0044773d")]
 [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[GeneratedComInterface]
-public partial interface IRowset
+public interface IRowset
 {
-    void AddRefRows(
+    [PreserveSig]
+    int AddRefRows(
        uint cRows,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] rghRows,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] uint[] rgRefCounts,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] rgRowStatus);
+        [In, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] rghRows,
+        [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] uint[] rgRefCounts,
+        [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] rgRowStatus);

-    void GetData(
+    [PreserveSig]
+    int GetData(
        IntPtr hRow,
        IntPtr hAccessor,
        IntPtr pData);

-    void GetNextRows(
+    [PreserveSig]
+    int GetNextRows(
       IntPtr hReserved,
       long lRowsOffset,
       long cRows,
       out uint pcRowsObtained,
       out IntPtr prghRows);

-    void ReleaseRows(
+    [PreserveSig]
+    int ReleaseRows(
        uint cRows,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] rghRows,
+        [In, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] rghRows,
        IntPtr rgRowOptions,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] uint[] rgRefCounts,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] rgRowStatus);
-
-    void RestartPosition(nuint hReserved);
+        [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] uint[] rgRefCounts,
+        [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] rgRowStatus);
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/OleDB/IRowsetInfo.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/OleDB/IRowsetInfo.cs
@@ -4,30 +4,29 @@

 using System;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;

 namespace Microsoft.CmdPal.Ext.Indexer.Indexer.OleDB;

+[ComImport]
 [Guid("0C733A55-2A1C-11CE-ADE5-00AA0044773D")]
 [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[GeneratedComInterface]
-public partial interface IRowsetInfo
+public interface IRowsetInfo
 {
    [PreserveSig]
    int GetProperties(
        uint cPropertyIDSets,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] DBPROPIDSET[] rgPropertyIDSets,
+        [In, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] DBPROPIDSET[] rgPropertyIDSets,
        out ulong pcPropertySets,
        out IntPtr prgPropertySets);

    [PreserveSig]
    int GetReferencedRowset(
        uint iOrdinal,
-        ref Guid riid,
-        [MarshalAs(UnmanagedType.Interface)] out object ppReferencedRowset);
+        [In] ref Guid riid,
+        [Out, MarshalAs(UnmanagedType.Interface)] out object ppReferencedRowset);

    [PreserveSig]
    int GetSpecification(
-        ref Guid riid,
-        [MarshalAs(UnmanagedType.Interface)] out object ppSpecification);
+        [In] ref Guid riid,
+        [Out, MarshalAs(UnmanagedType.Interface)] out object ppSpecification);
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchQuery.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchQuery.cs
@@ -5,13 +5,15 @@
 using System;
 using System.Collections.Concurrent;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
 using System.Threading;
 using ManagedCommon;
 using Microsoft.CmdPal.Ext.Indexer.Indexer.OleDB;
-using Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
 using Microsoft.CmdPal.Ext.Indexer.Indexer.Utils;
 using Microsoft.CmdPal.Ext.Indexer.Native;
+using Windows.Win32;
+using Windows.Win32.System.Com;
+using Windows.Win32.System.Search;
+using Windows.Win32.UI.Shell.PropertiesSystem;

 namespace Microsoft.CmdPal.Ext.Indexer.Indexer;

@@ -120,7 +122,7 @@ internal sealed partial class SearchQuery : IDisposable
                {
                    if (reuseRowset != null)
                    {
-                        // Marshal.ReleaseComObject(reuseRowset);
+                        Marshal.ReleaseComObject(reuseRowset);
                    }

                    // We have a previous rowset, this means the user is typing and we should store this
@@ -146,21 +148,11 @@ internal sealed partial class SearchQuery : IDisposable

    private bool HandleRow(IGetRow getRow, nuint rowHandle)
    {
-        IPropertyStore propertyStorePtr = null;
+        object propertyStorePtr = null;

        try
        {
-            var riid = NativeMethods.PropertyStoreGUID;
-
-            getRow.GetRowFromHROW(null, rowHandle, ref riid, out var ptr);
-            propertyStorePtr = ptr;
-
-            // get IpropertyStore from propertyStorePtr
-            if (propertyStorePtr == null)
-            {
-                Logger.LogError("Failed to get property store pointer");
-                return false;
-            }
+            getRow.GetRowFromHROW(null, rowHandle, typeof(IPropertyStore).GUID, out propertyStorePtr);

            var propertyStore = (IPropertyStore)propertyStorePtr;
            if (propertyStore == null)
@@ -189,7 +181,7 @@ internal sealed partial class SearchQuery : IDisposable
            // Ensure the COM object is released if not returned
            if (propertyStorePtr != null)
            {
-                // Marshal.ReleaseComObject(propertyStorePtr);
+                Marshal.ReleaseComObject(propertyStorePtr);
            }
        }
    }
@@ -202,17 +194,16 @@ internal sealed partial class SearchQuery : IDisposable
            return false;
        }

-        IGetRow getRow = null;
-
-        try
-        {
-            getRow = (IGetRow)currentRowset;
-        }
-        catch (Exception)
+        if (currentRowset is not IGetRow)
        {
            Logger.LogInfo("Reset the current rowset");
            ExecuteSyncInternal();
-            getRow = (IGetRow)currentRowset;
+        }
+
+        if (currentRowset is not IGetRow getRow)
+        {
+            Logger.LogError("Rowset does not support IGetRow interface");
+            return false;
        }

        uint rowCountReturned;
@@ -220,7 +211,12 @@ internal sealed partial class SearchQuery : IDisposable

        try
        {
-            currentRowset.GetNextRows(IntPtr.Zero, offset, limit, out rowCountReturned, out prghRows);
+            var res = currentRowset.GetNextRows(IntPtr.Zero, offset, limit, out rowCountReturned, out prghRows);
+            if (res < 0)
+            {
+                Logger.LogError($"Error fetching rows: {res}");
+                return false;
+            }

            if (rowCountReturned == 0)
            {
@@ -241,9 +237,13 @@ internal sealed partial class SearchQuery : IDisposable
                }
            }

-            currentRowset.ReleaseRows(rowCountReturned, rowHandles, IntPtr.Zero, null, null);
+            res = currentRowset.ReleaseRows(rowCountReturned, rowHandles, IntPtr.Zero, null, null);
+            if (res != 0)
+            {
+                Logger.LogError($"Error releasing rows: {res}");
+            }

-            // Marshal.FreeCoTaskMem(prghRows);
+            Marshal.FreeCoTaskMem(prghRows);
            prghRows = IntPtr.Zero;

            return true;
@@ -257,7 +257,7 @@ internal sealed partial class SearchQuery : IDisposable
        {
            if (prghRows != IntPtr.Zero)
            {
-                // Marshal.FreeCoTaskMem(prghRows);
+                Marshal.FreeCoTaskMem(prghRows);
            }
        }
    }
@@ -270,7 +270,7 @@ internal sealed partial class SearchQuery : IDisposable
        {
            if (reuseRowset != null)
            {
-                // Marshal.ReleaseComObject(reuseRowset);
+                Marshal.ReleaseComObject(reuseRowset);
            }

            reuseRowset = rowset;
@@ -280,48 +280,58 @@ internal sealed partial class SearchQuery : IDisposable

    private unsafe IRowset ExecuteCommand(string queryStr)
    {
-        if (string.IsNullOrEmpty(queryStr))
-        {
-            return null;
-        }
+        object sessionPtr = null;
+        object commandPtr = null;

        try
        {
            var session = (IDBCreateSession)DataSourceManager.GetDataSource();
-            var guid = typeof(IDBCreateCommand).GUID;
-            session.CreateSession(IntPtr.Zero, ref guid, out var sessionPtr);
-
+            session.CreateSession(null, typeof(IDBCreateCommand).GUID, out sessionPtr);
            if (sessionPtr == null)
            {
                Logger.LogError("CreateSession failed");
                return null;
            }

-            // Marshal the session pointer to the actual IDBCreateCommand object
            var createCommand = (IDBCreateCommand)sessionPtr;
-            guid = typeof(ICommandText).GUID;
-            createCommand.CreateCommand(IntPtr.Zero, ref guid, out ICommandText commandText);
+            createCommand.CreateCommand(null, typeof(ICommandText).GUID, out commandPtr);
+            if (commandPtr == null)
+            {
+                Logger.LogError("CreateCommand failed");
+                return null;
+            }

+            var commandText = (ICommandText)commandPtr;
            if (commandText == null)
            {
                Logger.LogError("Failed to get ICommandText interface");
                return null;
            }

-            var riid = NativeHelpers.OleDb.DbGuidDefault;
+            commandText.SetCommandText(in NativeHelpers.OleDb.DbGuidDefault, queryStr);
+            commandText.Execute(null, typeof(IRowset).GUID, null, null, out var rowsetPointer);

-            var irowSetRiid = typeof(IRowset).GUID;
-
-            commandText.SetCommandText(ref riid, queryStr);
-            commandText.Execute(null, ref irowSetRiid, null, out var pcRowsAffected, out var rowsetPointer);
-
-            return rowsetPointer;
+            return rowsetPointer as IRowset;
        }
        catch (Exception ex)
        {
            Logger.LogError("Unexpected error.", ex);
            return null;
        }
+        finally
+        {
+            // Release the command pointer
+            if (commandPtr != null)
+            {
+                Marshal.ReleaseComObject(commandPtr);
+            }
+
+            // Release the session pointer
+            if (sessionPtr != null)
+            {
+                Marshal.ReleaseComObject(sessionPtr);
+            }
+        }
    }

    private IRowsetInfo GetRowsetInfo(IRowset rowset)
@@ -334,36 +344,46 @@ internal sealed partial class SearchQuery : IDisposable
        var rowsetPtr = IntPtr.Zero;
        var rowsetInfoPtr = IntPtr.Zero;

-        unsafe
+        try
        {
-            try
+            // Get the IUnknown pointer for the IRowset object
+            rowsetPtr = Marshal.GetIUnknownForObject(rowset);
+
+            // Query for IRowsetInfo interface
+            var rowsetInfoGuid = typeof(IRowsetInfo).GUID;
+            var res = Marshal.QueryInterface(rowsetPtr, in rowsetInfoGuid, out rowsetInfoPtr);
+            if (res != 0)
            {
-                IRowsetInfo rowsetInfo = (IRowsetInfo)rowset;
-                return rowsetInfo;
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Exception occurred while getting IRowsetInfo. ", ex);
+                Logger.LogError($"Error getting IRowsetInfo interface: {res}");
                return null;
            }
-            finally
-            {
-                // Release the IRowsetInfo pointer if it was obtained
-                if (rowsetInfoPtr != IntPtr.Zero)
-                {
-                    Marshal.Release(rowsetInfoPtr); // Release the IRowsetInfo pointer
-                }

-                // Release the IUnknown pointer for the IRowset object
-                if (rowsetPtr != IntPtr.Zero)
-                {
-                    Marshal.Release(rowsetPtr);
-                }
+            // Marshal the interface pointer to the actual IRowsetInfo object
+            var rowsetInfo = (IRowsetInfo)Marshal.GetObjectForIUnknown(rowsetInfoPtr);
+            return rowsetInfo;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"Exception occurred while getting IRowsetInfo. ", ex);
+            return null;
+        }
+        finally
+        {
+            // Release the IRowsetInfo pointer if it was obtained
+            if (rowsetInfoPtr != IntPtr.Zero)
+            {
+                Marshal.Release(rowsetInfoPtr); // Release the IRowsetInfo pointer
+            }
+
+            // Release the IUnknown pointer for the IRowset object
+            if (rowsetPtr != IntPtr.Zero)
+            {
+                Marshal.Release(rowsetPtr);
            }
        }
    }

-    private unsafe DBPROP? GetPropset(IRowsetInfo rowsetInfo)
+    private DBPROP? GetPropset(IRowsetInfo rowsetInfo)
    {
        var prgPropSetsPtr = IntPtr.Zero;

@@ -384,14 +404,14 @@ internal sealed partial class SearchQuery : IDisposable
            }

            var firstPropSetPtr = new IntPtr(prgPropSetsPtr.ToInt64());
-            var propSet = *(DBPROPSET*)firstPropSetPtr;
+            var propSet = Marshal.PtrToStructure<DBPROPSET>(firstPropSetPtr);
            if (propSet.cProperties == 0 || propSet.rgProperties == IntPtr.Zero)
            {
                return null;
            }

            var propPtr = new IntPtr(propSet.rgProperties.ToInt64());
-            var prop = *(DBPROP*)propPtr;
+            var prop = Marshal.PtrToStructure<DBPROP>(propPtr);
            return prop;
        }
        catch (Exception ex)
@@ -423,9 +443,9 @@ internal sealed partial class SearchQuery : IDisposable
            return 0;
        }

-        if (prop?.vValue.VarType == VarEnum.VT_UI4)
+        if (prop?.vValue.Anonymous.Anonymous.vt == VARENUM.VT_UI4)
        {
-            var value = prop?.vValue._ulong;
+            var value = prop?.vValue.Anonymous.Anonymous.Anonymous.ulVal;
            return (uint)value;
        }

@@ -444,13 +464,13 @@ internal sealed partial class SearchQuery : IDisposable

        if (reuseRowset != null)
        {
-            // Marshal.ReleaseComObject(reuseRowset);
+            Marshal.ReleaseComObject(reuseRowset);
            reuseRowset = null;
        }

        if (currentRowset != null)
        {
-            // Marshal.ReleaseComObject(currentRowset);
+            Marshal.ReleaseComObject(currentRowset);
            currentRowset = null;
        }

--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchResult.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchResult.cs
@@ -3,11 +3,12 @@
 // See the LICENSE file in the project root for more information.

 using System;
-using System.Runtime.InteropServices;
 using ManagedCommon;
-using Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
 using Microsoft.CmdPal.Ext.Indexer.Indexer.Utils;
 using Microsoft.CmdPal.Ext.Indexer.Native;
+using Windows.Win32.System.Com;
+using Windows.Win32.System.Com.StructuredStorage;
+using Windows.Win32.UI.Shell.PropertiesSystem;

 namespace Microsoft.CmdPal.Ext.Indexer.Indexer;

@@ -39,13 +40,13 @@ internal sealed class SearchResult
        try
        {
            var key = NativeHelpers.PropertyKeys.PKEYItemNameDisplay;
-            propStore.GetValue(key, out var itemNameDisplay);
+            propStore.GetValue(&key, out var itemNameDisplay);

            key = NativeHelpers.PropertyKeys.PKEYItemUrl;
-            propStore.GetValue(key, out var itemUrl);
+            propStore.GetValue(&key, out var itemUrl);

            key = NativeHelpers.PropertyKeys.PKEYKindText;
-            propStore.GetValue(key, out var kindText);
+            propStore.GetValue(&key, out var kindText);

            var filePath = GetFilePath(ref itemUrl);
            var isFolder = IsFoder(ref kindText);
@@ -66,35 +67,28 @@ internal sealed class SearchResult
        }
    }

-    private static bool IsFoder(ref PropVariant kindText)
+    private static bool IsFoder(ref PROPVARIANT kindText)
    {
        var kindString = GetStringFromPropVariant(ref kindText);
        return string.Equals(kindString, "Folder", StringComparison.OrdinalIgnoreCase);
    }

-    private static string GetFilePath(ref PropVariant itemUrl)
+    private static string GetFilePath(ref PROPVARIANT itemUrl)
    {
        var filePath = GetStringFromPropVariant(ref itemUrl);
        filePath = UrlToFilePathConverter.Convert(filePath);
        return filePath;
    }

-    private static string GetStringFromPropVariant(ref PropVariant propVariant)
+    private static string GetStringFromPropVariant(ref PROPVARIANT propVariant)
    {
-        if (propVariant.VarType == System.Runtime.InteropServices.VarEnum.VT_LPWSTR)
+        if (propVariant.Anonymous.Anonymous.vt == VARENUM.VT_LPWSTR)
        {
-            var pwszVal = propVariant._ptr;
-
-            if (pwszVal == IntPtr.Zero)
+            var pwszVal = propVariant.Anonymous.Anonymous.Anonymous.pwszVal;
+            if (pwszVal != null)
            {
-                return string.Empty;
+                return pwszVal.ToString();
            }
-
-            // convert to string
-            var str = Marshal.PtrToStringUni(pwszVal);
-
-            // Marshal.FreeCoTaskMem(pwszVal);
-            return str;
        }

        return string.Empty;
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchCatalogManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchCatalogManager.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[CoClass(typeof(CSearchCatalogManagerClass))]
+[Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF50")]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1715:Identifiers should have correct prefix", Justification = "Using original name from type lib")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:Interface names should begin with I", Justification = "Using original name from type lib")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Using original name from type lib")]
+public interface CSearchCatalogManager : ISearchCatalogManager
+{
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchCatalogManagerClass.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchCatalogManagerClass.cs
@@ -0,0 +1,131 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[ComConversionLoss]
+[Guid("AAB49DD5-AD0B-40AE-B654-AE8976BF6BD2")]
+[ClassInterface((short)0)]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1212:Property accessors should follow order", Justification = "The order of the property accessors must match the order in which the methods were defined in the vtable")]
+public class CSearchCatalogManagerClass : ISearchCatalogManager, CSearchCatalogManager
+{
+    [DispId(1610678272)]
+    public virtual extern string Name
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern IntPtr GetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void SetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName, [In] ref object pValue);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void GetCatalogStatus(
+      out object pStatus,
+      out object pPausedReason);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void Reset();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void Reindex();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void ReindexMatchingURLs([MarshalAs(UnmanagedType.LPWStr), In] string pszPattern);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void ReindexSearchRoot([MarshalAs(UnmanagedType.LPWStr), In] string pszRoot);
+
+    [DispId(1610678280)]
+    public virtual extern uint ConnectTimeout
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678282)]
+    public virtual extern uint DataTimeout
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern int NumberOfItems();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void NumberOfItemsToIndex(
+      out int plIncrementalCount,
+      out int plNotificationQueue,
+      out int plHighPriorityQueue);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.LPWStr)]
+    public virtual extern string URLBeingIndexed();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern uint GetURLIndexingState([MarshalAs(UnmanagedType.LPWStr), In] string psz);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    public virtual extern object GetPersistentItemsChangedSink();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void RegisterViewForNotification(
+      [MarshalAs(UnmanagedType.LPWStr), In] string pszView,
+      [MarshalAs(UnmanagedType.Interface), In] object pViewChangedSink,
+      out uint pdwCookie);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void GetItemsChangedSink(
+      [MarshalAs(UnmanagedType.Interface), In] object pISearchNotifyInlineSite,
+      [In] ref Guid riid,
+      out IntPtr ppv,
+      out Guid pGUIDCatalogResetSignature,
+      out Guid pGUIDCheckPointSignature,
+      out uint pdwLastCheckPointNumber);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void UnregisterViewForNotification([In] uint dwCookie);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void SetExtensionClusion([MarshalAs(UnmanagedType.LPWStr), In] string pszExtension, [In] int fExclude);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    public virtual extern object EnumerateExcludedExtensions();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    public virtual extern CSearchQueryHelper GetQueryHelper();
+
+    [DispId(1610678295)]
+    public virtual extern int DiacriticSensitivity
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    public virtual extern object GetCrawlScopeManager();
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchManager.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[CoClass(typeof(CSearchManagerClass))]
+[Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF69")]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1715:Identifiers should have correct prefix", Justification = "Using original name from type lib")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:Interface names should begin with I", Justification = "Using original name from type lib")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Using original name from type lib")]
+public interface CSearchManager : ISearchManager
+{
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchManagerClass.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchManagerClass.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Microsoft Corporation
+// The 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.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[Guid("7D096C5F-AC08-4F1F-BEB7-5C22C517CE39")]
+[TypeLibType(2)]
+[ClassInterface((short)0)]
+[ComConversionLoss]
+[ComImport]
+public class CSearchManagerClass : ISearchManager, CSearchManager
+{
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void GetIndexerVersionStr([MarshalAs(UnmanagedType.LPWStr)] out string ppszVersionString);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void GetIndexerVersion(out uint pdwMajor, out uint pdwMinor);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern IntPtr GetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void SetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName, [In] ref object pValue);
+
+    [DispId(1610678276)]
+    public virtual extern string ProxyName
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [DispId(1610678277)]
+    public virtual extern string BypassList
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void SetProxy(
+      [In] object sUseProxy,
+      [In] int fLocalByPassProxy,
+      [In] uint dwPortNumber,
+      [MarshalAs(UnmanagedType.LPWStr), In] string pszProxyName,
+      [MarshalAs(UnmanagedType.LPWStr), In] string pszByPassList);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    public virtual extern CSearchCatalogManager GetCatalog([MarshalAs(UnmanagedType.LPWStr), In] string pszCatalog);
+
+    [DispId(1610678280)]
+    public virtual extern string UserAgent
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+    }
+
+    [DispId(1610678282)]
+    public virtual extern object UseProxy
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678283)]
+    public virtual extern int LocalBypass
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678284)]
+    public virtual extern uint PortNumber
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchQueryHelper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchQueryHelper.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF63")]
+[CoClass(typeof(CSearchQueryHelperClass))]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1715:Identifiers should have correct prefix", Justification = "Using original name from type lib")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:Interface names should begin with I", Justification = "Using original name from type lib")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Using original name from type lib")]
+public interface CSearchQueryHelper : ISearchQueryHelper
+{
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchQueryHelperClass.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchQueryHelperClass.cs
@@ -0,0 +1,134 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[ClassInterface((short)0)]
+[Guid("B271E955-09E1-42E1-9B95-5994A534B613")]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1212:Property accessors should follow order", Justification = "The order of the property accessors must match the order in which the methods were defined in the vtable")]
+public class CSearchQueryHelperClass : ISearchQueryHelper, CSearchQueryHelper
+{
+    [DispId(1610678272)]
+    public virtual extern string ConnectionString
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [DispId(1610678273)]
+    public virtual extern uint QueryContentLocale
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678275)]
+    public virtual extern uint QueryKeywordLocale
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678277)]
+    public virtual extern object QueryTermExpansion
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678279)]
+    public virtual extern object QuerySyntax
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678281)]
+    public virtual extern string QueryContentProperties
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [DispId(1610678283)]
+    public virtual extern string QuerySelectColumns
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [DispId(1610678285)]
+    public virtual extern string QueryWhereRestrictions
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [DispId(1610678287)]
+    public virtual extern string QuerySorting
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.LPWStr)]
+    public virtual extern string GenerateSQLFromUserQuery([MarshalAs(UnmanagedType.LPWStr), In] string pszQuery);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void WriteProperties(
+      [In] int itemID,
+      [In] uint dwNumberOfColumns,
+      [In] ref object pColumns,
+      [In] ref object pValues,
+      [In] ref object pftGatherModifiedTime);
+
+    [DispId(1610678291)]
+    public virtual extern int QueryMaxResults
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ICommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ICommand.cs
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-using Microsoft.CmdPal.Ext.Indexer.Indexer.OleDB;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("0C733A63-2A1C-11CE-ADE5-00AA0044773D")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface ICommand
-{
-    void Cancel();
-
-    void Execute([MarshalAs(UnmanagedType.Interface)] object pUnkOuter, ref Guid riid, [Optional][MarshalAs(UnmanagedType.Interface)] object pParams, [Optional]out int pcRowsAffected, out IRowset ppRowset);
-
-    void GetDBSession(ref Guid riid, out IntPtr ppSession);
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ICommandText.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ICommandText.cs
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.Indexer.Indexer.OleDB;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("0C733A27-2A1C-11CE-ADE5-00AA0044773D")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface ICommandText : ICommand
-{
-    void GetCommandText([Optional] ref Guid pguidDialect, out IntPtr ppwszCommand);
-
-    void SetCommandText(ref Guid rguidDialect, string pwszCommand);
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IDBCreateCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IDBCreateCommand.cs
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("0C733A1D-2A1C-11CE-ADE5-00AA0044773D")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface IDBCreateCommand
-{
-    void CreateCommand(IntPtr pUnkOuter, ref Guid riid, out ICommandText ppCommand);
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IDBCreateSession.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IDBCreateSession.cs
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("0C733A5D-2A1C-11CE-ADE5-00AA0044773D")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface IDBCreateSession
-{
-    void CreateSession(IntPtr pUnkOuter, ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out object ppDBSession);
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IDBInitialize.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IDBInitialize.cs
@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("0C733A8B-2A1C-11CE-ADE5-00AA0044773D")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface IDBInitialize
-{
-    void Initialize();
-
-    void Uninitialize();
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IGetRow.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IGetRow.cs
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.Indexer.Native;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("0C733AAF-2A1C-11CE-ADE5-00AA0044773D")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface IGetRow
-{
-    unsafe void GetRowFromHROW([MarshalAs(UnmanagedType.Interface)] object pUnkOuter, nuint hRow, ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out IPropertyStore ppUnk);
-
-    unsafe string GetURLFromHROW(nuint hRow);
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IPropertyStore.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IPropertyStore.cs
@@ -1,27 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-
-[assembly: System.Runtime.CompilerServices.DisableRuntimeMarshalling]
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("886d8eeb-8cf2-4446-8d02-cdba1dbdcf99")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface IPropertyStore
-{
-    uint GetCount();
-
-    PropertyKey GetAt(uint iProp);
-
-    void GetValue(in PropertyKey pkey, out PropVariant pv);
-
-    void SetValue(in PropertyKey pkey, in PropVariant pv);
-
-    void Commit();
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ISearchCatalogManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ISearchCatalogManager.cs
@@ -5,69 +5,125 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;

 namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;

 [Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF50")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Please do not change the function name")]
-public partial interface ISearchCatalogManager
+[ComConversionLoss]
+[InterfaceType(1)]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1212:Property accessors should follow order", Justification = "The order of the property accessors must match the order in which the methods were defined in the vtable")]
+public interface ISearchCatalogManager
 {
-    string get_Name();
+    [DispId(1610678272)]
+    string Name
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }

-    void GetParameter(string pszName, out IntPtr pValue);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    IntPtr GetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName);

-    void SetParameter(string pszName, ref IntPtr pValue);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void SetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName, [In] ref object pValue);

-    void GetCatalogStatus(out uint pdwStatus, out uint pdwPausedReason);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void GetCatalogStatus(out object pStatus, out object pPausedReason);

+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
    void Reset();

+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
    void Reindex();

-    void ReindexMatchingURLs(string pszPattern);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void ReindexMatchingURLs([MarshalAs(UnmanagedType.LPWStr), In] string pszPattern);

-    void ReindexSearchRoot(string pszRoot);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void ReindexSearchRoot([MarshalAs(UnmanagedType.LPWStr), In] string pszRoot);

-    uint get_ConnectTimeout();
+    [DispId(1610678280)]
+    uint ConnectTimeout
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }

-    void put_ConnectTimeout(uint dwTimeout);
+    [DispId(1610678282)]
+    uint DataTimeout
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }

-    uint get_DataTimeout();
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    int NumberOfItems();

-    void put_DataTimeout(uint dwTimeout);
-
-    uint NumberOfItems();
-
-    uint NumberOfItemsToIndex();
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void NumberOfItemsToIndex(
+      out int plIncrementalCount,
+      out int plNotificationQueue,
+      out int plHighPriorityQueue);

+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
    [return: MarshalAs(UnmanagedType.LPWStr)]
    string URLBeingIndexed();

-    void GetURLIndexingState(string pszURL, out uint pdwState);
-
-    IntPtr GetPersistentItemsChangedSink();
-
-    void RegisterViewForNotification(string pszView, IntPtr pViewNotify, out uint pdwCookie);
-
-    IntPtr GetItemsChangedSink();
-
-    void UnregisterViewForNotification(uint dwCookie);
-
-    void SetExtensionClusion(string pszExtension, [MarshalAs(UnmanagedType.Bool)] bool fExclude);
-
-    void EnumerateExcludedExtensions();
-
-    [return: MarshalAs(UnmanagedType.Interface)]
    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    ISearchQueryHelper GetQueryHelper();
+    uint GetURLIndexingState([MarshalAs(UnmanagedType.LPWStr), In] string psz);

-    [return: MarshalAs(UnmanagedType.Bool)]
-    bool get_DiacriticSensitivity();
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetPersistentItemsChangedSink();

-    void put_DiacriticSensitivity([MarshalAs(UnmanagedType.Bool)] bool fDiacriticSensitive);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void RegisterViewForNotification(
+      [MarshalAs(UnmanagedType.LPWStr), In] string pszView,
+      [MarshalAs(UnmanagedType.Interface), In] object pViewChangedSink,
+      out uint pdwCookie);

-    IntPtr GetCrawlScopeManager();
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void GetItemsChangedSink(
+      [MarshalAs(UnmanagedType.Interface), In] object pISearchNotifyInlineSite,
+      [In] ref Guid riid,
+      out IntPtr ppv,
+      out Guid pGUIDCatalogResetSignature,
+      out Guid pGUIDCheckPointSignature,
+      out uint pdwLastCheckPointNumber);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void UnregisterViewForNotification([In] uint dwCookie);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void SetExtensionClusion([MarshalAs(UnmanagedType.LPWStr), In] string pszExtension, [In] int fExclude);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object EnumerateExcludedExtensions();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    CSearchQueryHelper GetQueryHelper();
+
+    [DispId(1610678295)]
+    int DiacriticSensitivity
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetCrawlScopeManager();
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ISearchManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ISearchManager.cs
@@ -3,47 +3,87 @@
 // See the LICENSE file in the project root for more information.

 using System;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;

 namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;

+[ComConversionLoss]
 [Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF69")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Please do not change the function name")]
-public partial interface ISearchManager
+[InterfaceType(1)]
+[ComImport]
+public interface ISearchManager
 {
-    string GetIndexerVersionStr();
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void GetIndexerVersionStr([MarshalAs(UnmanagedType.LPWStr)] out string ppszVersionString);

+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
    void GetIndexerVersion(out uint pdwMajor, out uint pdwMinor);

-    void GetParameter(string pszName, [MarshalAs(UnmanagedType.Interface)] out object pValue);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    IntPtr GetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName);

-    void SetParameter(string pszName, [MarshalAs(UnmanagedType.Interface)] ref object pValue);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void SetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName, [In] ref object pValue);

-    [return: MarshalAs(UnmanagedType.Bool)]
-    bool get_UseProxy();
+    [DispId(1610678276)]
+    string ProxyName
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }

-    string get_BypassList();
+    [DispId(1610678277)]
+    string BypassList
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }

+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
    void SetProxy(
-        string pszProxyName,
-        [MarshalAs(UnmanagedType.Bool)] bool fLocalBypass,
-        string pszBypassList,
-        uint dwPortNumber);
+      [In] object sUseProxy,
+      [In] int fLocalByPassProxy,
+      [In] uint dwPortNumber,
+      [MarshalAs(UnmanagedType.LPWStr), In] string pszProxyName,
+      [MarshalAs(UnmanagedType.LPWStr), In] string pszByPassList);

+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
    [return: MarshalAs(UnmanagedType.Interface)]
-    ISearchCatalogManager GetCatalog(string pszCatalog);
+    CSearchCatalogManager GetCatalog([MarshalAs(UnmanagedType.LPWStr), In] string pszCatalog);

-    string get_UserAgent();
+    [DispId(1610678280)]
+    string UserAgent
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+    }

-    void put_UserAgent(string pszUserAgent);
+    [DispId(1610678282)]
+    object UseProxy
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }

-    string get_ProxyName();
+    [DispId(1610678283)]
+    int LocalBypass
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }

-    [return: MarshalAs(UnmanagedType.Bool)]
-    bool get_LocalBypass();
-
-    uint get_PortNumber();
+    [DispId(1610678284)]
+    uint PortNumber
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ISearchQueryHelper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ISearchQueryHelper.cs
@@ -5,75 +5,130 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;

 namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;

 [Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF63")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Please do not change the function name")]
-public partial interface ISearchQueryHelper
+[InterfaceType(1)]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1212:Property accessors should follow order", Justification = "The order of the property accessors must match the order in which the methods were defined in the vtable")]
+public interface ISearchQueryHelper
 {
-    string GetConnectionString();
+    [DispId(1610678272)]
+    string ConnectionString
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }

-    void SetQueryContentLocale(int lcid);
+    [DispId(1610678273)]
+    uint QueryContentLocale
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }

-    uint GetQueryContentLocale();
+    [DispId(1610678275)]
+    uint QueryKeywordLocale
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }

-    void SetQueryKeywordLocale(int lcid);
+    [DispId(1610678277)]
+    object QueryTermExpansion
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }

-    uint GetQueryKeywordLocale();
+    [DispId(1610678279)]
+    object QuerySyntax
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }

-    void SetQueryTermExpansion(SEARCH_TERM_EXPANSION expandTerms);
+    [DispId(1610678281)]
+    string QueryContentProperties
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }

-    void GetQueryTermExpansion(out SEARCH_TERM_EXPANSION pExpandTerms);
+    [DispId(1610678283)]
+    string QuerySelectColumns
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }

-    void SetQuerySyntax(SEARCH_QUERY_SYNTAX querySyntax);
+    [DispId(1610678285)]
+    string QueryWhereRestrictions
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }

-    [return: MarshalAs(UnmanagedType.Interface)]
-    object GetQuerySyntax();
+    [DispId(1610678287)]
+    string QuerySorting
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }

-    void SetQueryContentProperties(string pszContentProperties);
-
-    string GetQueryContentProperties();
-
-    void SetQuerySelectColumns(string pszColumns);
-
-    string GetQuerySelectColumns();
-
-    void SetQueryWhereRestrictions(string pszRestrictions);
-
-    string GetQueryWhereRestrictions();
-
-    void SetQuerySorting(string pszSorting);
-
-    string GetQuerySorting();
-
-    string GenerateSQLFromUserQuery(string pszQuery);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.LPWStr)]
+    string GenerateSQLFromUserQuery([MarshalAs(UnmanagedType.LPWStr), In] string pszQuery);

+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
    void WriteProperties(
-      int itemID,
-      uint dwNumberOfColumns,
-      [MarshalAs(UnmanagedType.Interface)] ref object pColumns,
-      [MarshalAs(UnmanagedType.Interface)] ref object pValues,
-      [MarshalAs(UnmanagedType.Interface)] ref object pftGatherModifiedTime);
+      [In] int itemID,
+      [In] uint dwNumberOfColumns,
+      [In] ref object pColumns,
+      [In] ref object pValues,
+      [In] ref object pftGatherModifiedTime);

-    void SetQueryMaxResults(int lMaxResults);
-
-    int GetQueryMaxResults();
-}
-
-public enum SEARCH_TERM_EXPANSION
-{
-    SEARCH_TERM_NO_EXPANSION,
-    SEARCH_TERM_PREFIX_ALL,
-    SEARCH_TERM_STEM_ALL,
-}
-
-public enum SEARCH_QUERY_SYNTAX
-{
-    SEARCH_NO_QUERY_SYNTAX,
-    SEARCH_ADVANCED_QUERY_SYNTAX,
-    SEARCH_NATURAL_QUERY_SYNTAX,
+    [DispId(1610678291)]
+    int QueryMaxResults
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/PropVariant.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/PropVariant.cs
@@ -1,123 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-using System.Text;
-using System.Threading.Tasks;
-using VARTYPE = System.Runtime.InteropServices.VarEnum;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[StructLayout(LayoutKind.Explicit, Pack = 8)]
-public struct PropVariant
-{
-    /// <summary>Value type tag.</summary>
-    [FieldOffset(0)]
-    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "No, please do not change the name")]
-    public ushort vt;
-
-    [FieldOffset(2)]
-    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "No, please do not change the name")]
-    public ushort wReserved1;
-
-    /// <summary>Reserved for future use.</summary>
-    [FieldOffset(4)]
-    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "No, please do not change the name")]
-    public ushort wReserved2;
-
-    /// <summary>Reserved for future use.</summary>
-    [FieldOffset(6)]
-    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "No, please do not change the name")]
-    public ushort wReserved3;
-
-    /// <summary>The decimal value when VT_DECIMAL.</summary>
-    [FieldOffset(0)]
-    internal decimal _decimal;
-
-    /// <summary>The raw data pointer.</summary>
-    [FieldOffset(8)]
-    internal IntPtr _ptr;
-
-    /// <summary>The FILETIME when VT_FILETIME.</summary>
-    [FieldOffset(8)]
-    internal System.Runtime.InteropServices.ComTypes.FILETIME _ft;
-
-    [FieldOffset(8)]
-    internal BLOB _blob;
-
-    /// <summary>The value when a numeric value less than 8 bytes.</summary>
-    [FieldOffset(8)]
-    internal ulong _ulong;
-
-    public PropVariant(string value)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-        vt = (ushort)VarEnum.VT_LPWSTR;
-        _ptr = Marshal.StringToCoTaskMemUni(value);
-    }
-
-    public VarEnum VarType { get => (VarEnum)vt; set => vt = (ushort)(VARTYPE)value; }
-}
-
-[StructLayout(LayoutKind.Sequential, Pack = 0)]
-public struct BLOB
-{
-    /// <summary>The count of bytes</summary>
-    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "No need")]
-    public uint cbSize;
-
-    /// <summary>A pointer to the allocated array of bytes.</summary>
-    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "No need")]
-    public IntPtr pBlobData;
-}
-
-[CustomMarshaller(typeof(PropVariant), MarshalMode.UnmanagedToManagedOut, typeof(PROPVARIANTOutMarshaller))]
-[CustomMarshaller(typeof(PropVariant), MarshalMode.ManagedToUnmanagedOut, typeof(PROPVARIANTOutMarshaller))]
-public static partial class PROPVARIANTOutMarshaller
-{
-    public static void Free(IntPtr managed)
-    {
-        // Marshal.FreeCoTaskMem(managed);
-    }
-
-    public static unsafe PropVariant ConvertToManaged(IntPtr unmanaged)
-    {
-        // return Marshal.PtrToStructure<PropVariant>(unmanaged);
-        return new PropVariant("test");
-    }
-
-    public static nint ConvertToUnmanaged(PropVariant managed)
-    {
-        var obj = Marshal.GetIUnknownForObject(managed);
-        return obj;
-    }
-}
-
-[CustomMarshaller(typeof(PropVariant), MarshalMode.ManagedToUnmanagedIn, typeof(PROPVARIANTRefMarshaller))]
-[CustomMarshaller(typeof(PropVariant), MarshalMode.UnmanagedToManagedIn, typeof(PROPVARIANTRefMarshaller))]
-[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "No need")]
-public static partial class PROPVARIANTRefMarshaller
-{
-    public static void Free(IntPtr managed)
-    {
-        // Marshal.FreeCoTaskMem(managed);
-    }
-
-    public static PropVariant ConvertToManaged(IntPtr unmanaged)
-    {
-        var obj = Marshal.GetObjectForIUnknown(unmanaged);
-        return (PropVariant)obj;
-    }
-
-    public static nint ConvertToUnmanaged(PropVariant managed)
-    {
-        var obj = Marshal.GetIUnknownForObject(managed);
-        return obj;
-    }
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/PropertyKey.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/PropertyKey.cs
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[StructLayout(LayoutKind.Sequential)]
-public struct PropertyKey
-{
-    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "No, please do not change the name")]
-    public Guid fmtid;
-
-    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "No, please do not change the name")]
-    public uint pid;
-
-    public PropertyKey(Guid fmtid, uint pid)
-    {
-        this.fmtid = fmtid;
-        this.pid = pid;
-    }
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/Utils/QueryStringBuilder.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/Utils/QueryStringBuilder.cs
@@ -2,16 +2,12 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using System.Globalization;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
 using Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-using Microsoft.CmdPal.Ext.Indexer.Native;

 namespace Microsoft.CmdPal.Ext.Indexer.Indexer.Utils;

-internal sealed partial class QueryStringBuilder
+internal sealed class QueryStringBuilder
 {
    private const string Properties = "System.ItemUrl, System.ItemNameDisplay, path, System.Search.EntryID, System.Kind, System.KindText";
    private const string SystemIndex = "SystemIndex";
@@ -28,40 +24,16 @@ internal sealed partial class QueryStringBuilder
    {
        if (queryHelper == null)
        {
-            ComWrappers cw = new StrategyBasedComWrappers();
-
-            var hr = NativeMethods.CoCreateInstance(NativeHelpers.CsWin32GUID.CLSIDSearchManager, IntPtr.Zero, NativeHelpers.CLSCTXINPROCALL, NativeHelpers.CsWin32GUID.IIDISearchManager, out var searchManagerPtr);
-            if (hr != 0)
-            {
-                throw new ArgumentException($"Failed to create SearchManager instance. HR: 0x{hr:X}");
-            }
-
-            var searchManager = (ISearchManager)cw.GetOrCreateObjectForComInstance(
-                searchManagerPtr, CreateObjectFlags.None);
-
-            if (searchManager == null)
-            {
-                throw new ArgumentException("Failed to get ISearchManager interface");
-            }
-
+            var searchManager = new CSearchManager();
            ISearchCatalogManager catalogManager = searchManager.GetCatalog(SystemIndex);
-            if (catalogManager == null)
-            {
-                throw new ArgumentException($"Failed to get catalog manager for {SystemIndex}");
-            }
-
            queryHelper = catalogManager.GetQueryHelper();
-            if (queryHelper == null)
-            {
-                throw new ArgumentException("Failed to get query helper from catalog manager");
-            }

-            queryHelper.SetQuerySelectColumns(Properties);
-            queryHelper.SetQueryContentProperties("System.FileName");
-            queryHelper.SetQuerySorting(OrderConditions);
+            queryHelper.QuerySelectColumns = Properties;
+            queryHelper.QueryContentProperties = "System.FileName";
+            queryHelper.QuerySorting = OrderConditions;
        }

-        queryHelper.SetQueryWhereRestrictions("AND " + ScopeFileConditions + "AND ReuseWhere(" + whereId.ToString(CultureInfo.InvariantCulture) + ")");
+        queryHelper.QueryWhereRestrictions = "AND " + ScopeFileConditions + "AND ReuseWhere(" + whereId.ToString(CultureInfo.InvariantCulture) + ")";
        return queryHelper.GenerateSQLFromUserQuery(searchText);
    }
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Microsoft.CmdPal.Ext.Indexer.csproj
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Microsoft.CmdPal.Ext.Indexer.csproj
@@ -1,14 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-	<Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
-
-
-	<PropertyGroup>
+  <PropertyGroup>
    <RootNamespace>Microsoft.CmdPal.Ext.Indexer</RootNamespace>
+
    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-	  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
  </PropertyGroup>

  <ItemGroup>
@@ -48,14 +46,4 @@
    </EmbeddedResource>
  </ItemGroup>

-	<PropertyGroup>
-		<SelfContained>true</SelfContained>
-		<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-		<PublishTrimmed>true</PublishTrimmed>
-		<PublishSingleFile>true</PublishSingleFile>
-		<DisableRuntimeMarshalling>false</DisableRuntimeMarshalling>
-		<PublishAot>true</PublishAot>
-		<EnableMsixTooling>true</EnableMsixTooling>
-	</PropertyGroup>
-
 </Project>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kayla Cinnamon	5e3dd9213b	Put reg preview item back and updated highlights	2025-05-14 09:30:55 -07:00
Kayla Cinnamon	fa19d66270	Changed highlights and removed reg preview line item	2025-05-14 08:33:25 -07:00
yaqingmi	20702b7d8f	Update MD5	2025-05-14 18:44:03 +08:00
Kayla Cinnamon	fb38bb2b43	Clean up the highlights section	2025-05-12 15:17:44 -07:00
yaqingmi	b3361573ab	Add PRs about Doc changes	2025-05-09 11:27:40 +08:00
Kayla Cinnamon	5530f71cc7	Overall edits	2025-05-08 16:18:50 -07:00
yaqingmi	0caf1fca5c	Add the Highlights part	2025-05-08 19:12:01 +08:00
yaqingmi	ecbcadf26a	Add all PRs up to this point, except for some documentation-related ones.	2025-05-08 17:33:32 +08:00
yaqingmi	b26eeeaf57	Add one more PR	2025-05-08 00:52:28 +08:00
yaqingmi	b520b32c4b	Add some PRs	2025-05-08 00:41:16 +08:00
yaqingmi	b61a55b4fa	Add two more PRs	2025-05-07 21:10:57 +08:00
yaqingmi	22d9062b7d	Add more PRs	2025-05-07 20:56:22 +08:00
yaqingmi	3074743366	Add more PRs	2025-05-07 16:56:51 +08:00
yaqingmi	9f5ce6f49e	Add some PRs	2025-05-07 13:30:22 +08:00
yaqingmi	930cff0bd4	Some PRs are still not included. Some PRs are still not included.	2025-05-06 22:31:17 +08:00
yaqingmi	a4b83d0f6f	Update version to 0.91 Update version to 0.91	2025-05-06 17:01:41 +08:00