Migrate spelling-0.0.21 changes from main

preview connection ctor takes preview string
Fix mis-aligned Navigationview footer and save buttons in the settings page (#13282 )
2026-04-08 07:11:08 +00:00 · 2022-06-13 15:03:41 -07:00 · 2022-06-13 15:03:41 -07:00 · 2022-06-13 15:12:18 +00:00 · 2022-06-13 11:18:53 +00:00 · 2022-06-10 21:05:02 +00:00
695 changed files with 16343 additions and 13496 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -11,7 +11,7 @@ AlignOperands: true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: Never
-AllowShortFunctionsOnASingleLine: Inline
+AllowShortFunctionsOnASingleLine: All
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortIfStatementsOnASingleLine: Never
 #AllowShortLambdasOnASingleLine: Inline
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29001.49
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32422.2
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Terminal", "Terminal", "{59840756-302F-44DF-AA47-441A9D673202}"
 EndProject
@@ -406,6 +406,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{61901E80
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererAtlas", "src\renderer\atlas\atlas.vcxproj", "{8222900C-8B6C-452A-91AC-BE95DB04B95F}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InteractivityOneCore", "src\interactivity\onecore\lib\onecore.LIB.vcxproj", "{06EC74CB-9A12-428C-B551-8537EC964726}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererWddmCon", "src\renderer\wddmcon\lib\wddmcon.vcxproj", "{75C6F576-18E9-4566-978A-F0A301CAC090}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Audio", "Audio", "{40BD8415-DD93-4200-8D82-498DDDC08CC8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MidiAudio", "src\audio\midi\lib\midi.vcxproj", "{3C67784E-1453-49C2-9660-483E2CC7F7AD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -3375,6 +3383,116 @@ Global
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x64.Build.0 = Release|x64
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x86.ActiveCfg = Release|Win32
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x86.Build.0 = Release|Win32
+		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|Any CPU.ActiveCfg = AuditMode|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|ARM.ActiveCfg = AuditMode|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|x64.Build.0 = AuditMode|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|ARM.ActiveCfg = Debug|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|ARM64.Build.0 = Debug|ARM64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|DotNet_x64Test.ActiveCfg = Debug|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|DotNet_x86Test.ActiveCfg = Debug|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|x64.ActiveCfg = Debug|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|x64.Build.0 = Debug|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|x86.ActiveCfg = Debug|Win32
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Debug|x86.Build.0 = Debug|Win32
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|ARM.ActiveCfg = Fuzzing|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|DotNet_x64Test.ActiveCfg = Fuzzing|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|DotNet_x86Test.ActiveCfg = Fuzzing|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|Any CPU.ActiveCfg = Release|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|ARM.ActiveCfg = Release|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|ARM64.ActiveCfg = Release|ARM64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|ARM64.Build.0 = Release|ARM64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|DotNet_x64Test.ActiveCfg = Release|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|DotNet_x86Test.ActiveCfg = Release|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|x64.ActiveCfg = Release|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|x64.Build.0 = Release|x64
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|x86.ActiveCfg = Release|Win32
+		{06EC74CB-9A12-428C-B551-8537EC964726}.Release|x86.Build.0 = Release|Win32
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|Any CPU.ActiveCfg = AuditMode|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|ARM.ActiveCfg = AuditMode|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|ARM.ActiveCfg = Debug|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|ARM64.Build.0 = Debug|ARM64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|DotNet_x64Test.ActiveCfg = Debug|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|DotNet_x86Test.ActiveCfg = Debug|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|x64.ActiveCfg = Debug|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|x64.Build.0 = Debug|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|x86.ActiveCfg = Debug|Win32
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Debug|x86.Build.0 = Debug|Win32
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|ARM.ActiveCfg = Fuzzing|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|DotNet_x64Test.ActiveCfg = Fuzzing|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|DotNet_x86Test.ActiveCfg = Fuzzing|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|x64.Build.0 = Fuzzing|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|Any CPU.ActiveCfg = Release|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|ARM.ActiveCfg = Release|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|ARM64.ActiveCfg = Release|ARM64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|ARM64.Build.0 = Release|ARM64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|DotNet_x64Test.ActiveCfg = Release|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|DotNet_x86Test.ActiveCfg = Release|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|x64.ActiveCfg = Release|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|x64.Build.0 = Release|x64
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|x86.ActiveCfg = Release|Win32
+		{75C6F576-18E9-4566-978A-F0A301CAC090}.Release|x86.Build.0 = Release|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|x64.Build.0 = AuditMode|x64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|ARM.ActiveCfg = Debug|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|ARM64.Build.0 = Debug|ARM64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|x64.ActiveCfg = Debug|x64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|x64.Build.0 = Debug|x64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|x86.ActiveCfg = Debug|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Debug|x86.Build.0 = Debug|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|DotNet_x64Test.ActiveCfg = Fuzzing|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|DotNet_x86Test.ActiveCfg = Fuzzing|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|x64.Build.0 = Fuzzing|x64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Fuzzing|x86.Build.0 = Fuzzing|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|Any CPU.ActiveCfg = Release|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|ARM.ActiveCfg = Release|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|ARM64.Build.0 = Release|ARM64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|x64.ActiveCfg = Release|x64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|x64.Build.0 = Release|x64
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|x86.ActiveCfg = Release|Win32
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3476,6 +3594,10 @@ Global
 		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
 		{61901E80-E97D-4D61-A9BB-E8F2FDA8B40C} = {59840756-302F-44DF-AA47-441A9D673202}
 		{8222900C-8B6C-452A-91AC-BE95DB04B95F} = {05500DEF-2294-41E3-AF9A-24E580B82836}
+		{06EC74CB-9A12-428C-B551-8537EC964726} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
+		{75C6F576-18E9-4566-978A-F0A301CAC090} = {05500DEF-2294-41E3-AF9A-24E580B82836}
+		{40BD8415-DD93-4200-8D82-498DDDC08CC8} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
+		{3C67784E-1453-49C2-9660-483E2CC7F7AD} = {40BD8415-DD93-4200-8D82-498DDDC08CC8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}
--- a/README.md
+++ b/README.md
@@ -111,10 +111,10 @@ repository.

 ---

-## Windows Terminal 2.0 Roadmap
+## Windows Terminal Roadmap

-The plan for delivering Windows Terminal 2.0 [is described
-here](/doc/terminal-v2-roadmap.md) and will be updated as the project proceeds.
+The plan for the Windows Terminal [is described here](/doc/roadmap-2022.md) and
+will be updated as the project proceeds.

 ## Project Build Status

--- a/build/config/ESRPSigning_ConPTY.json
+++ b/build/config/ESRPSigning_ConPTY.json
@@ -0,0 +1,51 @@
+{
+    "Version": "1.0.0",
+    "UseMinimatch": false,
+    "SignBatches": [
+        {
+            "MatchedPath": [
+                "conpty.dll",
+                "OpenConsole.exe"
+            ],
+            "SigningInfo": {
+                "Operations": [
+                    {
+                        "KeyCode": "CP-230012",
+                        "OperationSetCode": "SigntoolSign",
+                        "Parameters": [
+                            {
+                                "parameterName": "OpusName",
+                                "parameterValue": "Microsoft"
+                            },
+                            {
+                                "parameterName": "OpusInfo",
+                                "parameterValue": "http://www.microsoft.com"
+                            },
+                            {
+                                "parameterName": "FileDigest",
+                                "parameterValue": "/fd \"SHA256\""
+                            },
+                            {
+                                "parameterName": "PageHash",
+                                "parameterValue": "/NPH"
+                            },
+                            {
+                                "parameterName": "TimeStamp",
+                                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                            }
+                        ],
+                        "ToolName": "sign",
+                        "ToolVersion": "1.0"
+                    },
+                    {
+                        "KeyCode": "CP-230012",
+                        "OperationSetCode": "SigntoolVerify",
+                        "Parameters": [],
+                        "ToolName": "sign",
+                        "ToolVersion": "1.0"
+                    }
+                ]
+            }
+        }
+    ]
+}
--- a/build/pipelines/release.yml
+++ b/build/pipelines/release.yml
@@ -30,6 +30,10 @@ parameters:
    displayName: "Build Windows Terminal VPack"
    type: boolean
    default: false
+  - name: buildConPTY
+    displayName: "Build ConPTY NuGet"
+    type: boolean
+    default: false
  - name: buildWPF
    displayName: "Build Terminal WPF Control"
    type: boolean
@@ -60,6 +64,35 @@ parameters:

 variables:
  TerminalInternalPackageVersion: "0.0.7"
+  # If we are building a branch called "release-*", change the NuGet suffix
+  # to "preview". If we don't do that, XES will set the suffix to "release1"
+  # because it truncates the value after the first period.
+  # We also want to disable the suffix entirely if we're Release branded while
+  # on a release branch.
+  # main is special, however. XES ignores main. Since we never produce actual
+  # shipping builds from main, we want to force it to have a beta label as
+  # well.
+  #
+  # In effect:
+  # BRANCH / BRANDING | Release                    | Preview
+  # ------------------|----------------------------|-----------------------------
+  # release-*         | 1.12.20220427              | 1.13.20220427-preview
+  # main              | 1.14.20220427-experimental | 1.14.20220427-experimental
+  # all others        | 1.14.20220427-mybranch     | 1.14.20220427-mybranch
+  ${{ if startsWith(variables['Build.SourceBranchName'], 'release-') }}:
+    ${{ if eq(parameters.branding, 'Release') }}:
+      NoNuGetPackBetaVersion: true
+    ${{ else }}:
+      NuGetPackBetaVersion: preview
+  ${{ elseif eq(variables['Build.SourceBranchName'], 'main') }}:
+    NuGetPackBetaVersion: experimental
+  # The NuGet packages have to use *somebody's* DLLs. We used to force them to
+  # use the Win10 build outputs, but if there isn't a Win10 build we should use
+  # the Win11 one.
+  ${{ if containsValue(parameters.buildWindowsVersions, 'Win10') }}:
+    TerminalBestVersionForNuGetPackages: Win10
+  ${{ else }}:
+    TerminalBestVersionForNuGetPackages: Win11

 name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
 resources:
@@ -193,6 +226,15 @@ jobs:
        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /p:WindowsTerminalReleaseBuild=true /t:Terminal\wpf\PublicTerminalCore
        platform: $(BuildPlatform)
        configuration: $(BuildConfiguration)
+  - ${{ if eq(parameters.buildConPTY, true) }}:
+    - task: VSBuild@1
+      displayName: Build solution **\OpenConsole.sln for ConPTY
+      inputs:
+        solution: '**\OpenConsole.sln'
+        vsVersion: 16.0
+        msbuildArgs: /p:WindowsTerminalOfficialBuild=true /p:WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }} /p:WindowsTerminalReleaseBuild=true /t:Conhost\Host_EXE;Conhost\winconpty_DLL
+        platform: $(BuildPlatform)
+        configuration: $(BuildConfiguration)
  - task: PowerShell@2
    displayName: Source Index PDBs
    inputs:
@@ -237,6 +279,24 @@ jobs:
      inputs:
        PathtoPublish: $(Build.ArtifactStagingDirectory)/appx
        ArtifactName: appx-$(BuildPlatform)-$(BuildConfiguration)-$(TerminalTargetWindowsVersion)
+  - ${{ if eq(parameters.buildConPTY, true) }}:
+    - task: CopyFiles@2
+      displayName: Copy ConPTY to Artifacts
+      inputs:
+        Contents: |-
+          $(Build.SourcesDirectory)/bin/**/conpty.dll
+          $(Build.SourcesDirectory)/bin/**/conpty.lib
+          $(Build.SourcesDirectory)/bin/**/conpty.pdb
+          $(Build.SourcesDirectory)/bin/**/OpenConsole.exe
+          $(Build.SourcesDirectory)/bin/**/OpenConsole.pdb
+        TargetFolder: $(Build.ArtifactStagingDirectory)/conpty
+        OverWrite: true
+        flattenFolders: true
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Artifact (ConPTY)
+      inputs:
+        PathtoPublish: $(Build.ArtifactStagingDirectory)/conpty
+        ArtifactName: conpty-dll-$(BuildPlatform)-$(BuildConfiguration)-$(TerminalTargetWindowsVersion)
  - ${{ if eq(parameters.buildWPF, true) }}:
    - task: CopyFiles@2
      displayName: Copy PublicTerminalCore.dll to Artifacts
@@ -343,6 +403,97 @@ jobs:
        PathtoPublish: $(System.ArtifactsDirectory)
        ArtifactName: appxbundle-signed-$(TerminalTargetWindowsVersion)

+- ${{ if eq(parameters.buildConPTY, true) }}:
+  - job: PackageAndSignConPTY
+    strategy:
+      matrix:
+        ${{ each config in parameters.buildConfigurations }}:
+          ${{ config }}:
+            BuildConfiguration: ${{ config }}
+    displayName: Create NuGet Package (ConPTY)
+    dependsOn: Build
+    steps:
+    - checkout: self
+      clean: true
+      fetchDepth: 1
+      submodules: true
+      persistCredentials: True
+    - task: PkgESSetupBuild@12
+      displayName: Package ES - Setup Build
+      inputs:
+        disableOutputRedirect: true
+    - ${{ each platform in parameters.buildPlatforms }}:
+      - task: DownloadBuildArtifacts@0
+        displayName: Download ${{ platform }} ConPTY binaries
+        inputs:
+          artifactName: conpty-dll-${{ platform }}-$(BuildConfiguration)-$(TerminalBestVersionForNuGetPackages)
+          downloadPath: bin\${{ platform }}\$(BuildConfiguration)\
+          extractTars: false
+    - task: PowerShell@2
+      displayName: Move downloaded artifacts around
+      inputs:
+        targetType: inline
+        # Find all artifact files and move them up a directory. Ugh.
+        script: |-
+          Get-ChildItem bin -Recurse -Directory -Filter conpty-dll-* | % {
+            $_ | Get-ChildItem -Recurse -File | % {
+              Move-Item -Verbose $_.FullName $_.Directory.Parent.FullName
+            }
+          }
+          Move-Item bin\x86 bin\Win32
+
+    - task: EsrpCodeSigning@1
+      displayName: Submit ConPTY libraries and OpenConsole for code signing
+      inputs:
+        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
+        FolderPath: '$(Build.SourcesDirectory)/bin'
+        signType: batchSigning
+        batchSignPolicyFile: '$(Build.SourcesDirectory)\build\config\ESRPSigning_ConPTY.json'
+
+    - task: NuGetToolInstaller@1
+      displayName: Use NuGet 5.10.0
+      inputs:
+        versionSpec: 5.10.0
+    - task: NuGetCommand@2
+      displayName: NuGet pack
+      inputs:
+        command: pack
+        packagesToPack: $(Build.SourcesDirectory)\src\winconpty\package\winconpty.nuspec
+        packDestination: '$(Build.ArtifactStagingDirectory)/nupkg'
+        versioningScheme: byEnvVar
+        versionEnvVar: XES_PACKAGEVERSIONNUMBER
+    - task: EsrpCodeSigning@1
+      displayName: Submit *.nupkg to ESRP for code signing
+      inputs:
+        ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
+        FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
+        Pattern: '*.nupkg'
+        UseMinimatch: true
+        signConfigType: inlineSignParams
+        inlineOperation: >-
+          [
+              {
+                  "KeyCode": "CP-401405",
+                  "OperationCode": "NuGetSign",
+                  "Parameters": {},
+                  "ToolName": "sign",
+                  "ToolVersion": "1.0"
+              },
+              {
+                  "KeyCode": "CP-401405",
+                  "OperationCode": "NuGetVerify",
+                  "Parameters": {},
+                  "ToolName": "sign",
+                  "ToolVersion": "1.0"
+              }
+          ]
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Artifact (nupkg)
+      inputs:
+        PathtoPublish: $(Build.ArtifactStagingDirectory)\nupkg
+        ArtifactName: conpty-nupkg-$(BuildConfiguration)
+
+
 - ${{ if eq(parameters.buildWPF, true) }}:
  - job: PackageAndSignWPF
    strategy:
@@ -366,7 +517,7 @@ jobs:
      - task: DownloadBuildArtifacts@0
        displayName: Download ${{ platform }} PublicTerminalCore
        inputs:
-          artifactName: wpf-dll-${{ platform }}-$(BuildConfiguration)-Win10
+          artifactName: wpf-dll-${{ platform }}-$(BuildConfiguration)-$(TerminalBestVersionForNuGetPackages)
          itemPattern: '**/*.dll'
          downloadPath: bin\${{ platform }}\$(BuildConfiguration)\
          extractTars: false
--- a/custom.props
+++ b/custom.props
@@ -17,7 +17,7 @@
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
    <XesBaseYearForStoreVersion>2022</XesBaseYearForStoreVersion>
    <VersionMajor>1</VersionMajor>
-    <VersionMinor>14</VersionMinor>
+    <VersionMinor>15</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
  </PropertyGroup>
 </Project>
--- a/dep/Console/ConIoSrv.h
+++ b/dep/Console/ConIoSrv.h
@@ -0,0 +1,76 @@
+/*++
+Copyright (c) Microsoft Corporation.
+Licensed under the MIT license.
+--*/
+
+#pragma once
+
+#include <ntlpcapi.h>
+
+#define CIS_ALPC_PORT_NAME           L""
+
+#define CIS_EVENT_TYPE_INPUT         (0)
+#define CIS_EVENT_TYPE_FOCUS         (1)
+#define CIS_EVENT_TYPE_FOCUS_ACK     (2)
+
+#define CIS_MSG_TYPE_GETDISPLAYSIZE  (3)
+#define CIS_MSG_TYPE_GETFONTSIZE     (4)
+#define CIS_MSG_TYPE_SETCURSOR       (5)
+#define CIS_MSG_TYPE_UPDATEDISPLAY   (6)
+
+#define CIS_MSG_ATTR_FLAGS           (0)
+
+#define CIS_MSG_ATTR_BUFFER_SIZE     (1024)
+
+#define CIS_DISPLAY_MODE_NONE        (0)
+#define CIS_DISPLAY_MODE_BGFX        (1)
+#define CIS_DISPLAY_MODE_DIRECTX     (2)
+
+typedef struct {
+    PORT_MESSAGE AlpcHeader;
+    UCHAR Type;
+
+    union {
+        struct {
+            CD_IO_DISPLAY_SIZE DisplaySize;
+
+            NTSTATUS ReturnValue;
+        } GetDisplaySizeParams;
+
+        struct {
+            CD_IO_FONT_SIZE FontSize;
+
+            NTSTATUS ReturnValue;
+        } GetFontSizeParams;
+
+        struct {
+            CD_IO_CURSOR_INFORMATION CursorInformation;
+
+            NTSTATUS ReturnValue;
+        } SetCursorParams;
+
+        struct {
+            SHORT RowIndex;
+
+            NTSTATUS ReturnValue;
+        } UpdateDisplayParams;
+
+        struct {
+            USHORT DisplayMode;
+        } GetDisplayModeParams;
+    };
+} CIS_MSG, *PCIS_MSG;
+
+typedef struct {
+    UCHAR Type;
+
+    union {
+        struct {
+            INPUT_RECORD Record;
+        } InputEvent;
+
+        struct {
+            BOOLEAN IsActive;
+        } FocusEvent;
+    };
+} CIS_EVENT, *PCIS_EVENT;
--- a/dep/Console/condrv.h
+++ b/dep/Console/condrv.h
@@ -158,8 +158,8 @@ typedef struct _CD_IO_DISPLAY_SIZE {
 } CD_IO_DISPLAY_SIZE, *PCD_IO_DISPLAY_SIZE;

 typedef struct _CD_IO_CHARACTER {
-    WCHAR Character; 
-    USHORT Atribute;
+    WCHAR Character;
+    USHORT Attribute;
 } CD_IO_CHARACTER, *PCD_IO_CHARACTER;

 typedef struct _CD_IO_ROW_INFORMATION {
@@ -175,6 +175,11 @@ typedef struct _CD_IO_CURSOR_INFORMATION {
    BOOLEAN IsVisible;
 } CD_IO_CURSOR_INFORMATION, *PCD_IO_CURSOR_INFORMATION;

+typedef struct _CD_IO_FONT_SIZE {
+    ULONG Width;
+    ULONG Height;
+} CD_IO_FONT_SIZE, *PCD_IO_FONT_SIZE;
+
 #define IOCTL_CONDRV_READ_IO \
    CTL_CODE(FILE_DEVICE_CONSOLE, 1, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)

@@ -213,3 +218,6 @@ typedef struct _CD_IO_CURSOR_INFORMATION {

 #define IOCTL_CONDRV_LAUNCH_SERVER \
    CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+#define IOCTL_CONDRV_GET_FONT_SIZE \
+    CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_NEITHER, FILE_ANY_ACCESS)
--- a/dep/Console/csrmsg.h
+++ b/dep/Console/csrmsg.h
@@ -0,0 +1,24 @@
+/*++
+Copyright (c) Microsoft Corporation.
+Licensed under the MIT license.
+--*/
+
+#pragma once
+
+#include <ntcsrmsg.h>
+
+typedef enum _USER_API_NUMBER {
+    UserpEndTask,
+} USER_API_NUMBER, *PUSER_API_NUMBER;
+
+typedef struct _ENDTASKMSG {
+    HANDLE ProcessId;
+    ULONG ConsoleEventCode;
+    ULONG ConsoleFlags;
+} ENDTASKMSG, *PENDTASKMSG;
+
+typedef struct _USER_API_MSG {
+    union {
+        ENDTASKMSG EndTask;
+    } u;
+} USER_API_MSG, *PUSER_API_MSG;
--- a/dep/Console/ntcsrdll.h
+++ b/dep/Console/ntcsrdll.h
@@ -0,0 +1,15 @@
+/*++
+Copyright (c) Microsoft Corporation.
+Licensed under the MIT license.
+--*/
+
+#pragma once
+
+#include <ntcsrmsg.h>
+
+NTSTATUS CsrClientCallServer(
+    PCSR_API_MSG m,
+    PCSR_CAPTURE_HEADER CaptureBuffer OPTIONAL,
+    ULONG ApiNumber,
+    ULONG ArgLength
+);
--- a/dep/Console/ntcsrmsg.h
+++ b/dep/Console/ntcsrmsg.h
@@ -0,0 +1,16 @@
+/*++
+Copyright (c) Microsoft Corporation.
+Licensed under the MIT license.
+--*/
+
+#pragma once
+
+#include <ntlpcapi.h>
+
+typedef struct _CSR_CAPTURE_HEADER {
+} CSR_CAPTURE_HEADER, *PCSR_CAPTURE_HEADER;
+
+typedef struct _CSR_API_MSG {
+} CSR_API_MSG, *PCSR_API_MSG;
+
+#define CSR_MAKE_API_NUMBER(DllIndex, ApiIndex) 0
--- a/dep/Console/ntlpcapi.h
+++ b/dep/Console/ntlpcapi.h
@@ -0,0 +1,126 @@
+/*++
+Copyright (c) Microsoft Corporation.
+Licensed under the MIT license.
+--*/
+
+#pragma once
+
+#define OB_FILE_OBJECT_TYPE 1
+
+typedef struct _PORT_MESSAGE {
+    union {
+        struct {
+            SHORT DataLength;
+            SHORT TotalLength;
+        } s1;
+    } u1;
+    union {
+        ULONG ZeroInit;
+    } u2;
+    union {
+        CLIENT_ID ClientId;
+    };
+    ULONG MessageId;
+} PORT_MESSAGE, *PPORT_MESSAGE;
+
+#define ALPC_MSGFLG_SYNC_REQUEST            0
+#define ALPC_PORFLG_ACCEPT_DUP_HANDLES      1
+#define ALPC_PORFLG_ACCEPT_INDIRECT_HANDLES 2
+
+typedef struct _ALPC_DATA_VIEW_ATTR {
+    PVOID  ViewBase;
+    SIZE_T ViewSize;
+} ALPC_DATA_VIEW_ATTR, *PALPC_DATA_VIEW_ATTR;
+
+typedef struct _ALPC_CONTEXT_ATTR {
+} ALPC_CONTEXT_ATTR, *PALPC_CONTEXT_ATTR;
+
+#define ALPC_INDIRECT_HANDLE_MAX 512
+
+typedef struct _ALPC_HANDLE_ATTR {
+    union {
+        ULONG HandleCount;
+    };
+} ALPC_HANDLE_ATTR, *PALPC_HANDLE_ATTR;
+
+#define ALPC_FLG_MSG_DATAVIEW_ATTR 1
+#define ALPC_FLG_MSG_HANDLE_ATTR   2
+
+typedef struct _ALPC_MESSAGE_ATTRIBUTES {
+} ALPC_MESSAGE_ATTRIBUTES, *PALPC_MESSAGE_ATTRIBUTES;
+
+typedef struct _ALPC_PORT_ATTRIBUTES {
+    ULONG Flags;
+    SECURITY_QUALITY_OF_SERVICE SecurityQos;
+    SIZE_T MaxMessageLength;
+    SIZE_T MemoryBandwidth;
+    SIZE_T MaxPoolUsage;
+    SIZE_T MaxSectionSize;
+    SIZE_T MaxViewSize;
+    SIZE_T MaxTotalSectionSize;
+    ULONG DupObjectTypes;
+#ifdef _WIN64
+    ULONG Reserved;
+#endif
+} ALPC_PORT_ATTRIBUTES, *PALPC_PORT_ATTRIBUTES;
+
+typedef enum _ALPC_MESSAGE_INFORMATION_CLASS {
+    AlpcMessageHandleInformation
+} ALPC_MESSAGE_INFORMATION_CLASS;
+
+typedef struct _ALPC_MESSAGE_HANDLE_INFORMATION {
+    ULONG Index;
+    ULONG Handle;
+} ALPC_MESSAGE_HANDLE_INFORMATION, *PALPC_MESSAGE_HANDLE_INFORMATION;
+
+NTSTATUS AlpcInitializeMessageAttribute(
+    ULONG AttributeFlags,
+    PALPC_MESSAGE_ATTRIBUTES Buffer,
+    SIZE_T BufferSize,
+    PSIZE_T RequiredBufferSize
+);
+
+PVOID AlpcGetMessageAttribute(
+    PALPC_MESSAGE_ATTRIBUTES Buffer,
+    ULONG AttributeFlag
+);
+
+#define ALPC_GET_DATAVIEW_ATTRIBUTES(MsgAttr) \
+    ((PALPC_DATA_VIEW_ATTR)AlpcGetMessageAttribute(MsgAttr, ALPC_FLG_MSG_DATAVIEW_ATTR))
+
+#define ALPC_GET_HANDLE_ATTRIBUTES(MsgAttr) \
+    ((PALPC_HANDLE_ATTR)AlpcGetMessageAttribute(MsgAttr, ALPC_FLG_MSG_HANDLE_ATTR))
+
+NTSTATUS NtAlpcConnectPort(
+    PHANDLE PortHandle,
+    PUNICODE_STRING PortName,
+    POBJECT_ATTRIBUTES ObjectAttributes,
+    PALPC_PORT_ATTRIBUTES PortAttributes,
+    ULONG Flags,
+    PSID RequiredServerSid,
+    PPORT_MESSAGE ConnectionMessage,
+    PSIZE_T BufferLength,
+    PALPC_MESSAGE_ATTRIBUTES OutMessageAttributes,
+    PALPC_MESSAGE_ATTRIBUTES InMessageAttributes,
+    PLARGE_INTEGER Timeout
+);
+
+NTSTATUS NtAlpcSendWaitReceivePort(
+    HANDLE PortHandle,
+    ULONG Flags,
+    PPORT_MESSAGE SendMessage,
+    PALPC_MESSAGE_ATTRIBUTES SendMessageAttributes,
+    PPORT_MESSAGE ReceiveMessage,
+    PSIZE_T BufferLength,
+    PALPC_MESSAGE_ATTRIBUTES ReceiveMessageAttributes,
+    PLARGE_INTEGER Timeout
+);
+
+NTSTATUS NtAlpcQueryInformationMessage(
+    HANDLE PortHandle,
+    PPORT_MESSAGE PortMessage,
+    ALPC_MESSAGE_INFORMATION_CLASS MessageInformationClass,
+    PVOID MessageInformation,
+    ULONG Length,
+    PULONG ReturnLength
+);
--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@@ -54,6 +54,24 @@
        }
      ]
    },
+    "BellSound": {
+      "default": "",
+      "description": "Sets the file location of the sound played when the application emits a BEL character. If the path is invalid no sound will be played. This property also accepts an array of sounds and the terminal will pick one at random.",
+      "oneOf": [
+      {
+        "type": [
+          "string",
+          "null"
+        ]
+      },
+      {
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      }
+      ]
+    }, 
    "AppearanceConfig": {
      "properties": {
        "colorScheme": {
@@ -300,6 +318,7 @@
        "moveFocus",
        "movePane",
        "swapPane",
+        "markMode",
        "moveTab",
        "multipleActions",
        "newTab",
@@ -332,6 +351,7 @@
        "tabSearch",
        "toggleAlwaysOnTop",
        "toggleFocusMode",
+        "selectAll",
        "setFocusMode",
        "toggleFullscreen",
        "setFullScreen",
@@ -1689,6 +1709,11 @@
          "description": "Force the terminal to use the legacy input encoding. Certain keys in some applications may stop working when enabling this setting.",
          "type": "boolean"
        },
+        "experimental.useBackgroundImageForWindow": {
+          "default": false,
+          "description": "When set to true, the background image for the currently focused profile is expanded to encompass the entire window, beneath other panes.",
+          "type": "boolean"
+        },
        "initialCols": {
          "default": 120,
          "description": "The number of columns displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
@@ -2383,4 +2408,4 @@
      ]
    }
  ]
-}
+}
--- a/doc/roadmap-2022.md
+++ b/doc/roadmap-2022.md
@@ -22,21 +22,61 @@ Below is the schedule for when milestones will be included in release builds of
 | Milestone End Date | Milestone Name | Preview Release Blog Post |
 | ------------------ | -------------- | ------------------------- |
 | 2020-06-18 | [1.1] in Windows Terminal Preview | [Windows Terminal Preview 1.1 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-1-release/) |
-| 2020-07-31 | [1.2] in Windows Terminal Preview<br>[1.1] in Windows Terminal | [Windows Terminal Preview 1.2 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-2-release/) |
-| 2020-08-31 | [1.3] in Windows Terminal Preview<br>[1.2] in Windows Terminal | [Windows Terminal Preview 1.3 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-3-release/) |
-| 2020-09-30 | [1.4] in Windows Terminal Preview<br>[1.3] in Windows Terminal | [Windows Terminal Preview 1.4 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-4-release/) |
-| 2020-11-30 | [1.5] in Windows Terminal Preview<br>[1.4] in Windows Terminal | [Windows Terminal Preview 1.5 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-5-release/) |
-| 2021-01-31 | [1.6] in Windows Terminal Preview<br>[1.5] in Windows Terminal | [Windows Terminal Preview 1.6 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-6-release/) |
-| 2021-03-01 | [1.7] in Windows Terminal Preview<br>[1.6] in Windows Terminal | [Windows Terminal Preview 1.7 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-7-release/) |
-| 2021-04-14 | [1.8] in Windows Terminal Preview<br>[1.7] in Windows Terminal | [Windows Terminal Preview 1.8 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-8-release/) |
-| 2021-05-31 | [1.9] in Windows Terminal Preview<br>[1.8] in Windows Terminal | [Windows Terminal Preview 1.9 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-9-release/) |
-| 2021-07-14 | [1.10] in Windows Terminal Preview<br>[1.9] in Windows Terminal | [Windows Terminal Preview 1.10 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-10-release/) |
-| 2021-08-31 | [1.11] in Windows Terminal Preview<br>[1.10] in Windows Terminal | [Windows Terminal Preview 1.11 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-11-release/) |
-| 2021-10-20 | [1.12] in Windows Terminal Preview<br>[1.11] in Windows Terminal | [Windows Terminal Preview 1.12 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-12-release/) |
-|  | [1.13] in Windows Terminal Preview<br>[1.12] in Windows Terminal |  |
-|  | [1.14] in Windows Terminal Preview<br>[1.13] in Windows Terminal |  |
+| 2020-07-31 | [1.2] in Windows Terminal Preview<br>[1.1] in Windows Terminal | [Windows Terminal Preview 1.2 Release] |
+| 2020-08-31 | [1.3] in Windows Terminal Preview<br>[1.2] in Windows Terminal | [Windows Terminal Preview 1.3 Release] |
+| 2020-09-30 | [1.4] in Windows Terminal Preview<br>[1.3] in Windows Terminal | [Windows Terminal Preview 1.4 Release] |
+| 2020-11-30 | [1.5] in Windows Terminal Preview<br>[1.4] in Windows Terminal | [Windows Terminal Preview 1.5 Release] |
+| 2021-01-31 | [1.6] in Windows Terminal Preview<br>[1.5] in Windows Terminal | [Windows Terminal Preview 1.6 Release] |
+| 2021-03-01 | [1.7] in Windows Terminal Preview<br>[1.6] in Windows Terminal | [Windows Terminal Preview 1.7 Release] |
+| 2021-04-14 | [1.8] in Windows Terminal Preview<br>[1.7] in Windows Terminal | [Windows Terminal Preview 1.8 Release] |
+| 2021-05-31 | [1.9] in Windows Terminal Preview<br>[1.8] in Windows Terminal | [Windows Terminal Preview 1.9 Release] |
+| 2021-07-14 | [1.10] in Windows Terminal Preview<br>[1.9] in Windows Terminal | [Windows Terminal Preview 1.10 Release] |
+| 2021-08-31 | [1.11] in Windows Terminal Preview<br>[1.10] in Windows Terminal | [Windows Terminal Preview 1.11 Release] |
+| 2021-10-20 | [1.12] in Windows Terminal Preview<br>[1.11] in Windows Terminal | [Windows Terminal Preview 1.12 Release] |
+| 2022-02-03 | [1.13] in Windows Terminal Preview<br>[1.12] in Windows Terminal | [Windows Terminal Preview 1.13 Release] |
+| 2022-05-24 | [1.14] in Windows Terminal Preview<br>[1.13] in Windows Terminal | [Windows Terminal Preview 1.14 Release] |
+|  | [1.15] in Windows Terminal Preview<br>[1.14] in Windows Terminal |  |
+|  | [1.16] in Windows Terminal Preview<br>[1.15] in Windows Terminal |  |
+|  | [1.17] in Windows Terminal Preview<br>[1.16] in Windows Terminal |  |


+### Release outline
+
+Below is a VERY vague outline of the remaining calendar year that was drafted late May 2022. This was drafted for internal planning purposes, as a guide. It is not meant to represent official dates. More often than not, releases are synced to official features landing, rather than arbitrary dates. Drift from this initial draft is entirely expected.
+
+```mermaid
+gantt
+    title Proposed Terminal Releases 1.14-1.18
+    dateFormat  YYYY-MM-DD
+    axisFormat  %d %b
+    section Terminal 1.14
+        Lock down & bake        :done, 2022-05-06, 2w
+        Release 1.14            :milestone, 2022-05-24
+    section Terminal 1.15
+        Features                :done, a1, 2022-05-06, 4w
+        Bugfix                  :active, a2, after a1  , 1w
+        Lock down & bake        :after a2  , 1w
+        Release 1.15            :milestone, 2022-06-21, 0
+        1.15 becomes Stable     :milestone, after b3, 0
+    section Terminal 1.16
+        Features                :b1, after a2, 4w
+        Bugfix                  :b2, after b1  , 2w
+        Lock down & bake        :b3, after b2  , 2w
+        Release 1.16            :milestone, after b3, 0
+        1.16 becomes Stable     :milestone, after c3, 0
+    section Terminal 1.17
+        Features                :c1, after b2, 4w
+        Bugfix                  :c2, after c1  , 2w
+        Lock down & bake        :c3, after c2  , 2w
+        Release 1.17            :milestone, after c3, 0
+        1.17 becomes Stable     :milestone, after d3, 0
+    section Terminal 1.18
+        Features                :d1, after c2, 4w
+        Bugfix                  :d2, after d1  , 2w
+        Lock down & bake        :d3, after d2  , 2w
+        Release 1.18            :milestone, after d3, 0
+```
+
 ## Issue Triage & Prioritization

 Incoming issues/asks/etc. are triaged several times a week, labeled appropriately, and assigned to a milestone in priority order:
@@ -62,7 +102,9 @@ Incoming issues/asks/etc. are triaged several times a week, labeled appropriatel
 [1.12]: https://github.com/microsoft/terminal/milestone/38
 [1.13]: https://github.com/microsoft/terminal/milestone/39
 [1.14]: https://github.com/microsoft/terminal/milestone/41
-
+[1.15]: https://github.com/microsoft/terminal/milestone/47
+[1.16]: https://github.com/microsoft/terminal/milestone/48
+[1.17]: https://github.com/microsoft/terminal/milestone/49

 [22H1]: https://github.com/microsoft/terminal/milestone/43
 [22H2]: https://github.com/microsoft/terminal/milestone/44
@@ -70,3 +112,17 @@ Incoming issues/asks/etc. are triaged several times a week, labeled appropriatel
 [Backlog]: https://github.com/microsoft/terminal/milestone/45

 [Terminal v2 Roadmap]: https://github.com/microsoft/terminal/tree/main/doc/terminal-v2-roadmap.md
+
+[Windows Terminal Preview 1.2 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-2-release/
+[Windows Terminal Preview 1.3 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-3-release/
+[Windows Terminal Preview 1.4 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-4-release/
+[Windows Terminal Preview 1.5 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-5-release/
+[Windows Terminal Preview 1.6 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-6-release/
+[Windows Terminal Preview 1.7 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-7-release/
+[Windows Terminal Preview 1.8 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-8-release/
+[Windows Terminal Preview 1.9 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-9-release/
+[Windows Terminal Preview 1.10 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-10-release/
+[Windows Terminal Preview 1.11 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-11-release/
+[Windows Terminal Preview 1.12 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-12-release/
+[Windows Terminal Preview 1.13 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-13-release/
+[Windows Terminal Preview 1.14 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-14-release/
--- a/doc/specs/#12570
+++ b/doc/specs/#12570
@@ -0,0 +1,370 @@
+---
+author: Michael Niksa @miniksa
+created on: 2022-02-24
+last updated: 2022-02-24
+issue id: 12570
+---
+
+# Show Hide operations on GetConsoleWindow via PTY
+
+## Abstract
+
+To maintain compatibility with command-line tools, utilities, and tests that desire to
+manipulate the final presentation window of their output through retrieving the raw
+console window handle and performing `user32` operations against it like [ShowWindow](https://docs.microsoft.com//windows/win32/api/winuser/nf-winuser-showwindow),
+we will create a compatibility layer that captures this intent and translates it into
+the nearest equivalent in the cross-platform virtual terminal language and implement the
+understanding of these sequences in our own Windows Terminal.
+
+## Inspiration
+
+When attempting to enable the Windows Terminal as the default terminal application on Windows
+(to supersede the execution of command-line utilities inside the classic console host window),
+we discovered that there were a bunch of automated tests, tools, and utilities that relied on
+showing and hiding the console window using the `::GetConsoleWindow()` API in conjunction with
+`::ShowWindow()`.
+
+When we initially invented the ConPTY, we worked to ensure that we built to the common
+denominator that would work cross-platform in all scenarios, avoiding situations that were
+dependent on Windows-isms like `user32k` including the full knowledge of how windowing occurs
+specific to the Windows platform.
+
+We also understood that on Windows, the [**CreateProcess**](https://docs.microsoft.com/windows/win32/procthread/process-creation-flags) API provides ample flags specifically
+for command-line applications to command the need for (or lack thereof) a window on startup
+such as `CREATE_NEW_CONSOLE`, `CREATE_NO_WINDOW`, and `DETACHED_PROCESS`. The understanding
+was that people who didn't need or want a window, or otherwise needed to manipulate the
+console session, would use those flags on process creation to dictate the session. Additionally,
+the `::CreateProcess` call will accept information in `STARTUPINFO` or `STARTUPINFOEX` that
+can dictate the placement, size, and visibility of a window... including some fields specific
+to console sessions. We had accepted those as ways applications would specify their intent.
+
+Those assumptions have proven incorrect. Because it was too easy to just `::CreateProcess` in
+the default manner and then get access to the session after-the-fact and manipulate it with
+APIs like `::GetConsoleWindow()`, tooling and tests organically grew to make use of this process.
+Instead of requesting up front that they didn't need a window or the overhead of a console session,
+they would create one anyway by default and then manipulate it afterward to hide it, move it off-
+screen, or otherwise push it around. Overall, this is terrible for their performance and overall
+reliability because they've obscured their intent by not asking for it upfront and impacted their
+performance by having the entire subsystem spin up interactive work when they intend to not use it.
+But Windows is the place for compatibility, so we must react and compensate for the existing
+non-ideal situation.
+
+We will implement a mechanism to compensate for these that attempts to capture the intent of the
+requests from the calling applications against the ConPTY and translates them into the "universal"
+Virtual Terminal language to the best of its ability to make the same effects as prior to the
+change to the new PTY + Terminal platform.
+
+## Solution Design
+
+Overall, there are three processes involved in this situation:
+
+1. The client command-line application utility, tool, or test that will manipulate the window.
+1. The console host (`conhost.exe` or `openconsole.exe`) operating in PTY mode.
+1. The terminal (`windowsterminal.exe` when it's Windows Terminal, but could be a third party).
+
+The following diagram shows the components and how they will interact.
+
+```txt
+   ┌─────────────────┐                   ┌──────────────────┐                   ┌──────────────────────┐
+   │                 │       1           │                  │                   │                      │
+   │   Command-Line  ├─────────────────► │   Console Host   │                   │   Windows Terminal   │
+   │   Tool or       │                   │   as ConPTY      │                   │   Backend            │
+   │   Utility       │       2           │                  │        6          │                      │
+   │                 │ ◄─────────────────┤                  ├─────────────────► │                      │
+   │                 │                   │                  │                   │                      │
+   │                 │                   │                  │                   │                      │
+   │                 │                   │                  │         9         │                      │
+   │                 │                   │                  │ ◄─────────────────┤                      │
+   │                 │                   │                  │                   │                      │
+   └─────┬───────────┘                   └───────────┬──────┘                   └─────────────────┬────┘
+         │                                        ▲  │                                   ▲        │
+         │                                        │  │                                   │        │
+         │                                        │  │10                                 │        │7
+         │3                                      5│  │                                   │8       │
+         │                                        │  ▼                                   │        ▼
+         │                                    ┌───┴────┐                              ┌──┴────┬───────┬─────────────────────────┐
+         ▼                                    │ Hidden │                              │       │       │                      v^x│
+   ┌─────────────────┐                        │ Fake   │                              ├───────┴───────┴─────────────────────────┤
+   │                 │          4             │ PTY    │                              │                                         │
+   │                 ├──────────────────────► │ Window │                              │                                         │
+   │   user32.dll    │                        └────────┘                              │      Windows Terminal                   │
+   │   Window APIs   │                                                                │      Displayed Window                   │
+   │                 │                                                                │                                         │
+   │                 │                                                                │                                         │
+   └─────────────────┘                                                                │                                         │
+                                                                                      │                                         │
+                                                                                      │                                         │
+                                                                                      │                                         │
+                                                                                      │                                         │
+                                                                                      │                                         │
+                                                                                      │                                         │
+                                                                                      │                                         │
+                                                                                      │                                         │
+                                                                                      │                                         │
+                                                                                      └─────────────────────────────────────────┘
+```
+
+1. The command-line tool calls `::GetConsoleWindow()` on the PTY host
+2. The PTY host returns the raw `HWND` to the *Hidden Fake PTY Window* in its control
+3. The command-line tool calls `::ShowWindow()` on the `user32.dll` API surface to manipulate that window.
+4. `user32.dll` sends a message to the window message queue on the *Fake PTY Window*
+5. The PTY host retrieves the message from the queue and translates it to a virtual terminal message
+6. The Windows Terminal connection layer receives the virtual terminal message and decodes it into a window operation.
+7. The true displayed *Windows Terminal Window* is told to change its status to show or hide.
+8. The changed Show/Hide status is returned to the back-end on completion.
+9. The Windows Terminal connection layer returns that information to the PTY host so it can remain in-the-know.
+10. The PTY updates its *Fake PTY Window* status to match the real one so it continues to receive appropriate messages from `user32`.
+
+This can be conceptually understood in a few phases:
+
+- The client application grabs a handle and attempts to send a command via a back-channel through user32.
+- User32 decides what message to send based on the window state of the handle.
+- The message is translated by the PTY and propagated to the true visible window.
+- The visible window state is returned back to the hidden/fake window to remain in synchronization so the next call to user32 can make the correct decision.
+
+The communication between the PTY and the hosting terminal application occurs with a virtual terminal sequence.
+Fortunately, *xterm* had already invented and implemented one for this behavior called **XTWINOPS** which means
+we should be able to utilize that one and not worry about inventing our own Microsoft-specific thing. This ensures
+that there is some precedence for what we're doing, guarantees a major third party terminal can support the same
+sequence, and induces a high probability of other terminals already using it given *xterm* is the defacto standard
+for terminal emulation.
+
+Information about **XTWINOPS** can be found at [Xterm control sequences](https://invisible-island.net/xterm/ctlseqs/ctlseqs.html). Search for *XTWINOPS*.
+The sequence is **CSI** *Ps*; *Ps*; *Ps* **t**. It starts with the common "control sequence initiator" of `ESC [` (`0x1B 0x5B`).
+Then between 1 and 3 numerical parameters are given, separated by semicolons (`0x3B`).
+And finally, the sequence is terminated with `t` (`0x74`).
+
+Specifically, the two parameter commands of `1` for *De-iconify window* and `2` for *Iconify window* appear relevant to our interests.
+In `user32` parlance, "iconify" traditionally corresponds to minimize/restore state and is a good proxy for overall visibility of the window.
+
+The theory then is to detect when the assorted calls to `::ShowWindow()` against the *Fake PTY Window* are asking for a command that
+maps to either "iconify" or "deiconify" and translate them into the corresponding message over the VT channel to the attached terminal.
+
+To detect this, we need to use some heuristics inside the [window procedure](https://docs.microsoft.com/windows/win32/winmsg/window-procedures) for the window owned by the PTY.
+Unfortunately, calls to `::ShowWindow()` on research with the team that owns `user32` do not go straight into the window message queue. Instead, they're dispatched straight into `win32k` to be analyzed and then trigger an array of follow on window messages into the queue depending on the `HWND`'s current state. Most specifically, they vary based on the `WS_VISIBLE` state of the `HWND`. (See [Window Styles](https://docs.microsoft.com/windows/win32/winmsg/window-styles) for details on the `WS_VISIBLE` flag.)
+
+I evaluated a handful of messages with the help of the IXP Essentials team to see which ones would telegraph the changes from `::ShowWindow()` into our window procedure:
+
+- [WM_QUERYOPEN](https://docs.microsoft.com/windows/win32/winmsg/wm-queryopen) - This one allows us to accept/reject a minimize/restore call. Not really useful for finding out current state
+- [WM_SYSCOMMAND](https://docs.microsoft.com/windows/win32/menurc/wm-syscommand) - This one is what is called when the minimize, maximize/restore, and exit buttons are called in the window toolbar. But apparently it is not generated for these requests coming from outside the window itself through the `user32` APIs.
+- [WM_SHOWWINDOW](https://docs.microsoft.com/windows/win32/winmsg/wm-showwindow) - This one provides some insight in certain transitions, specifically around force hiding and showing. When the `lParam` is `0`, we're supposed to know that someone explicitly called `::ShowWindow()` to show or hide with the `wParam` being a `BOOL` where `TRUE` is "show" and `FALSE` is "hide". We can translate that into *de-iconify* and *iconify* respectively.
+- [WM_WINDOWPOSCHANGING](https://docs.microsoft.com/windows/win32/winmsg/wm-windowposchanging) - This one I evaluated extensively as it looked to provide us insight into how the window was about to change before it did so and offered us the opportunity to veto some of those changes (for instance, if we wanted to remain invisible while propagating a "show" message). I'll detail more about this one in a sub-heading below.
+- [WM_SIZE](https://docs.microsoft.com/windows/win32/winmsg/wm-size) - This one has a `wParam` that specifically sends `SIZE_MINIMIZED` (`1`) and `SIZE_RESTORED` (`0`) that should translate into *iconify* and *de-iconify respectively.
+
+#### WM_WINDOWPOSCHANGING data
+
+In investigating `WM_WINDOWPOSCHANGING`, I built a table of some of the states I observed while receiving messages from an external caller that was using `::ShowWindow()`:
+
+|integer|constant|flags|Should Hide?|minimizing|maximizing|showing|hiding|activating|`0x8000`|`SWP_NOCOPYBITS`|`SWP_SHOWWINDOW`|`SWP_FRAMECHANGED`|`SWP_NOACTIVATE`|`SWP_NOZORDER`|`SWP_NOMOVE`|`SWP_NOSIZE`|
+|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
+|0|`SW_HIDE`|?|YES|?|?|?|?|?|?|?|?|?|?|?|?|?|
+|1|`SW_NORMAL`|`0x43`|NO|F|F|T|F|T|||X||||X|X|
+|2|`SW_SHOWMINIMIZED`|`0x8160`|YES|T|F|T|F|T|X|X|X|X|||||
+|3|`SW_SHOWMAXIMIZED`|`0x8160`|NO|F|T|T|F|T|X|X|X|X|||||
+|4|`SW_SHOWNOACTIVATE`|`0x8070`|NO|F|F|T|F|F|X||X|X|X||||
+|5|`SW_SHOW`|`0x43`|NO|F|F|T|F|T|||X||||X|X|
+|6|`SW_MINIMIZE`|`0x8170`|YES|T|F|T|F|F|X|X|X|X|X||||
+|7|`SW_SHOWMINNOACTIVE`|`0x57`|YES|T|F|T|F|F|||X||X|X|X|X|
+|8|`SW_SHOWNA`|`0x53`|NO|F|F|T|F|F|||X||X||X|X|
+|9|`SW_RESTORE`|`0x8160`|NO|F|F|T|F|T|||X|X|||||
+|10|`SW_SHOWDEFAULT`|`0x43`|NO|F|F|T|F|T|||X||||X|X|
+|11|`SW_FORCEMINIMIZE`|?|YES|?|?|?|?|?|?|?|?|?|?|?|?|?|
+
+The headings are as follows:
+
+- integer - The value of the Show Window constant `SW_*` (see [ShowWindow](https://docs.microsoft.com/windows/win32/api/winuser/nf-winuser-showwindow))
+- constant - The name of the Show Window constant
+- flags - The `lParam` field is a pointer to a [**WINDOWPOS**](https://docs.microsoft.com/windows/win32/api/winuser/ns-winuser-windowpos) structure during this message. This the `UINT flags` field of that structure.
+- Should Hide? - Whether or not I believe that the window should hide if this constant is seen. (Conversely, should show on the opposite.)
+- minimizing - This is the `BOOL` response from a call to [**IsIconic()**](https://docs.microsoft.com/windows/win32/api/winuser/nf-winuser-isiconic) during this message.
+- maximizing - This is the `BOOL` response from a call to [**IsZoomed()**](https://docs.microsoft.com/windows/win32/api/winuser/nf-winuser-iszoomed) during this message.
+- showing - This is whether `SWP_SHOWWINDOW` is set on the `WINDOWPOS.flags` field during this message.
+- hiding - This is whether `SWP_HIDEWINDOW` is set on the `WINDOWPOS.flags` field during this message.
+- activating - This is the inverse of whether `SWP_NOACTIVATE` is set on the `WINDOWPOS.flags` field during this message.
+- Remaining headings are `flags` values expanded to `X` is set and blank is unset. See [**SetWindowPos()**](https://docs.microsoft.com/windows/win32/api/winuser/nf-winuser-setwindowpos) for the definitions of all the flags.
+
+From this data collection, I noticed a few things:
+
+- The data in this table was unstable. The fields varied depending on the order in which I called the various constants against `ShowWindow()`. This is just one particular capture.
+- Some of the states, I wouldn't see any message data at all (`SW_HIDE` and `SW_FORCEMINIMIZE`).
+- There didn't seem to be a definitive way to use this data to reliably decide when to show or hide the window. I didn't have a reliable way of pulling this together with my *Should Hide?* column.
+
+On further investigation, it became apparent that the values received were sometimes not coming through or varying because the `WS_VISIBLE` state of the `HWND` affected how `win32k` decided to dispatch messages and what values they contained. This is where I determined that steps #8-10 in the diagram above were going to be necessary: to report the state of the real window back to the *fake window* so it could report status to `user32` and `win32k` and receive state-appropriate messages.
+
+For reporting back #8-10, I initially was going to use the `XTWINOPS` call with parameter `11`. The PTY could ask the attached terminal for its state and expect to hear back an answer of either `1` or `2` in the same format message depending on the state. However, on further consideration, I realized that the real window could change at a moments notice without prompting from the PTY, so I instead wrote the PTY to always listen for this and had the Windows Terminal send this back down unprompted.
+
+#### Refined WM_SHOWWINDOW and WM_SIZE data
+
+Upon setting up the synchronization for #8-10, I then tried again to build the table using just the two window messages that were giving me reliable data: `WM_SHOWWINDOW` and `WM_SIZE`:
+
+|integer|constant|Should Hide?|`WM_SHOWWINDOW` OR `WM_SIZE` reported hide?|
+|---|---|---|---|
+|0|`SW_HIDE`|YES|YES|
+|1|`SW_NORMAL`|NO|NO|
+|2|`SW_SHOWMINIMIZED`|YES|YES|
+|3|`SW_SHOWMAXIMIZED`|NO|NO|
+|4|`SW_SHOWNOACTIVATE`|NO|NO|
+|5|`SW_SHOW`|NO|NO|
+|6|`SW_MINIMIZE`|YES|YES|
+|7|`SW_SHOWMINNOACTIVE`|YES|YES|
+|8|`SW_SHOWNA`|NO|NO|
+|9|`SW_RESTORE`|NO|NO|
+|10|`SW_SHOWDEFAULT`|NO|NO|
+|11|`SW_FORCEMINIMIZE`|YES|YES|
+
+Since this now matched up perfectly with what I was suspecting should happen *and* it was easier to implement than picking apart the `WM_WINDOWPOSCHANGING` message, it is what I believe the design should be.
+
+Finally, with the *fake window* changing state to and from `WS_VISIBLE`... it was appearing on the screen and showing up in the taskbar and alt-tab. To resolve this, I utilized [**DWMWA_CLOAK**](https://docs.microsoft.com//windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute) which makes the window completely invisible even when in a normally `WS_VISIBLE` state. I then added the [**WS_EX_TOOLWINDOW**](https://docs.microsoft.com/windows/win32/winmsg/extended-window-styles) extended window style to hide it from alt-tab and taskbar.
+
+With this setup, the PTY now has a completely invisible window with a synchronized `WS_VISIBLE` state with the real terminal window, a bidirectional signal channel to adjust the state between the terminal and PTY, and the ability to catch `user32` calls being made against the *fake window* that the PTY stands up for the client command-line application.
+
+## UI/UX Design
+
+The visible change in behavior is that a call to `::ShowWindow()` against the `::GetConsoleWindow()`
+handle that is returned by the ConPTY will be propagated to the attached Terminal. As such, a
+user will see the entire window be shown or hidden if one of the underlying attached
+command-line applications requests a show or hide.
+
+At the initial moment, the fact that the Terminal contains tabbed and/or paned sessions and
+therefore multiple command-line clients on "different sessions" are attached to the same window
+is partially ignored. If one attached client calls "show", the entire window will be shown with
+all tabs. If another calls "hide", the entire window will be hidden including the other tab
+that just requested a show. In the opposite direction, when the window is shown, all attached
+PTYs for all tabs/panes will be alerted that they're now shown at once.
+
+## Capabilities
+
+### Accessibility
+
+Users of assistive devices will have the same experience that they did with the legacy Windows
+Console after this change. If a command-line application decides to show or hide the window
+through the API without their consent, they will receive notification of the showing/hiding
+window through our UIA framework.
+
+Prior to this change, the window would have always remained visible and there would be no
+action.
+
+Overall, the experience will be consistent between what is happening on-screen and what is
+presented through the UIA framework to assistive tools.
+
+For third party terminals, it will be up to them to decide what their reaction and experience is.
+
+### Security
+
+We will maintain the security and integrity of the Terminal application chosen for presentation
+by not revealing its true window handle information to the client process through the existing
+`::GetConsoleWindow()` API. Through our design for default terminal applications, the final
+presentation terminal could be Windows Terminal or it could be any third-party terminal that
+meets the same specifications for communication. Giving raw access to its `HWND` to a client
+application could disrupt its security.
+
+By maintaining a level of separation with this feature by generating a "fake window" in the
+ConPTY layer and only forwarding events, the attached terminal (whether ours or a 3rd party)
+maintains the final level of control on whether or not it processes the message. This is
+improved security over the legacy console host where the tool had full backdoor style access
+to all `user32` based window APIs.
+
+### Reliability
+
+This test doesn't improve overall reliability in the system because utilities that are relying
+on the behavior that this compatibility shim will restore are already introducing additional
+layers of complexity and additional processes into their operation than were strictly necessary
+simply by not stating their desires upfront at creation time.
+
+In some capacity, you could argue it increases reliability of the existing tests that were
+using this complex behavior in that they didn't work before and they will work now, but
+the entire process is fragile. We're just restoring the fragile process instead of having
+it not work at all.
+
+### Compatibility
+
+This change restores compatibility with existing applications that were relying on the behavior
+we had excluded from our initial designs.
+
+### Performance, Power, and Efficiency
+
+The performance of tooling that is leveraging this process to create a console and then hide
+or manipulate the session after the fact will be significantly worse when we enable the
+default Windows Terminal than it was with the old Windows Console. This is because the
+Terminal is significantly heavier weight (with its modern technologies like WinUI) and
+will take more time to start and more committed memory. Additionally, more processes
+will be in use because there will be the `conhost.exe` doing the ConPTY translation
+and then the `windowsterminal.exe` doing the presentation.
+
+However, this particular feature doesn't do anything to make that better or worse.
+
+The appropriate solution for any tooling, test, or scenario that has a need for
+performance and efficiency is to use the flags to `::CreateProcess` in the first place
+to specify that they did not need a console window session at all, or to direct its
+placement and visibility as a part of the creation call. We are working with
+Microsoft's test automation tooling (TAEF) as well as the Windows performance
+fundamentals (FUN) team to ensure that the test automation supports creating sessions
+without a console window and that our internal performance test suite uses those
+specifications on creation so we have accurate performance testing of the operating
+system.
+
+## Potential Issues
+
+### Multiple clients sharing the same window host
+
+With the initial design, multiple clients sharing the same window host will effectively
+share the window state. Two different tabs or panes with two different client applications
+could fight over the show/hide state of the window. In the initial revision, this is
+ignored because this feature is being driven by a narrow failure scenario in the test gates.
+In the reported scenario, a singular application is default-launched into a singular tab
+in a terminal window and then the application expects to be able to hide it after the creation.
+
+In the future, we may have to implement a conflict resolution or a graphical variance to
+compensate for multiple tabs.
+
+### Other verbs against the console window handle
+
+This scenario initially focuses on just the `::ShowWindow()` call against the window handle
+from `::GetConsoleWindow()`. Other functions from `user32` against the `HWND` will not
+necessarily be captured and forwarded to the attached terminal application. And even more
+specifically, we're focusing only on the Show and Hide state. Other state modifications that
+are subtle related to z-ordering, activation, maximizing, snapping, and so on are not considered.
+
+## Future considerations
+
+### Multiple clients
+
+If the multiple clients problem becomes more widespread, we may need to change the graphical
+behavior of the Windows Terminal window to only hide certain tabs or panes when a command
+comes in instead of hiding the entire window (unless of course there is only one tab/pane).
+
+We may also need to adjust that once consensus is reached among tabs/panes that it can then
+and only then propagate up to the entire window.
+
+We will decide on this after we receive feedback that it is a necessary scenario. Otherwise,
+we will hold for now.
+
+### Other verbs
+
+If it turns out that we discover tests/scenarios that need maximizing, activation, or other
+properties of the `::ShowWindow()` call to be propagated to maintain compatibility, we will
+be able to carry those through on the same channel and command. Most of them have an existing
+equivalent in `XTWINOPS`. Those that do not, we would want to probably avoid as they will not
+be implemented in any other terminal. We would extend the protocol as an absolute last resort
+and only after receiving feedback from the greater worldwide terminal community.
+
+### Z-ordering
+
+The channel we're establishing here to communicate information about the window and its
+placement may be useful for the z-ordering issues we have in #2988. In those scenarios,
+a console client application is attempting to launch and position a window on top of the
+terminal, wherever it is. Further synchronizing the state of the new fake-window in the
+ConPTY with the real window on the terminal side may enable those tools to function as
+they expect.
+
+This is another circumstance we didn't expect: having command-line applications create windows
+with a need for complex layout and ordering. These sorts of behaviors cannot be translated
+to a universal language and will not be available off the singular machine, so encouraged
+alternative methods like command-line based UI. However, for single-box scenarios, this
+behavior is engrained in some Windows tooling due to its ease of use.
+
+## Resources
+
+- [Default Terminal spec](https://github.com/microsoft/terminal/pull/7414)
+- [Z-ordering issue](https://github.com/microsoft/terminal/issues/2988)
+- See all the embedded links in this document to Windows API resources
--- a/src/audio/midi/MidiAudio.cpp
+++ b/src/audio/midi/MidiAudio.cpp
@@ -0,0 +1,125 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "precomp.h"
+#include "MidiAudio.hpp"
+#include "../terminal/parser/stateMachine.hpp"
+
+namespace
+{
+    class MidiOut
+    {
+    public:
+        static constexpr auto NOTE_OFF = 0x80;
+        static constexpr auto NOTE_ON = 0x90;
+        static constexpr auto PROGRAM_CHANGE = 0xC0;
+
+        // We're using a square wave as an approximation of the sound that the
+        // original VT525 terminals might have produced. This is probably not
+        // quite right, but it works reasonably well.
+        static constexpr auto SQUARE_WAVE_SYNTH = 80;
+
+        MidiOut() noexcept
+        {
+            if constexpr (Feature_DECPSViaMidiPlayer::IsEnabled())
+            {
+                midiOutOpen(&handle, MIDI_MAPPER, NULL, NULL, CALLBACK_NULL);
+                OutputMessage(PROGRAM_CHANGE, SQUARE_WAVE_SYNTH);
+            }
+        }
+        ~MidiOut() noexcept
+        {
+            if constexpr (Feature_DECPSViaMidiPlayer::IsEnabled())
+            {
+                midiOutClose(handle);
+            }
+        }
+        void OutputMessage(const int b1, const int b2, const int b3 = 0, const int b4 = 0) noexcept
+        {
+            if constexpr (Feature_DECPSViaMidiPlayer::IsEnabled())
+            {
+                midiOutShortMsg(handle, MAKELONG(MAKEWORD(b1, b2), MAKEWORD(b3, b4)));
+            }
+        }
+
+        MidiOut(const MidiOut&) = delete;
+        MidiOut(MidiOut&&) = delete;
+        MidiOut& operator=(const MidiOut&) = delete;
+        MidiOut& operator=(MidiOut&&) = delete;
+
+    private:
+        HMIDIOUT handle = nullptr;
+    };
+}
+
+using namespace std::chrono_literals;
+
+MidiAudio::~MidiAudio() noexcept
+{
+    try
+    {
+#pragma warning(suppress : 26447)
+        // We acquire the lock here so the class isn't destroyed while in use.
+        // If this throws, we'll catch it, so the C26447 warning is bogus.
+        _inUseMutex.lock();
+    }
+    catch (...)
+    {
+        // If the lock fails, we'll just have to live with the consequences.
+    }
+}
+
+void MidiAudio::Initialize()
+{
+    _shutdownFuture = _shutdownPromise.get_future();
+}
+
+void MidiAudio::Shutdown()
+{
+    // Once the shutdown promise is set, any note that is playing will stop
+    // immediately, and the Unlock call will exit the thread ASAP.
+    _shutdownPromise.set_value();
+}
+
+void MidiAudio::Lock()
+{
+    _inUseMutex.lock();
+}
+
+void MidiAudio::Unlock()
+{
+    // We need to check the shutdown status before releasing the mutex,
+    // because after that the class could be destroyed.
+    const auto shutdownStatus = _shutdownFuture.wait_for(0s);
+    _inUseMutex.unlock();
+    // If the wait didn't timeout, that means the shutdown promise was set,
+    // so we need to exit the thread ASAP by throwing an exception.
+    if (shutdownStatus != std::future_status::timeout)
+    {
+        throw Microsoft::Console::VirtualTerminal::StateMachine::ShutdownException{};
+    }
+}
+
+void MidiAudio::PlayNote(const int noteNumber, const int velocity, const std::chrono::microseconds duration) noexcept
+try
+{
+    // The MidiOut is a local static because we can only have one instance,
+    // and we only want to construct it when it's actually needed.
+    static MidiOut midiOut;
+
+    if (velocity)
+    {
+        midiOut.OutputMessage(MidiOut::NOTE_ON, noteNumber, velocity);
+    }
+
+    // By waiting on the shutdown future with the duration of the note, we'll
+    // either be paused for the appropriate amount of time, or we'll break out
+    // of the wait early if we've been shutdown.
+    _shutdownFuture.wait_for(duration);
+
+    if (velocity)
+    {
+        midiOut.OutputMessage(MidiOut::NOTE_OFF, noteNumber, velocity);
+    }
+}
+CATCH_LOG()
--- a/src/audio/midi/MidiAudio.hpp
+++ b/src/audio/midi/MidiAudio.hpp
@@ -0,0 +1,36 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- MidiAudio.hpp
+
+Abstract:
+  This modules provide basic MIDI support with blocking sound output.
+  */
+
+#pragma once
+
+#include <future>
+#include <mutex>
+
+class MidiAudio
+{
+public:
+    MidiAudio() = default;
+    MidiAudio(const MidiAudio&) = delete;
+    MidiAudio(MidiAudio&&) = delete;
+    MidiAudio& operator=(const MidiAudio&) = delete;
+    MidiAudio& operator=(MidiAudio&&) = delete;
+    ~MidiAudio() noexcept;
+    void Initialize();
+    void Shutdown();
+    void Lock();
+    void Unlock();
+    void PlayNote(const int noteNumber, const int velocity, const std::chrono::microseconds duration) noexcept;
+
+private:
+    std::promise<void> _shutdownPromise;
+    std::future<void> _shutdownFuture;
+    std::mutex _inUseMutex;
+};
--- a/src/audio/midi/lib/midi.vcxproj
+++ b/src/audio/midi/lib/midi.vcxproj
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{3c67784e-1453-49c2-9660-483e2cc7f7ad}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>midi</RootNamespace>
+    <ProjectName>MidiAudio</ProjectName>
+    <TargetName>MidiAudio</TargetName>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)src\common.build.pre.props" />
+  <Import Project="$(SolutionDir)src\common.nugetversions.props" />
+  <ItemGroup>
+    <ClCompile Include="..\MidiAudio.cpp" />
+    <ClCompile Include="..\precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\MidiAudio.hpp" />
+    <ClInclude Include="..\precomp.h" />
+  </ItemGroup>
+  <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
+  <Import Project="$(SolutionDir)src\common.build.post.props" />
+  <Import Project="$(SolutionDir)src\common.nugetversions.targets" />
+</Project>
--- a/src/audio/midi/precomp.cpp
+++ b/src/audio/midi/precomp.cpp
@@ -0,0 +1,4 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "precomp.h"
--- a/src/audio/midi/precomp.h
+++ b/src/audio/midi/precomp.h
@@ -0,0 +1,30 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- precomp.h
+
+Abstract:
+- Contains external headers to include in the precompile phase of console build process.
+- Avoid including internal project headers. Instead include them only in the classes that need them (helps with test project building).
+--*/
+
+#pragma once
+
+// clang-format off
+
+// This includes support libraries from the CRT, STL, WIL, and GSL
+#include "LibraryIncludes.h"
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
+#define NOMCX
+#define NOHELP
+#define NOCOMM
+#endif
+
+// Windows Header Files:
+#include <windows.h>
+
+// clang-format on
--- a/src/buffer/out/AttrRow.cpp
+++ b/src/buffer/out/AttrRow.cpp
@@ -11,8 +11,8 @@
 // - attr - the default text attribute
 // Return Value:
 // - constructed object
-ATTR_ROW::ATTR_ROW(const uint16_t width, const TextAttribute attr) :
-    _data(width, attr) {}
+ATTR_ROW::ATTR_ROW(const til::CoordType width, const TextAttribute attr) :
+    _data(gsl::narrow_cast<uint16_t>(width), attr) {}

 // Routine Description:
 // - Sets all properties of the ATTR_ROW to default values
@@ -32,9 +32,9 @@ void ATTR_ROW::Reset(const TextAttribute attr)
 // - newWidth - The new width of the row.
 // Return Value:
 // - <none>, throws exceptions on failures.
-void ATTR_ROW::Resize(const uint16_t newWidth)
+void ATTR_ROW::Resize(const til::CoordType newWidth)
 {
-    _data.resize_trailing_extent(newWidth);
+    _data.resize_trailing_extent(gsl::narrow<uint16_t>(newWidth));
 }

 // Routine Description:
@@ -45,9 +45,9 @@ void ATTR_ROW::Resize(const uint16_t newWidth)
 // - the text attribute at column
 // Note:
 // - will throw on error
-TextAttribute ATTR_ROW::GetAttrByColumn(const uint16_t column) const
+TextAttribute ATTR_ROW::GetAttrByColumn(const til::CoordType column) const
 {
-    return _data.at(column);
+    return _data.at(gsl::narrow<uint16_t>(column));
 }

 // Routine Description:
@@ -74,7 +74,7 @@ std::vector<uint16_t> ATTR_ROW::GetHyperlinks() const
 // - attr - Attribute (color) to fill remaining characters with
 // Return Value:
 // - <none>
-bool ATTR_ROW::SetAttrToEnd(const uint16_t beginIndex, const TextAttribute attr)
+bool ATTR_ROW::SetAttrToEnd(const til::CoordType beginIndex, const TextAttribute attr)
 {
    _data.replace(gsl::narrow<uint16_t>(beginIndex), _data.size(), attr);
    return true;
@@ -103,9 +103,9 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt
 // - newAttr: The attribute to merge into this row.
 // Return Value:
 // - <none>
-void ATTR_ROW::Replace(const uint16_t beginIndex, const uint16_t endIndex, const TextAttribute& newAttr)
+void ATTR_ROW::Replace(const til::CoordType beginIndex, const til::CoordType endIndex, const TextAttribute& newAttr)
 {
-    _data.replace(beginIndex, endIndex, newAttr);
+    _data.replace(gsl::narrow<uint16_t>(beginIndex), gsl::narrow<uint16_t>(endIndex), newAttr);
 }

 ATTR_ROW::const_iterator ATTR_ROW::begin() const noexcept
--- a/src/buffer/out/AttrRow.hpp
+++ b/src/buffer/out/AttrRow.hpp
@@ -30,7 +30,7 @@ class ATTR_ROW final
 public:
    using const_iterator = rle_vector::const_iterator;

-    ATTR_ROW(uint16_t width, TextAttribute attr);
+    ATTR_ROW(til::CoordType width, TextAttribute attr);

    ~ATTR_ROW() = default;

@@ -40,13 +40,13 @@ public:
    noexcept = default;
    ATTR_ROW& operator=(ATTR_ROW&&) noexcept = default;

-    TextAttribute GetAttrByColumn(uint16_t column) const;
+    TextAttribute GetAttrByColumn(til::CoordType column) const;
    std::vector<uint16_t> GetHyperlinks() const;

-    bool SetAttrToEnd(uint16_t beginIndex, TextAttribute attr);
+    bool SetAttrToEnd(til::CoordType beginIndex, TextAttribute attr);
    void ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAttribute& replaceWith);
-    void Resize(uint16_t newWidth);
-    void Replace(uint16_t beginIndex, uint16_t endIndex, const TextAttribute& newAttr);
+    void Resize(til::CoordType newWidth);
+    void Replace(til::CoordType beginIndex, til::CoordType endIndex, const TextAttribute& newAttr);

    const_iterator begin() const noexcept;
    const_iterator end() const noexcept;
--- a/src/buffer/out/CharRow.cpp
+++ b/src/buffer/out/CharRow.cpp
@@ -17,7 +17,7 @@
 // Note: will through if unable to allocate char/attribute buffers
 #pragma warning(push)
 #pragma warning(disable : 26447) // small_vector's constructor says it can throw but it should not given how we use it.  This suppresses this error for the AuditMode build.
-CharRow::CharRow(size_t rowWidth, ROW* const pParent) noexcept :
+CharRow::CharRow(til::CoordType rowWidth, ROW* const pParent) noexcept :
    _data(rowWidth, value_type()),
    _pParent{ FAIL_FAST_IF_NULL(pParent) }
 {
@@ -30,9 +30,9 @@ CharRow::CharRow(size_t rowWidth, ROW* const pParent) noexcept :
 // - <none>
 // Return Value:
 // - the size of the row
-size_t CharRow::size() const noexcept
+til::CoordType CharRow::size() const noexcept
 {
-    return _data.size();
+    return gsl::narrow_cast<til::CoordType>(_data.size());
 }

 // Routine Description:
@@ -55,7 +55,7 @@ void CharRow::Reset() noexcept
 // - newSize - the new width of the character and attributes rows
 // Return Value:
 // - S_OK on success, otherwise relevant error code
-[[nodiscard]] HRESULT CharRow::Resize(const size_t newSize) noexcept
+[[nodiscard]] HRESULT CharRow::Resize(const til::CoordType newSize) noexcept
 {
    try
    {
@@ -93,14 +93,14 @@ typename CharRow::const_iterator CharRow::cend() const noexcept
 // - <none>
 // Return Value:
 // - The calculated left boundary of the internal string.
-size_t CharRow::MeasureLeft() const noexcept
+til::CoordType CharRow::MeasureLeft() const noexcept
 {
-    const_iterator it = _data.cbegin();
+    auto it = _data.cbegin();
    while (it != _data.cend() && it->IsSpace())
    {
        ++it;
    }
-    return it - _data.cbegin();
+    return gsl::narrow_cast<til::CoordType>(it - _data.cbegin());
 }

 // Routine Description:
@@ -109,17 +109,17 @@ size_t CharRow::MeasureLeft() const noexcept
 // - <none>
 // Return Value:
 // - The calculated right boundary of the internal string.
-size_t CharRow::MeasureRight() const
+til::CoordType CharRow::MeasureRight() const
 {
-    const_reverse_iterator it = _data.crbegin();
+    auto it = _data.crbegin();
    while (it != _data.crend() && it->IsSpace())
    {
        ++it;
    }
-    return _data.crend() - it;
+    return gsl::narrow_cast<til::CoordType>(_data.crend() - it);
 }

-void CharRow::ClearCell(const size_t column)
+void CharRow::ClearCell(const til::CoordType column)
 {
    _data.at(column).Reset();
 }
@@ -132,7 +132,7 @@ void CharRow::ClearCell(const size_t column)
 // - True if there is valid text in this row. False otherwise.
 bool CharRow::ContainsText() const noexcept
 {
-    for (const value_type& cell : _data)
+    for (const auto& cell : _data)
    {
        if (!cell.IsSpace())
        {
@@ -149,7 +149,7 @@ bool CharRow::ContainsText() const noexcept
 // Return Value:
 // - the attribute
 // Note: will throw exception if column is out of bounds
-const DbcsAttribute& CharRow::DbcsAttrAt(const size_t column) const
+const DbcsAttribute& CharRow::DbcsAttrAt(const til::CoordType column) const
 {
    return _data.at(column).DbcsAttr();
 }
@@ -161,7 +161,7 @@ const DbcsAttribute& CharRow::DbcsAttrAt(const size_t column) const
 // Return Value:
 // - the attribute
 // Note: will throw exception if column is out of bounds
-DbcsAttribute& CharRow::DbcsAttrAt(const size_t column)
+DbcsAttribute& CharRow::DbcsAttrAt(const til::CoordType column)
 {
    return _data.at(column).DbcsAttr();
 }
@@ -173,7 +173,7 @@ DbcsAttribute& CharRow::DbcsAttrAt(const size_t column)
 // Return Value:
 // - <none>
 // Note: will throw exception if column is out of bounds
-void CharRow::ClearGlyph(const size_t column)
+void CharRow::ClearGlyph(const til::CoordType column)
 {
    _data.at(column).EraseChars();
 }
@@ -185,9 +185,9 @@ void CharRow::ClearGlyph(const size_t column)
 // Return Value:
 // - text data at column
 // - Note: will throw exception if column is out of bounds
-const CharRow::reference CharRow::GlyphAt(const size_t column) const
+const CharRow::reference CharRow::GlyphAt(const til::CoordType column) const
 {
-    THROW_HR_IF(E_INVALIDARG, column >= _data.size());
+    THROW_HR_IF(E_INVALIDARG, column < 0 || column >= gsl::narrow_cast<til::CoordType>(_data.size()));
    return { const_cast<CharRow&>(*this), column };
 }

@@ -198,9 +198,9 @@ const CharRow::reference CharRow::GlyphAt(const size_t column) const
 // Return Value:
 // - text data at column
 // - Note: will throw exception if column is out of bounds
-CharRow::reference CharRow::GlyphAt(const size_t column)
+CharRow::reference CharRow::GlyphAt(const til::CoordType column)
 {
-    THROW_HR_IF(E_INVALIDARG, column >= _data.size());
+    THROW_HR_IF(E_INVALIDARG, column < 0 || column >= gsl::narrow_cast<til::CoordType>(_data.size()));
    return { *this, column };
 }

@@ -209,7 +209,7 @@ std::wstring CharRow::GetText() const
    std::wstring wstr;
    wstr.reserve(_data.size());

-    for (size_t i = 0; i < _data.size(); ++i)
+    for (til::CoordType i = 0; i < gsl::narrow_cast<til::CoordType>(_data.size()); ++i)
    {
        const auto glyph = GlyphAt(i);
        if (!DbcsAttrAt(i).IsTrailing())
@@ -231,9 +231,9 @@ std::wstring CharRow::GetText() const
 // - wordDelimiters: the delimiters defined as a part of the DelimiterClass::DelimiterChar
 // Return Value:
 // - the delimiter class for the given char
-const DelimiterClass CharRow::DelimiterClassAt(const size_t column, const std::wstring_view wordDelimiters) const
+const DelimiterClass CharRow::DelimiterClassAt(const til::CoordType column, const std::wstring_view wordDelimiters) const
 {
-    THROW_HR_IF(E_INVALIDARG, column >= _data.size());
+    THROW_HR_IF(E_INVALIDARG, column < 0 || column >= gsl::narrow_cast<til::CoordType>(_data.size()));

    const auto glyph = *GlyphAt(column).begin();
    if (glyph <= UNICODE_SPACE)
@@ -265,10 +265,10 @@ const UnicodeStorage& CharRow::GetUnicodeStorage() const noexcept
 // Arguments:
 // - column - the column to generate the key for
 // Return Value:
-// - the COORD key for data access from UnicodeStorage for the column
-COORD CharRow::GetStorageKey(const size_t column) const noexcept
+// - the til::point key for data access from UnicodeStorage for the column
+til::point CharRow::GetStorageKey(const til::CoordType column) const noexcept
 {
-    return { gsl::narrow<SHORT>(column), _pParent->GetId() };
+    return { column, _pParent->GetId() };
 }

 // Routine Description:
--- a/src/buffer/out/CharRow.hpp
+++ b/src/buffer/out/CharRow.hpp
@@ -54,22 +54,22 @@ public:
    using const_reverse_iterator = typename boost::container::small_vector_base<value_type>::const_reverse_iterator;
    using reference = typename CharRowCellReference;

-    CharRow(size_t rowWidth, ROW* const pParent) noexcept;
+    CharRow(til::CoordType rowWidth, ROW* const pParent) noexcept;

-    size_t size() const noexcept;
-    [[nodiscard]] HRESULT Resize(const size_t newSize) noexcept;
-    size_t MeasureLeft() const noexcept;
-    size_t MeasureRight() const;
+    til::CoordType size() const noexcept;
+    [[nodiscard]] HRESULT Resize(const til::CoordType newSize) noexcept;
+    til::CoordType MeasureLeft() const noexcept;
+    til::CoordType MeasureRight() const;
    bool ContainsText() const noexcept;
-    const DbcsAttribute& DbcsAttrAt(const size_t column) const;
-    DbcsAttribute& DbcsAttrAt(const size_t column);
-    void ClearGlyph(const size_t column);
+    const DbcsAttribute& DbcsAttrAt(const til::CoordType column) const;
+    DbcsAttribute& DbcsAttrAt(const til::CoordType column);
+    void ClearGlyph(const til::CoordType column);

-    const DelimiterClass DelimiterClassAt(const size_t column, const std::wstring_view wordDelimiters) const;
+    const DelimiterClass DelimiterClassAt(const til::CoordType column, const std::wstring_view wordDelimiters) const;

    // working with glyphs
-    const reference GlyphAt(const size_t column) const;
-    reference GlyphAt(const size_t column);
+    const reference GlyphAt(const til::CoordType column) const;
+    reference GlyphAt(const til::CoordType column);

    // iterators
    iterator begin() noexcept;
@@ -82,7 +82,7 @@ public:

    UnicodeStorage& GetUnicodeStorage() noexcept;
    const UnicodeStorage& GetUnicodeStorage() const noexcept;
-    COORD GetStorageKey(const size_t column) const noexcept;
+    til::point GetStorageKey(const til::CoordType column) const noexcept;

    void UpdateParent(ROW* const pParent);

@@ -91,7 +91,7 @@ public:

 private:
    void Reset() noexcept;
-    void ClearCell(const size_t column);
+    void ClearCell(const til::CoordType column);
    std::wstring GetText() const;

 protected:
--- a/src/buffer/out/CharRowCellReference.cpp
+++ b/src/buffer/out/CharRowCellReference.cpp
@@ -110,7 +110,7 @@ CharRowCellReference::const_iterator CharRowCellReference::end() const

 bool operator==(const CharRowCellReference& ref, const std::vector<wchar_t>& glyph)
 {
-    const DbcsAttribute& dbcsAttr = ref._cellData().DbcsAttr();
+    const auto& dbcsAttr = ref._cellData().DbcsAttr();
    if (glyph.size() == 1 && dbcsAttr.IsGlyphStored())
    {
        return false;
--- a/src/buffer/out/CharRowCellReference.hpp
+++ b/src/buffer/out/CharRowCellReference.hpp
@@ -25,7 +25,7 @@ class CharRowCellReference final
 public:
    using const_iterator = const wchar_t*;

-    CharRowCellReference(CharRow& parent, const size_t index) noexcept :
+    CharRowCellReference(CharRow& parent, const til::CoordType index) noexcept :
        _parent{ parent },
        _index{ index }
    {
@@ -51,7 +51,7 @@ private:
    // what char row the object belongs to
    CharRow& _parent;
    // the index of the cell in the parent char row
-    const size_t _index;
+    til::CoordType _index;

    CharRowCell& _cellData();
    const CharRowCell& _cellData() const;
--- a/src/buffer/out/LineRendition.hpp
+++ b/src/buffer/out/LineRendition.hpp
@@ -21,16 +21,16 @@ enum class LineRendition
    DoubleHeightBottom
 };

-constexpr SMALL_RECT ScreenToBufferLine(const SMALL_RECT& line, const LineRendition lineRendition)
+constexpr til::inclusive_rect ScreenToBufferLine(const til::inclusive_rect& line, const LineRendition lineRendition)
 {
    // Use shift right to quickly divide the Left and Right by 2 for double width lines.
    const auto scale = lineRendition == LineRendition::SingleWidth ? 0 : 1;
    return { line.Left >> scale, line.Top, line.Right >> scale, line.Bottom };
 }

-constexpr SMALL_RECT BufferToScreenLine(const SMALL_RECT& line, const LineRendition lineRendition)
+constexpr til::inclusive_rect BufferToScreenLine(const til::inclusive_rect& line, const LineRendition lineRendition)
 {
    // Use shift left to quickly multiply the Left and Right by 2 for double width lines.
-    const SHORT scale = lineRendition == LineRendition::SingleWidth ? 0 : 1;
+    const auto scale = lineRendition == LineRendition::SingleWidth ? 0 : 1;
    return { line.Left << scale, line.Top, (line.Right << scale) + scale, line.Bottom };
 }
--- a/src/buffer/out/OutputCellIterator.cpp
+++ b/src/buffer/out/OutputCellIterator.cpp
@@ -302,7 +302,7 @@ OutputCellIterator& OutputCellIterator::operator++()
 // - Reference to self after advancement.
 OutputCellIterator OutputCellIterator::operator++(int)
 {
-    auto temp(*this);
+    auto temp = *this;
    operator++();
    return temp;
 }
@@ -478,7 +478,7 @@ OutputCellView OutputCellIterator::s_GenerateView(const wchar_t& wch, const Text
 // - Object representing the view into this cell
 OutputCellView OutputCellIterator::s_GenerateViewLegacyAttr(const WORD& legacyAttr) noexcept
 {
-    WORD cleanAttr = legacyAttr;
+    auto cleanAttr = legacyAttr;
    WI_ClearAllFlags(cleanAttr, COMMON_LVB_SBCSDBCS); // don't use legacy lead/trailing byte flags for colors

    const TextAttribute attr(cleanAttr);
@@ -531,16 +531,16 @@ OutputCellView OutputCellIterator::s_GenerateView(const OutputCell& cell)
 // - Gets the distance between two iterators relative to the input data given in.
 // Return Value:
 // - The number of items of the input run consumed between these two iterators.
-ptrdiff_t OutputCellIterator::GetInputDistance(OutputCellIterator other) const noexcept
+til::CoordType OutputCellIterator::GetInputDistance(OutputCellIterator other) const noexcept
 {
-    return _pos - other._pos;
+    return gsl::narrow_cast<til::CoordType>(_pos - other._pos);
 }

 // Routine Description:
 // - Gets the distance between two iterators relative to the number of cells inserted.
 // Return Value:
 // - The number of cells in the backing buffer filled between these two iterators.
-ptrdiff_t OutputCellIterator::GetCellDistance(OutputCellIterator other) const noexcept
+til::CoordType OutputCellIterator::GetCellDistance(OutputCellIterator other) const noexcept
 {
-    return _distance - other._distance;
+    return gsl::narrow_cast<til::CoordType>(_distance - other._distance);
 }
--- a/src/buffer/out/OutputCellIterator.hpp
+++ b/src/buffer/out/OutputCellIterator.hpp
@@ -29,7 +29,7 @@ class OutputCellIterator final
 public:
    using iterator_category = std::input_iterator_tag;
    using value_type = OutputCellView;
-    using difference_type = ptrdiff_t;
+    using difference_type = til::CoordType;
    using pointer = OutputCellView*;
    using reference = OutputCellView&;

@@ -48,9 +48,9 @@ public:

    operator bool() const noexcept;

-    ptrdiff_t GetCellDistance(OutputCellIterator other) const noexcept;
-    ptrdiff_t GetInputDistance(OutputCellIterator other) const noexcept;
-    friend ptrdiff_t operator-(OutputCellIterator one, OutputCellIterator two) = delete;
+    til::CoordType GetCellDistance(OutputCellIterator other) const noexcept;
+    til::CoordType GetInputDistance(OutputCellIterator other) const noexcept;
+    friend til::CoordType operator-(OutputCellIterator one, OutputCellIterator two) = delete;

    OutputCellIterator& operator++();
    OutputCellIterator operator++(int);
--- a/src/buffer/out/OutputCellRect.cpp
+++ b/src/buffer/out/OutputCellRect.cpp
@@ -21,14 +21,11 @@ OutputCellRect::OutputCellRect() noexcept :
 // Arguments:
 // - rows - Rows in the rectangle (height)
 // - cols - Columns in the rectangle (width)
-OutputCellRect::OutputCellRect(const size_t rows, const size_t cols) :
+OutputCellRect::OutputCellRect(const til::CoordType rows, const til::CoordType cols) :
    _rows(rows),
    _cols(cols)
 {
-    size_t totalCells;
-    THROW_IF_FAILED(SizeTMult(rows, cols, &totalCells));
-
-    _storage.resize(totalCells);
+    _storage.resize(gsl::narrow<size_t>(rows * cols));
 }

 // Routine Description:
@@ -37,7 +34,7 @@ OutputCellRect::OutputCellRect(const size_t rows, const size_t cols) :
 // - row - The Y position or row index in the buffer.
 // Return Value:
 // - Read/write span of OutputCells
-gsl::span<OutputCell> OutputCellRect::GetRow(const size_t row)
+gsl::span<OutputCell> OutputCellRect::GetRow(const til::CoordType row)
 {
    return gsl::span<OutputCell>(_FindRowOffset(row), _cols);
 }
@@ -48,7 +45,7 @@ gsl::span<OutputCell> OutputCellRect::GetRow(const size_t row)
 // - row - The Y position or row index in the buffer.
 // Return Value:
 // - Read-only iterator of OutputCells
-OutputCellIterator OutputCellRect::GetRowIter(const size_t row) const
+OutputCellIterator OutputCellRect::GetRowIter(const til::CoordType row) const
 {
    const gsl::span<const OutputCell> view(_FindRowOffset(row), _cols);

@@ -62,9 +59,9 @@ OutputCellIterator OutputCellRect::GetRowIter(const size_t row) const
 // - row - The Y position or row index in the buffer.
 // Return Value:
 // - Pointer to the location in the rectangle that represents the start of the requested row.
-OutputCell* OutputCellRect::_FindRowOffset(const size_t row)
+OutputCell* OutputCellRect::_FindRowOffset(const til::CoordType row)
 {
-    return &_storage.at(row * _cols);
+    return &_storage.at(gsl::narrow_cast<size_t>(row * _cols));
 }

 // Routine Description:
@@ -74,16 +71,16 @@ OutputCell* OutputCellRect::_FindRowOffset(const size_t row)
 // - row - The Y position or row index in the buffer.
 // Return Value:
 // - Pointer to the location in the rectangle that represents the start of the requested row.
-const OutputCell* OutputCellRect::_FindRowOffset(const size_t row) const
+const OutputCell* OutputCellRect::_FindRowOffset(const til::CoordType row) const
 {
-    return &_storage.at(row * _cols);
+    return &_storage.at(gsl::narrow_cast<size_t>(row * _cols));
 }

 // Routine Description:
 // - Gets the height of the rectangle
 // Return Value:
 // - Height
-size_t OutputCellRect::Height() const noexcept
+til::CoordType OutputCellRect::Height() const noexcept
 {
    return _rows;
 }
@@ -92,7 +89,7 @@ size_t OutputCellRect::Height() const noexcept
 // - Gets the width of the rectangle
 // Return Value:
 // - Width
-size_t OutputCellRect::Width() const noexcept
+til::CoordType OutputCellRect::Width() const noexcept
 {
    return _cols;
 }
--- a/src/buffer/out/OutputCellRect.hpp
+++ b/src/buffer/out/OutputCellRect.hpp
@@ -30,20 +30,20 @@ class OutputCellRect final
 {
 public:
    OutputCellRect() noexcept;
-    OutputCellRect(const size_t rows, const size_t cols);
+    OutputCellRect(const til::CoordType rows, const til::CoordType cols);

-    gsl::span<OutputCell> GetRow(const size_t row);
-    OutputCellIterator GetRowIter(const size_t row) const;
+    gsl::span<OutputCell> GetRow(const til::CoordType row);
+    OutputCellIterator GetRowIter(const til::CoordType row) const;

-    size_t Height() const noexcept;
-    size_t Width() const noexcept;
+    til::CoordType Height() const noexcept;
+    til::CoordType Width() const noexcept;

 private:
    std::vector<OutputCell> _storage;

-    OutputCell* _FindRowOffset(const size_t row);
-    const OutputCell* _FindRowOffset(const size_t row) const;
+    OutputCell* _FindRowOffset(const til::CoordType row);
+    const OutputCell* _FindRowOffset(const til::CoordType row) const;

-    size_t _cols;
-    size_t _rows;
+    til::CoordType _cols;
+    til::CoordType _rows;
 };
--- a/src/buffer/out/OutputCellView.cpp
+++ b/src/buffer/out/OutputCellView.cpp
@@ -38,7 +38,7 @@ OutputCellView::OutputCellView(const std::wstring_view view,
 // - Reports how many columns we expect the Chars() text data to consume
 // Return Value:
 // - Count of column cells on the screen
-size_t OutputCellView::Columns() const noexcept
+til::CoordType OutputCellView::Columns() const noexcept
 {
    if (DbcsAttr().IsSingle())
    {
--- a/src/buffer/out/OutputCellView.hpp
+++ b/src/buffer/out/OutputCellView.hpp
@@ -31,7 +31,7 @@ public:
                   const TextAttributeBehavior behavior) noexcept;

    const std::wstring_view& Chars() const noexcept;
-    size_t Columns() const noexcept;
+    til::CoordType Columns() const noexcept;
    DbcsAttribute DbcsAttr() const noexcept;
    TextAttribute TextAttr() const noexcept;
    TextAttributeBehavior TextAttrBehavior() const noexcept;
--- a/src/buffer/out/Row.cpp
+++ b/src/buffer/out/Row.cpp
@@ -16,7 +16,7 @@
 // - pParent - the text buffer that this row belongs to
 // Return Value:
 // - constructed object
-ROW::ROW(const SHORT rowId, const unsigned short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent) :
+ROW::ROW(const til::CoordType rowId, const til::CoordType rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent) :
    _id{ rowId },
    _rowWidth{ rowWidth },
    _charRow{ rowWidth, this },
@@ -58,7 +58,7 @@ bool ROW::Reset(const TextAttribute Attr)
 // - width - the new width, in cells
 // Return Value:
 // - S_OK if successful, otherwise relevant error
-[[nodiscard]] HRESULT ROW::Resize(const unsigned short width)
+[[nodiscard]] HRESULT ROW::Resize(const til::CoordType width)
 {
    RETURN_IF_FAILED(_charRow.Resize(width));
    try
@@ -78,7 +78,7 @@ bool ROW::Reset(const TextAttribute Attr)
 // - column - 0-indexed column index
 // Return Value:
 // - <none>
-void ROW::ClearColumn(const size_t column)
+void ROW::ClearColumn(const til::CoordType column)
 {
    THROW_HR_IF(E_INVALIDARG, column >= _charRow.size());
    _charRow.ClearCell(column);
@@ -103,7 +103,7 @@ const UnicodeStorage& ROW::GetUnicodeStorage() const noexcept
 // - limitRight - right inclusive column ID for the last write in this row. (optional, will just write to the end of row if nullopt)
 // Return Value:
 // - iterator to first cell that was not written to this row.
-OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, const std::optional<bool> wrap, std::optional<size_t> limitRight)
+OutputCellIterator ROW::WriteCells(OutputCellIterator it, const til::CoordType index, const std::optional<bool> wrap, std::optional<til::CoordType> limitRight)
 {
    THROW_HR_IF(E_INVALIDARG, index >= _charRow.size());
    THROW_HR_IF(E_INVALIDARG, limitRight.value_or(0) >= _charRow.size());
@@ -113,8 +113,8 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, co

    auto currentColor = it->TextAttr();
    uint16_t colorUses = 0;
-    uint16_t colorStarts = gsl::narrow_cast<uint16_t>(index);
-    uint16_t currentIndex = colorStarts;
+    auto colorStarts = gsl::narrow_cast<uint16_t>(index);
+    auto currentIndex = colorStarts;

    while (it && currentIndex <= finalColumnInRow)
    {
@@ -141,7 +141,7 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, co
        // Fill the text if the behavior isn't set to saying there's only a color stored in this iterator.
        if (it->TextAttrBehavior() != TextAttributeBehavior::StoredOnly)
        {
-            const bool fillingLastColumn = currentIndex == finalColumnInRow;
+            const auto fillingLastColumn = currentIndex == finalColumnInRow;

            // TODO: MSFT: 19452170 - We need to ensure when writing any trailing byte that the one to the left
            // is a matching leading byte. Likewise, if we're writing a leading byte, we need to make sure we still have space in this loop
--- a/src/buffer/out/Row.hpp
+++ b/src/buffer/out/Row.hpp
@@ -32,9 +32,9 @@ class TextBuffer;
 class ROW final
 {
 public:
-    ROW(const SHORT rowId, const unsigned short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent);
+    ROW(const til::CoordType rowId, const til::CoordType rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent);

-    size_t size() const noexcept { return _rowWidth; }
+    til::CoordType size() const noexcept { return _rowWidth; }

    void SetWrapForced(const bool wrap) noexcept { _wrapForced = wrap; }
    bool WasWrapForced() const noexcept { return _wrapForced; }
@@ -51,19 +51,19 @@ public:
    LineRendition GetLineRendition() const noexcept { return _lineRendition; }
    void SetLineRendition(const LineRendition lineRendition) noexcept { _lineRendition = lineRendition; }

-    SHORT GetId() const noexcept { return _id; }
-    void SetId(const SHORT id) noexcept { _id = id; }
+    til::CoordType GetId() const noexcept { return _id; }
+    void SetId(const til::CoordType id) noexcept { _id = id; }

    bool Reset(const TextAttribute Attr);
-    [[nodiscard]] HRESULT Resize(const unsigned short width);
+    [[nodiscard]] HRESULT Resize(const til::CoordType width);

-    void ClearColumn(const size_t column);
+    void ClearColumn(const til::CoordType column);
    std::wstring GetText() const { return _charRow.GetText(); }

    UnicodeStorage& GetUnicodeStorage() noexcept;
    const UnicodeStorage& GetUnicodeStorage() const noexcept;

-    OutputCellIterator WriteCells(OutputCellIterator it, const size_t index, const std::optional<bool> wrap = std::nullopt, std::optional<size_t> limitRight = std::nullopt);
+    OutputCellIterator WriteCells(OutputCellIterator it, const til::CoordType index, const std::optional<bool> wrap = std::nullopt, std::optional<til::CoordType> limitRight = std::nullopt);

 #ifdef UNIT_TESTING
    friend constexpr bool operator==(const ROW& a, const ROW& b) noexcept;
@@ -74,8 +74,8 @@ private:
    CharRow _charRow;
    ATTR_ROW _attrRow;
    LineRendition _lineRendition;
-    SHORT _id;
-    unsigned short _rowWidth;
+    til::CoordType _id;
+    til::CoordType _rowWidth;
    // Occurs when the user runs out of text in a given row and we're forced to wrap the cursor to the next line
    bool _wrapForced;
    // Occurs when the user runs out of text to support a double byte character and we're forced to the next line
--- a/src/buffer/out/TextAttribute.cpp
+++ b/src/buffer/out/TextAttribute.cpp
@@ -11,6 +11,8 @@ static_assert(sizeof(TextAttribute) == 14);
 static_assert(alignof(TextAttribute) == 2);
 // Ensure that we can memcpy() and memmove() the struct for performance.
 static_assert(std::is_trivially_copyable_v<TextAttribute>);
+// Assert that the use of memcmp() for comparisons is safe.
+static_assert(std::has_unique_object_representations_v<TextAttribute>);

 namespace
 {
@@ -112,10 +114,10 @@ TextAttribute TextAttribute::StripErroneousVT16VersionsOfLegacyDefaults(const Te
 // - a WORD with legacy-style attributes for this textattribute.
 WORD TextAttribute::GetLegacyAttributes() const noexcept
 {
-    const BYTE fgIndex = _foreground.GetLegacyIndex(s_legacyDefaultForeground);
-    const BYTE bgIndex = _background.GetLegacyIndex(s_legacyDefaultBackground);
+    const auto fgIndex = _foreground.GetLegacyIndex(s_legacyDefaultForeground);
+    const auto bgIndex = _background.GetLegacyIndex(s_legacyDefaultBackground);
    const WORD metaAttrs = _wAttrLegacy & META_ATTRS;
-    const bool brighten = IsIntense() && _foreground.CanBeBrightened();
+    const auto brighten = IsIntense() && _foreground.CanBeBrightened();
    return fgIndex | (bgIndex << 4) | metaAttrs | (brighten ? FOREGROUND_INTENSITY : 0);
 }

--- a/src/buffer/out/TextAttribute.hpp
+++ b/src/buffer/out/TextAttribute.hpp
@@ -76,12 +76,15 @@ public:

    void Invert() noexcept;

-    friend constexpr bool operator==(const TextAttribute& a, const TextAttribute& b) noexcept;
-    friend constexpr bool operator!=(const TextAttribute& a, const TextAttribute& b) noexcept;
-    friend constexpr bool operator==(const TextAttribute& attr, const WORD& legacyAttr) noexcept;
-    friend constexpr bool operator!=(const TextAttribute& attr, const WORD& legacyAttr) noexcept;
-    friend constexpr bool operator==(const WORD& legacyAttr, const TextAttribute& attr) noexcept;
-    friend constexpr bool operator!=(const WORD& legacyAttr, const TextAttribute& attr) noexcept;
+    inline bool operator==(const TextAttribute& other) const noexcept
+    {
+        return memcmp(this, &other, sizeof(TextAttribute)) == 0;
+    }
+
+    inline bool operator!=(const TextAttribute& other) const noexcept
+    {
+        return memcmp(this, &other, sizeof(TextAttribute)) != 0;
+    }

    bool IsLegacy() const noexcept;
    bool IsIntense() const noexcept;
@@ -167,7 +170,7 @@ private:
    uint16_t _hyperlinkId; // sizeof: 2, alignof: 2
    TextColor _foreground; // sizeof: 4, alignof: 1
    TextColor _background; // sizeof: 4, alignof: 1
-    ExtendedAttributes _extendedAttrs; // sizeof: 1, alignof: 1
+    ExtendedAttributes _extendedAttrs; // sizeof: 2, alignof: 2

 #ifdef UNIT_TESTING
    friend class TextBufferTests;
@@ -184,20 +187,6 @@ enum class TextAttributeBehavior
    StoredOnly, // only use the contained text attribute and skip the insertion of anything else
 };

-constexpr bool operator==(const TextAttribute& a, const TextAttribute& b) noexcept
-{
-    return a._wAttrLegacy == b._wAttrLegacy &&
-           a._foreground == b._foreground &&
-           a._background == b._background &&
-           a._extendedAttrs == b._extendedAttrs &&
-           a._hyperlinkId == b._hyperlinkId;
-}
-
-constexpr bool operator!=(const TextAttribute& a, const TextAttribute& b) noexcept
-{
-    return !(a == b);
-}
-
 #ifdef UNIT_TESTING

 #define LOG_ATTR(attr) (Log::Comment(NoThrowString().Format( \
--- a/src/buffer/out/TextColor.cpp
+++ b/src/buffer/out/TextColor.cpp
@@ -54,6 +54,8 @@ constexpr std::array<BYTE, 256> Index256ToIndex16 = {

 // We should only need 4B for TextColor. Any more than that is just waste.
 static_assert(sizeof(TextColor) == 4);
+// Assert that the use of memcmp() for comparisons is safe.
+static_assert(std::has_unique_object_representations_v<TextColor>);

 bool TextColor::CanBeBrightened() const noexcept
 {
@@ -111,6 +113,8 @@ void TextColor::SetIndex(const BYTE index, const bool isIndex256) noexcept
 {
    _meta = isIndex256 ? ColorType::IsIndex256 : ColorType::IsIndex16;
    _index = index;
+    _green = 0;
+    _blue = 0;
 }

 // Method Description:
@@ -123,6 +127,9 @@ void TextColor::SetIndex(const BYTE index, const bool isIndex256) noexcept
 void TextColor::SetDefault() noexcept
 {
    _meta = ColorType::IsDefault;
+    _red = 0;
+    _green = 0;
+    _blue = 0;
 }

 // Method Description:
--- a/src/buffer/out/TextColor.h
+++ b/src/buffer/out/TextColor.h
@@ -49,6 +49,8 @@ enum class ColorAlias : size_t
 {
    DefaultForeground,
    DefaultBackground,
+    FrameForeground,
+    FrameBackground,
    ENUM_COUNT // must be the last element in the enum class
 };

@@ -72,10 +74,13 @@ public:
    static constexpr BYTE BRIGHT_CYAN = 14;
    static constexpr BYTE BRIGHT_WHITE = 15;

-    static constexpr size_t DEFAULT_FOREGROUND = 256;
-    static constexpr size_t DEFAULT_BACKGROUND = 257;
-    static constexpr size_t CURSOR_COLOR = 258;
-    static constexpr size_t TABLE_SIZE = 259;
+    // Entries 256 to 260 are reserved for XTerm compatibility.
+    static constexpr size_t DEFAULT_FOREGROUND = 261;
+    static constexpr size_t DEFAULT_BACKGROUND = 262;
+    static constexpr size_t FRAME_FOREGROUND = 263;
+    static constexpr size_t FRAME_BACKGROUND = 264;
+    static constexpr size_t CURSOR_COLOR = 265;
+    static constexpr size_t TABLE_SIZE = 266;

    constexpr TextColor() noexcept :
        _meta{ ColorType::IsDefault },
@@ -101,8 +106,15 @@ public:
    {
    }

-    friend constexpr bool operator==(const TextColor& a, const TextColor& b) noexcept;
-    friend constexpr bool operator!=(const TextColor& a, const TextColor& b) noexcept;
+    bool operator==(const TextColor& other) const noexcept
+    {
+        return memcmp(this, &other, sizeof(TextColor)) == 0;
+    }
+
+    bool operator!=(const TextColor& other) const noexcept
+    {
+        return memcmp(this, &other, sizeof(TextColor)) != 0;
+    }

    bool CanBeBrightened() const noexcept;
    bool IsLegacy() const noexcept;
@@ -151,19 +163,6 @@ private:
 #endif
 };

-bool constexpr operator==(const TextColor& a, const TextColor& b) noexcept
-{
-    return a._meta == b._meta &&
-           a._red == b._red &&
-           a._green == b._green &&
-           a._blue == b._blue;
-}
-
-bool constexpr operator!=(const TextColor& a, const TextColor& b) noexcept
-{
-    return !(a == b);
-}
-
 #ifdef UNIT_TESTING

 namespace WEX
--- a/src/buffer/out/UnicodeStorage.cpp
+++ b/src/buffer/out/UnicodeStorage.cpp
@@ -47,7 +47,7 @@ void UnicodeStorage::Erase(const key_type key) noexcept
 // - rowMap - A map of the old row IDs to the new row IDs.
 // - width - The width of the new row. Remove any items that are beyond the row width.
 //         - Use nullopt if we're not resizing the width of the row, just renumbering the rows.
-void UnicodeStorage::Remap(const std::unordered_map<SHORT, SHORT>& rowMap, const std::optional<SHORT> width)
+void UnicodeStorage::Remap(const std::unordered_map<til::CoordType, til::CoordType>& rowMap, const std::optional<til::CoordType> width)
 {
    // Make a temporary map to hold all the new row positioning
    std::unordered_map<key_type, mapped_type> newMap;
@@ -87,7 +87,7 @@ void UnicodeStorage::Remap(const std::unordered_map<SHORT, SHORT>& rowMap, const
        const auto newRowId = mapIter->second;

        // Generate a new coordinate with the same X as the old one, but a new Y value.
-        const auto newCoord = COORD{ oldCoord.X, newRowId };
+        const auto newCoord = til::point{ oldCoord.X, newRowId };

        // Put the adjusted coordinate into the map with the original value.
        newMap.emplace(newCoord, pair.second);
--- a/src/buffer/out/UnicodeStorage.hpp
+++ b/src/buffer/out/UnicodeStorage.hpp
@@ -20,11 +20,11 @@ Author(s):
 #include <til/bit.h>
 #include <til/hash.h>

-// std::unordered_map needs help to know how to hash a COORD
+// std::unordered_map needs help to know how to hash a til::point
 namespace std
 {
    template<>
-    struct hash<COORD>
+    struct hash<til::point>
    {
        // Routine Description:
        // - hashes a coord. coord will be hashed by storing the x and y values consecutively in the lower
@@ -33,9 +33,9 @@ namespace std
        // - coord - the coord to hash
        // Return Value:
        // - the hashed coord
-        constexpr size_t operator()(const COORD& coord) const noexcept
+        constexpr size_t operator()(const til::point coord) const noexcept
        {
-            return til::hash(til::bit_cast<uint32_t>(coord));
+            return til::hash(til::bit_cast<uint64_t>(coord));
        }
    };
 }
@@ -43,7 +43,7 @@ namespace std
 class UnicodeStorage final
 {
 public:
-    using key_type = typename COORD;
+    using key_type = typename til::point;
    using mapped_type = typename std::vector<wchar_t>;

    UnicodeStorage() noexcept;
@@ -54,7 +54,7 @@ public:

    void Erase(const key_type key) noexcept;

-    void Remap(const std::unordered_map<SHORT, SHORT>& rowMap, const std::optional<SHORT> width);
+    void Remap(const std::unordered_map<til::CoordType, til::CoordType>& rowMap, const std::optional<til::CoordType> width);

 private:
    std::unordered_map<key_type, mapped_type> _map;
--- a/src/buffer/out/cursor.cpp
+++ b/src/buffer/out/cursor.cpp
@@ -11,9 +11,25 @@
 // - Constructor to set default properties for Cursor
 // Arguments:
 // - ulSize - The height of the cursor within this buffer
-Cursor::Cursor(const UINT ulSize, TextBuffer& parentBuffer) noexcept :
+Cursor::Cursor(const ULONG ulSize, TextBuffer& parentBuffer) noexcept :
    _parentBuffer{ parentBuffer },
-    _ulSize(ulSize)
+    _fHasMoved(false),
+    _fIsVisible(true),
+    _fIsOn(true),
+    _fIsDouble(false),
+    _fBlinkingAllowed(true),
+    _fDelay(false),
+    _fIsConversionArea(false),
+    _fIsPopupShown(false),
+    _fDelayedEolWrap(false),
+    _fDeferCursorRedraw(false),
+    _fHaveDeferredCursorRedraw(false),
+    _ulSize(ulSize),
+    _cursorType(CursorType::Legacy)
+{
+}
+
+Cursor::~Cursor()
 {
 }

@@ -62,7 +78,7 @@ bool Cursor::GetDelay() const noexcept
    return _fDelay;
 }

-UINT Cursor::GetSize() const noexcept
+ULONG Cursor::GetSize() const noexcept
 {
    return _ulSize;
 }
@@ -117,13 +133,13 @@ void Cursor::SetDelay(const bool fDelay) noexcept
    _fDelay = fDelay;
 }

-void Cursor::SetSize(const UINT ulSize) noexcept
+void Cursor::SetSize(const ULONG ulSize) noexcept
 {
    _ulSize = ulSize;
    _RedrawCursor();
 }

-void Cursor::SetStyle(const UINT ulSize, const CursorType type) noexcept
+void Cursor::SetStyle(const ULONG ulSize, const CursorType type) noexcept
 {
    _ulSize = ulSize;
    _cursorType = type;
@@ -169,7 +185,7 @@ void Cursor::_RedrawCursorAlways() noexcept
 {
    try
    {
-        _parentBuffer.TriggerRedrawCursor(til::unwrap_coord(_cPosition));
+        _parentBuffer.TriggerRedrawCursor(_cPosition);
    }
    CATCH_LOG();
 }
--- a/src/buffer/out/cursor.h
+++ b/src/buffer/out/cursor.h
@@ -25,9 +25,18 @@ class Cursor final
 {
 public:
    // the following values are used to create the textmode cursor.
-    static constexpr UINT CURSOR_SMALL_SIZE = 25; // large enough to be one pixel on a six pixel font
+    static constexpr unsigned int CURSOR_SMALL_SIZE = 25; // large enough to be one pixel on a six pixel font

-    Cursor(UINT ulSize, TextBuffer& parentBuffer) noexcept;
+    Cursor(const ULONG ulSize, TextBuffer& parentBuffer) noexcept;
+
+    ~Cursor();
+
+    // No Copy. It will copy the timer handle. Bad news.
+    Cursor(const Cursor&) = delete;
+    Cursor& operator=(const Cursor&) & = delete;
+
+    Cursor(Cursor&&) = default;
+    Cursor& operator=(Cursor&&) & = delete;

    bool HasMoved() const noexcept;
    bool IsVisible() const noexcept;
@@ -37,7 +46,7 @@ public:
    bool IsConversionArea() const noexcept;
    bool IsPopupShown() const noexcept;
    bool GetDelay() const noexcept;
-    UINT GetSize() const noexcept;
+    ULONG GetSize() const noexcept;
    til::point GetPosition() const noexcept;

    const CursorType GetType() const noexcept;
@@ -46,33 +55,33 @@ public:
    bool IsDeferDrawing() noexcept;
    void EndDeferDrawing() noexcept;

-    void SetHasMoved(bool fHasMoved) noexcept;
-    void SetIsVisible(bool fIsVisible) noexcept;
-    void SetIsOn(bool fIsOn) noexcept;
-    void SetBlinkingAllowed(bool fIsOn) noexcept;
-    void SetIsDouble(bool fIsDouble) noexcept;
-    void SetIsConversionArea(bool fIsConversionArea) noexcept;
-    void SetIsPopupShown(bool fIsPopupShown) noexcept;
-    void SetDelay(bool fDelay) noexcept;
-    void SetSize(UINT ulSize) noexcept;
-    void SetStyle(UINT ulSize, CursorType type) noexcept;
+    void SetHasMoved(const bool fHasMoved) noexcept;
+    void SetIsVisible(const bool fIsVisible) noexcept;
+    void SetIsOn(const bool fIsOn) noexcept;
+    void SetBlinkingAllowed(const bool fIsOn) noexcept;
+    void SetIsDouble(const bool fIsDouble) noexcept;
+    void SetIsConversionArea(const bool fIsConversionArea) noexcept;
+    void SetIsPopupShown(const bool fIsPopupShown) noexcept;
+    void SetDelay(const bool fDelay) noexcept;
+    void SetSize(const ULONG ulSize) noexcept;
+    void SetStyle(const ULONG ulSize, const CursorType type) noexcept;

-    void SetPosition(til::point cPosition) noexcept;
-    void SetXPosition(til::CoordType NewX) noexcept;
-    void SetYPosition(til::CoordType NewY) noexcept;
-    void IncrementXPosition(til::CoordType DeltaX) noexcept;
-    void IncrementYPosition(til::CoordType DeltaY) noexcept;
-    void DecrementXPosition(til::CoordType DeltaX) noexcept;
-    void DecrementYPosition(til::CoordType DeltaY) noexcept;
+    void SetPosition(const til::point cPosition) noexcept;
+    void SetXPosition(const til::CoordType NewX) noexcept;
+    void SetYPosition(const til::CoordType NewY) noexcept;
+    void IncrementXPosition(const til::CoordType DeltaX) noexcept;
+    void IncrementYPosition(const til::CoordType DeltaY) noexcept;
+    void DecrementXPosition(const til::CoordType DeltaX) noexcept;
+    void DecrementYPosition(const til::CoordType DeltaY) noexcept;

    void CopyProperties(const Cursor& OtherCursor) noexcept;

-    void DelayEOLWrap(til::point coordDelayedAt) noexcept;
+    void DelayEOLWrap(const til::point coordDelayedAt) noexcept;
    void ResetDelayEOLWrap() noexcept;
    til::point GetDelayedAtPosition() const noexcept;
    bool IsDelayedEOLWrap() const noexcept;

-    void SetType(CursorType type) noexcept;
+    void SetType(const CursorType type) noexcept;

 private:
    TextBuffer& _parentBuffer;
@@ -83,25 +92,25 @@ private:

    til::point _cPosition; // current position on screen (in screen buffer coords).

-    bool _fHasMoved = false;
-    bool _fIsVisible = true; // whether cursor is visible (set only through the API)
-    bool _fIsOn = true; // whether blinking cursor is on or not
-    bool _fIsDouble = false; // whether the cursor size should be doubled
-    bool _fBlinkingAllowed = true; //Whether or not the cursor is allowed to blink at all. only set through VT (^[[?12h/l)
-    bool _fDelay = false; // don't blink scursor on next timer message
-    bool _fIsConversionArea = false; // is attached to a conversion area so it doesn't actually need to display the cursor.
-    bool _fIsPopupShown = false; // if a popup is being shown, turn off, stop blinking.
+    bool _fHasMoved;
+    bool _fIsVisible; // whether cursor is visible (set only through the API)
+    bool _fIsOn; // whether blinking cursor is on or not
+    bool _fIsDouble; // whether the cursor size should be doubled
+    bool _fBlinkingAllowed; //Whether or not the cursor is allowed to blink at all. only set through VT (^[[?12h/l)
+    bool _fDelay; // don't blink scursor on next timer message
+    bool _fIsConversionArea; // is attached to a conversion area so it doesn't actually need to display the cursor.
+    bool _fIsPopupShown; // if a popup is being shown, turn off, stop blinking.

-    bool _fDelayedEolWrap = false; // don't wrap at EOL till the next char comes in.
+    bool _fDelayedEolWrap; // don't wrap at EOL till the next char comes in.
    til::point _coordDelayedAt; // coordinate the EOL wrap was delayed at.

-    bool _fDeferCursorRedraw = false; // whether we should defer redrawing the cursor or not
-    bool _fHaveDeferredCursorRedraw = false; // have we been asked to redraw the cursor while it was being deferred?
+    bool _fDeferCursorRedraw; // whether we should defer redrawing the cursor or not
+    bool _fHaveDeferredCursorRedraw; // have we been asked to redraw the cursor while it was being deferred?

-    UINT _ulSize = CURSOR_SMALL_SIZE;
+    ULONG _ulSize;

    void _RedrawCursor() noexcept;
    void _RedrawCursorAlways() noexcept;

-    CursorType _cursorType = CursorType::Legacy;
+    CursorType _cursorType;
 };
--- a/src/buffer/out/precomp.h
+++ b/src/buffer/out/precomp.h
@@ -35,7 +35,6 @@ Abstract:
 #include <intsafe.h>

 // private dependencies
-#include "../inc/operators.hpp"
 #include "../inc/unicode.hpp"
 #pragma warning(pop)

--- a/src/buffer/out/search.cpp
+++ b/src/buffer/out/search.cpp
@@ -50,7 +50,7 @@ Search::Search(IUiaData& uiaData,
               const std::wstring& str,
               const Direction direction,
               const Sensitivity sensitivity,
-               const COORD anchor) :
+               const til::point anchor) :
    _direction(direction),
    _sensitivity(sensitivity),
    _needle(s_CreateNeedleFromString(str)),
@@ -124,7 +124,7 @@ void Search::Color(const TextAttribute attr) const
 // been called and returned true.
 // Return Value:
 // - pair containing [start, end] coord positions of text found by search
-std::pair<COORD, COORD> Search::GetFoundLocation() const noexcept
+std::pair<til::point, til::point> Search::GetFoundLocation() const noexcept
 {
    return { _coordSelStart, _coordSelEnd };
 }
@@ -140,10 +140,10 @@ std::pair<COORD, COORD> Search::GetFoundLocation() const noexcept
 // - direction - The intended direction of the search
 // Return Value:
 // - Coordinate to start the search from.
-COORD Search::s_GetInitialAnchor(IUiaData& uiaData, const Direction direction)
+til::point Search::s_GetInitialAnchor(const IUiaData& uiaData, const Direction direction)
 {
    const auto& textBuffer = uiaData.GetTextBuffer();
-    const COORD textBufferEndPosition = uiaData.GetTextBufferEndPosition();
+    const auto textBufferEndPosition = uiaData.GetTextBufferEndPosition();
    if (uiaData.IsSelectionActive())
    {
        // Convert the screen position of the selection anchor into an equivalent
@@ -187,12 +187,12 @@ COORD Search::s_GetInitialAnchor(IUiaData& uiaData, const Direction direction)
 // - end - If we found it, this is filled with the coordinate of the last character of the needle.
 // Return Value:
 // - True if we found it. False if not.
-bool Search::_FindNeedleInHaystackAt(const COORD pos, COORD& start, COORD& end) const
+bool Search::_FindNeedleInHaystackAt(const til::point pos, til::point& start, til::point& end) const
 {
-    start = { 0 };
-    end = { 0 };
+    start = {};
+    end = {};

-    COORD bufferPos = pos;
+    auto bufferPos = pos;

    for (const auto& needleCell : _needle)
    {
@@ -269,7 +269,7 @@ wchar_t Search::_ApplySensitivity(const wchar_t wch) const noexcept
 // - Helper to increment a coordinate in respect to the associated screen buffer
 // Arguments
 // - coord - Updated by function to increment one position (will wrap X and Y direction)
-void Search::_IncrementCoord(COORD& coord) const noexcept
+void Search::_IncrementCoord(til::point& coord) const noexcept
 {
    _uiaData.GetTextBuffer().GetSize().IncrementInBoundsCircular(coord);
 }
@@ -278,7 +278,7 @@ void Search::_IncrementCoord(COORD& coord) const noexcept
 // - Helper to decrement a coordinate in respect to the associated screen buffer
 // Arguments
 // - coord - Updated by function to decrement one position (will wrap X and Y direction)
-void Search::_DecrementCoord(COORD& coord) const noexcept
+void Search::_DecrementCoord(til::point& coord) const noexcept
 {
    _uiaData.GetTextBuffer().GetSize().DecrementInBoundsCircular(coord);
 }
@@ -307,14 +307,14 @@ void Search::_UpdateNextPosition()
    // We put the next position to:
    // Forward: (0, 0)
    // Backward: the position of the end of the text buffer
-    const COORD bufferEndPosition = _uiaData.GetTextBufferEndPosition();
+    const auto bufferEndPosition = _uiaData.GetTextBufferEndPosition();

    if (_coordNext.Y > bufferEndPosition.Y ||
        (_coordNext.Y == bufferEndPosition.Y && _coordNext.X > bufferEndPosition.X))
    {
        if (_direction == Direction::Forward)
        {
-            _coordNext = { 0 };
+            _coordNext = {};
        }
        else
        {
--- a/src/buffer/out/search.h
+++ b/src/buffer/out/search.h
@@ -49,33 +49,33 @@ public:
           const std::wstring& str,
           const Direction dir,
           const Sensitivity sensitivity,
-           const COORD anchor);
+           const til::point anchor);

    bool FindNext();
    void Select() const;
    void Color(const TextAttribute attr) const;

-    std::pair<COORD, COORD> GetFoundLocation() const noexcept;
+    std::pair<til::point, til::point> GetFoundLocation() const noexcept;

 private:
    wchar_t _ApplySensitivity(const wchar_t wch) const noexcept;
-    bool _FindNeedleInHaystackAt(const COORD pos, COORD& start, COORD& end) const;
+    bool _FindNeedleInHaystackAt(const til::point pos, til::point& start, til::point& end) const;
    bool _CompareChars(const std::wstring_view one, const std::wstring_view two) const noexcept;
    void _UpdateNextPosition();

-    void _IncrementCoord(COORD& coord) const noexcept;
-    void _DecrementCoord(COORD& coord) const noexcept;
+    void _IncrementCoord(til::point& coord) const noexcept;
+    void _DecrementCoord(til::point& coord) const noexcept;

-    static COORD s_GetInitialAnchor(Microsoft::Console::Types::IUiaData& uiaData, const Direction dir);
+    static til::point s_GetInitialAnchor(const Microsoft::Console::Types::IUiaData& uiaData, const Direction dir);

    static std::vector<std::vector<wchar_t>> s_CreateNeedleFromString(const std::wstring& wstr);

    bool _reachedEnd = false;
-    COORD _coordNext = { 0 };
-    COORD _coordSelStart = { 0 };
-    COORD _coordSelEnd = { 0 };
+    til::point _coordNext;
+    til::point _coordSelStart;
+    til::point _coordSelEnd;

-    const COORD _coordAnchor;
+    const til::point _coordAnchor;
    const std::vector<std::vector<wchar_t>> _needle;
    const Direction _direction;
    const Sensitivity _sensitivity;
--- a/src/buffer/out/textBuffer.cpp
+++ b/src/buffer/out/textBuffer.cpp
--- a/src/buffer/out/textBuffer.hpp
+++ b/src/buffer/out/textBuffer.hpp
@@ -68,7 +68,7 @@ namespace Microsoft::Console::Render
 class TextBuffer final
 {
 public:
-    TextBuffer(const COORD screenBufferSize,
+    TextBuffer(const til::size screenBufferSize,
               const TextAttribute defaultAttributes,
               const UINT cursorSize,
               const bool isActiveBuffer,
@@ -79,27 +79,27 @@ public:
    void CopyProperties(const TextBuffer& OtherBuffer) noexcept;

    // row manipulation
-    const ROW& GetRowByOffset(const size_t index) const;
-    ROW& GetRowByOffset(const size_t index);
+    const ROW& GetRowByOffset(const til::CoordType index) const noexcept;
+    ROW& GetRowByOffset(const til::CoordType index) noexcept;

-    TextBufferCellIterator GetCellDataAt(const COORD at) const;
-    TextBufferCellIterator GetCellLineDataAt(const COORD at) const;
-    TextBufferCellIterator GetCellDataAt(const COORD at, const Microsoft::Console::Types::Viewport limit) const;
-    TextBufferTextIterator GetTextDataAt(const COORD at) const;
-    TextBufferTextIterator GetTextLineDataAt(const COORD at) const;
-    TextBufferTextIterator GetTextDataAt(const COORD at, const Microsoft::Console::Types::Viewport limit) const;
+    TextBufferCellIterator GetCellDataAt(const til::point at) const;
+    TextBufferCellIterator GetCellLineDataAt(const til::point at) const;
+    TextBufferCellIterator GetCellDataAt(const til::point at, const Microsoft::Console::Types::Viewport limit) const;
+    TextBufferTextIterator GetTextDataAt(const til::point at) const;
+    TextBufferTextIterator GetTextLineDataAt(const til::point at) const;
+    TextBufferTextIterator GetTextDataAt(const til::point at, const Microsoft::Console::Types::Viewport limit) const;

    // Text insertion functions
    OutputCellIterator Write(const OutputCellIterator givenIt);

    OutputCellIterator Write(const OutputCellIterator givenIt,
-                             const COORD target,
+                             const til::point target,
                             const std::optional<bool> wrap = true);

    OutputCellIterator WriteLine(const OutputCellIterator givenIt,
-                                 const COORD target,
+                                 const til::point target,
                                 const std::optional<bool> setWrap = std::nullopt,
-                                 const std::optional<size_t> limitRight = std::nullopt);
+                                 const std::optional<til::CoordType> limitRight = std::nullopt);

    bool InsertCharacter(const wchar_t wch, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
    bool InsertCharacter(const std::wstring_view chars, const DbcsAttribute dbcsAttribute, const TextAttribute attr);
@@ -109,36 +109,36 @@ public:
    // Scroll needs access to this to quickly rotate around the buffer.
    bool IncrementCircularBuffer(const bool inVtMode = false);

-    COORD GetLastNonSpaceCharacter(std::optional<const Microsoft::Console::Types::Viewport> viewOptional = std::nullopt) const;
+    til::point GetLastNonSpaceCharacter(std::optional<const Microsoft::Console::Types::Viewport> viewOptional = std::nullopt) const;

    Cursor& GetCursor() noexcept;
    const Cursor& GetCursor() const noexcept;

-    const SHORT GetFirstRowIndex() const noexcept;
+    const til::CoordType GetFirstRowIndex() const noexcept;

    const Microsoft::Console::Types::Viewport GetSize() const noexcept;

-    void ScrollRows(const SHORT firstRow, const SHORT size, const SHORT delta);
+    void ScrollRows(const til::CoordType firstRow, const til::CoordType size, const til::CoordType delta);

-    UINT TotalRowCount() const noexcept;
+    til::CoordType TotalRowCount() const noexcept;

    [[nodiscard]] TextAttribute GetCurrentAttributes() const noexcept;

    void SetCurrentAttributes(const TextAttribute& currentAttributes) noexcept;

    void SetCurrentLineRendition(const LineRendition lineRendition);
-    void ResetLineRenditionRange(const size_t startRow, const size_t endRow);
-    LineRendition GetLineRendition(const size_t row) const;
-    bool IsDoubleWidthLine(const size_t row) const;
+    void ResetLineRenditionRange(const til::CoordType startRow, const til::CoordType endRow) noexcept;
+    LineRendition GetLineRendition(const til::CoordType row) const noexcept;
+    bool IsDoubleWidthLine(const til::CoordType row) const noexcept;

-    SHORT GetLineWidth(const size_t row) const;
-    COORD ClampPositionWithinLine(const COORD position) const;
-    COORD ScreenToBufferPosition(const COORD position) const;
-    COORD BufferToScreenPosition(const COORD position) const;
+    til::CoordType GetLineWidth(const til::CoordType row) const noexcept;
+    til::point ClampPositionWithinLine(const til::point position) const noexcept;
+    til::point ScreenToBufferPosition(const til::point position) const noexcept;
+    til::point BufferToScreenPosition(const til::point position) const noexcept;

    void Reset();

-    [[nodiscard]] HRESULT ResizeTraditional(const COORD newSize) noexcept;
+    [[nodiscard]] HRESULT ResizeTraditional(const til::size newSize) noexcept;

    const UnicodeStorage& GetUnicodeStorage() const noexcept;
    UnicodeStorage& GetUnicodeStorage() noexcept;
@@ -149,23 +149,23 @@ public:
    Microsoft::Console::Render::Renderer& GetRenderer() noexcept;

    void TriggerRedraw(const Microsoft::Console::Types::Viewport& viewport);
-    void TriggerRedrawCursor(const COORD position);
+    void TriggerRedrawCursor(const til::point position);
    void TriggerRedrawAll();
    void TriggerScroll();
-    void TriggerScroll(const COORD delta);
+    void TriggerScroll(const til::point delta);
    void TriggerNewTextNotification(const std::wstring_view newText);

-    const COORD GetWordStart(const COORD target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
-    const COORD GetWordEnd(const COORD target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
-    bool MoveToNextWord(COORD& pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional = std::nullopt) const;
-    bool MoveToPreviousWord(COORD& pos, const std::wstring_view wordDelimiters) const;
+    til::point GetWordStart(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
+    til::point GetWordEnd(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
+    bool MoveToNextWord(til::point& pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional = std::nullopt) const;
+    bool MoveToPreviousWord(til::point& pos, const std::wstring_view wordDelimiters) const;

-    const til::point GetGlyphStart(const til::point pos, std::optional<til::point> limitOptional = std::nullopt) const;
-    const til::point GetGlyphEnd(const til::point pos, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
+    til::point GetGlyphStart(const til::point pos, std::optional<til::point> limitOptional = std::nullopt) const;
+    til::point GetGlyphEnd(const til::point pos, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
    bool MoveToNextGlyph(til::point& pos, bool allowBottomExclusive = false, std::optional<til::point> limitOptional = std::nullopt) const;
    bool MoveToPreviousGlyph(til::point& pos, std::optional<til::point> limitOptional = std::nullopt) const;

-    const std::vector<SMALL_RECT> GetTextRects(COORD start, COORD end, bool blockSelection, bool bufferCoordinates) const;
+    const std::vector<til::inclusive_rect> GetTextRects(til::point start, til::point end, bool blockSelection, bool bufferCoordinates) const;

    void AddHyperlinkToMap(std::wstring_view uri, uint16_t id);
    std::wstring GetHyperlinkUriFromId(uint16_t id) const;
@@ -184,7 +184,7 @@ public:

    const TextAndColor GetText(const bool includeCRLF,
                               const bool trimTrailingWhitespace,
-                               const std::vector<SMALL_RECT>& textRects,
+                               const std::vector<til::inclusive_rect>& textRects,
                               std::function<std::pair<COLORREF, COLORREF>(const TextAttribute&)> GetAttributeColors = nullptr,
                               const bool formatWrappedRows = false) const;

@@ -200,8 +200,8 @@ public:

    struct PositionInformation
    {
-        short mutableViewportTop{ 0 };
-        short visibleViewportTop{ 0 };
+        til::CoordType mutableViewportTop{ 0 };
+        til::CoordType visibleViewportTop{ 0 };
    };

    static HRESULT Reflow(TextBuffer& oldBuffer,
@@ -212,7 +212,7 @@ public:
    const size_t AddPatternRecognizer(const std::wstring_view regexString);
    void ClearPatternRecognizers() noexcept;
    void CopyPatterns(const TextBuffer& OtherBuffer);
-    interval_tree::IntervalTree<til::point, size_t> GetPatterns(const size_t firstRow, const size_t lastRow) const;
+    interval_tree::IntervalTree<til::point, size_t> GetPatterns(const til::CoordType firstRow, const til::CoordType lastRow) const;

 private:
    void _UpdateSize();
@@ -220,7 +220,7 @@ private:
    std::vector<ROW> _storage;
    Cursor _cursor;

-    SHORT _firstRow; // indexes top row (not necessarily 0)
+    til::CoordType _firstRow; // indexes top row (not necessarily 0)

    TextAttribute _currentAttributes;

@@ -234,29 +234,29 @@ private:
    std::unordered_map<std::wstring, uint16_t> _hyperlinkCustomIdMap;
    uint16_t _currentHyperlinkId;

-    void _RefreshRowIDs(std::optional<SHORT> newRowWidth);
+    void _RefreshRowIDs(std::optional<til::CoordType> newRowWidth);

-    void _SetFirstRowIndex(const SHORT FirstRowIndex) noexcept;
+    void _SetFirstRowIndex(const til::CoordType FirstRowIndex) noexcept;

-    COORD _GetPreviousFromCursor() const;
+    til::point _GetPreviousFromCursor() const noexcept;

-    void _SetWrapOnCurrentRow();
-    void _AdjustWrapOnCurrentRow(const bool fSet);
+    void _SetWrapOnCurrentRow() noexcept;
+    void _AdjustWrapOnCurrentRow(const bool fSet) noexcept;

    // Assist with maintaining proper buffer state for Double Byte character sequences
    bool _PrepareForDoubleByteSequence(const DbcsAttribute dbcsAttribute);
    bool _AssertValidDoubleByteSequence(const DbcsAttribute dbcsAttribute);

-    ROW& _GetFirstRow();
+    ROW& _GetFirstRow() noexcept;
    ROW& _GetPrevRowNoWrap(const ROW& row);

-    void _ExpandTextRow(SMALL_RECT& selectionRow) const;
+    void _ExpandTextRow(til::inclusive_rect& selectionRow) const;

-    const DelimiterClass _GetDelimiterClassAt(const COORD pos, const std::wstring_view wordDelimiters) const;
-    const COORD _GetWordStartForAccessibility(const COORD target, const std::wstring_view wordDelimiters) const;
-    const COORD _GetWordStartForSelection(const COORD target, const std::wstring_view wordDelimiters) const;
-    const COORD _GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters, const COORD limit) const;
-    const COORD _GetWordEndForSelection(const COORD target, const std::wstring_view wordDelimiters) const;
+    DelimiterClass _GetDelimiterClassAt(const til::point pos, const std::wstring_view wordDelimiters) const;
+    til::point _GetWordStartForAccessibility(const til::point target, const std::wstring_view wordDelimiters) const;
+    til::point _GetWordStartForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
+    til::point _GetWordEndForAccessibility(const til::point target, const std::wstring_view wordDelimiters, const til::point limit) const;
+    til::point _GetWordEndForSelection(const til::point target, const std::wstring_view wordDelimiters) const;

    void _PruneHyperlinks();

--- a/src/buffer/out/textBufferCellIterator.cpp
+++ b/src/buffer/out/textBufferCellIterator.cpp
@@ -19,7 +19,7 @@ using namespace Microsoft::Console::Types;
 // Arguments:
 // - buffer - Text buffer to seek through
 // - pos - Starting position to retrieve text data from (within screen buffer bounds)
-TextBufferCellIterator::TextBufferCellIterator(const TextBuffer& buffer, COORD pos) :
+TextBufferCellIterator::TextBufferCellIterator(const TextBuffer& buffer, til::point pos) :
    TextBufferCellIterator(buffer, pos, buffer.GetSize())
 {
 }
@@ -30,7 +30,7 @@ TextBufferCellIterator::TextBufferCellIterator(const TextBuffer& buffer, COORD p
 // - buffer - Pointer to screen buffer to seek through
 // - pos - Starting position to retrieve text data from (within screen buffer bounds)
 // - limits - Viewport limits to restrict the iterator within the buffer bounds (smaller than the buffer itself)
-TextBufferCellIterator::TextBufferCellIterator(const TextBuffer& buffer, COORD pos, const Viewport limits) :
+TextBufferCellIterator::TextBufferCellIterator(const TextBuffer& buffer, til::point pos, const Viewport limits) :
    _buffer(buffer),
    _pos(pos),
    _pRow(s_GetRow(buffer, pos)),
@@ -96,7 +96,7 @@ TextBufferCellIterator& TextBufferCellIterator::operator+=(const ptrdiff_t& move
 {
    // Note that this method is called intensively when the terminal is under heavy load.
    // We need to aggressively optimize it, comparing to the -= operator.
-    ptrdiff_t move = movement;
+    auto move = movement;
    if (move < 0)
    {
        // Early branching to leave the rare case to -= operator.
@@ -126,7 +126,7 @@ TextBufferCellIterator& TextBufferCellIterator::operator+=(const ptrdiff_t& move
    const auto oldX = _pos.X;
    const auto oldY = _pos.Y;

-    // Under MSVC writing the individual members of a COORD generates worse assembly
+    // Under MSVC writing the individual members of a til::point generates worse assembly
    // compared to having them be local variables. This causes a performance impact.
    auto newX = oldX;
    auto newY = oldY;
@@ -165,7 +165,7 @@ TextBufferCellIterator& TextBufferCellIterator::operator+=(const ptrdiff_t& move
        _attrIter += diff;
        _view.UpdateTextAttribute(*_attrIter);

-        const CharRow& charRow = _pRow->GetCharRow();
+        const auto& charRow = _pRow->GetCharRow();
        _view.UpdateText(charRow.GlyphAt(newX));
        _view.UpdateDbcsAttribute(charRow.DbcsAttrAt(newX));
        _pos.X = newX;
@@ -191,7 +191,7 @@ TextBufferCellIterator& TextBufferCellIterator::operator+=(const ptrdiff_t& move
 // - Reference to self after movement.
 TextBufferCellIterator& TextBufferCellIterator::operator-=(const ptrdiff_t& movement)
 {
-    ptrdiff_t move = movement;
+    auto move = movement;
    if (move < 0)
    {
        return (*this) += (-move);
@@ -233,7 +233,7 @@ TextBufferCellIterator& TextBufferCellIterator::operator--()
 // - Value with previous position prior to movement.
 TextBufferCellIterator TextBufferCellIterator::operator++(int)
 {
-    auto temp(*this);
+    auto temp = *this;
    operator++();
    return temp;
 }
@@ -244,7 +244,7 @@ TextBufferCellIterator TextBufferCellIterator::operator++(int)
 // - Value with previous position prior to movement.
 TextBufferCellIterator TextBufferCellIterator::operator--(int)
 {
-    auto temp(*this);
+    auto temp = *this;
    operator--();
    return temp;
 }
@@ -257,7 +257,7 @@ TextBufferCellIterator TextBufferCellIterator::operator--(int)
 // - Value with previous position prior to movement.
 TextBufferCellIterator TextBufferCellIterator::operator+(const ptrdiff_t& movement)
 {
-    auto temp(*this);
+    auto temp = *this;
    temp += movement;
    return temp;
 }
@@ -270,7 +270,7 @@ TextBufferCellIterator TextBufferCellIterator::operator+(const ptrdiff_t& moveme
 // - Value with previous position prior to movement.
 TextBufferCellIterator TextBufferCellIterator::operator-(const ptrdiff_t& movement)
 {
-    auto temp(*this);
+    auto temp = *this;
    temp -= movement;
    return temp;
 }
@@ -289,7 +289,7 @@ ptrdiff_t TextBufferCellIterator::operator-(const TextBufferCellIterator& it)
 // - Sets the coordinate position that this iterator will inspect within the text buffer on dereference.
 // Arguments:
 // - newPos - The new coordinate position.
-void TextBufferCellIterator::_SetPos(const COORD newPos)
+void TextBufferCellIterator::_SetPos(const til::point newPos)
 {
    if (newPos.Y != _pos.Y)
    {
@@ -317,7 +317,7 @@ void TextBufferCellIterator::_SetPos(const COORD newPos)
 // - pos - Position inside screen buffer bounds to retrieve row
 // Return Value:
 // - Pointer to the underlying CharRow structure
-const ROW* TextBufferCellIterator::s_GetRow(const TextBuffer& buffer, const COORD pos)
+const ROW* TextBufferCellIterator::s_GetRow(const TextBuffer& buffer, const til::point pos) noexcept
 {
    return &buffer.GetRowByOffset(pos.Y);
 }
@@ -354,7 +354,7 @@ const OutputCellView* TextBufferCellIterator::operator->() const noexcept
    return &_view;
 }

-COORD TextBufferCellIterator::Pos() const noexcept
+til::point TextBufferCellIterator::Pos() const noexcept
 {
    return _pos;
 }
--- a/src/buffer/out/textBufferCellIterator.hpp
+++ b/src/buffer/out/textBufferCellIterator.hpp
@@ -25,8 +25,8 @@ class TextBuffer;
 class TextBufferCellIterator
 {
 public:
-    TextBufferCellIterator(const TextBuffer& buffer, COORD pos);
-    TextBufferCellIterator(const TextBuffer& buffer, COORD pos, const Microsoft::Console::Types::Viewport limits);
+    TextBufferCellIterator(const TextBuffer& buffer, til::point pos);
+    TextBufferCellIterator(const TextBuffer& buffer, til::point pos, const Microsoft::Console::Types::Viewport limits);

    operator bool() const noexcept;

@@ -47,12 +47,12 @@ public:
    const OutputCellView& operator*() const noexcept;
    const OutputCellView* operator->() const noexcept;

-    COORD Pos() const noexcept;
+    til::point Pos() const noexcept;

 protected:
-    void _SetPos(const COORD newPos);
+    void _SetPos(const til::point newPos);
    void _GenerateView();
-    static const ROW* s_GetRow(const TextBuffer& buffer, const COORD pos);
+    static const ROW* s_GetRow(const TextBuffer& buffer, const til::point pos) noexcept;

    OutputCellView _view;

@@ -61,7 +61,7 @@ protected:
    const TextBuffer& _buffer;
    const Microsoft::Console::Types::Viewport _bounds;
    bool _exceeded;
-    COORD _pos;
+    til::point _pos;

 #if UNIT_TESTING
    friend class TextBufferIteratorTests;
--- a/src/buffer/out/ut_textbuffer/ReflowTests.cpp
+++ b/src/buffer/out/ut_textbuffer/ReflowTests.cpp
@@ -36,9 +36,9 @@ namespace

    struct TestBuffer
    {
-        COORD size;
+        til::size size;
        std::vector<TestRow> rows;
-        COORD cursor;
+        til::point cursor;
    };

    struct TestCase
@@ -737,7 +737,7 @@ class ReflowTests
    {
        auto buffer = std::make_unique<TextBuffer>(testBuffer.size, TextAttribute{ 0x7 }, 0, false, renderer);

-        size_t i{};
+        til::CoordType i{};
        for (const auto& testRow : testBuffer.rows)
        {
            auto& row{ buffer->GetRowByOffset(i) };
@@ -745,7 +745,7 @@ class ReflowTests
            auto& charRow{ row.GetCharRow() };
            row.SetWrapForced(testRow.wrap);

-            size_t j{};
+            til::CoordType j{};
            for (auto it{ charRow.begin() }; it != charRow.end(); ++it)
            {
                // Yes, we're about to manually create a buffer. It is unpleasant.
@@ -771,7 +771,7 @@ class ReflowTests
        return buffer;
    }

-    static std::unique_ptr<TextBuffer> _textBufferByReflowingTextBuffer(TextBuffer& originalBuffer, const COORD newSize)
+    static std::unique_ptr<TextBuffer> _textBufferByReflowingTextBuffer(TextBuffer& originalBuffer, const til::size newSize)
    {
        auto buffer = std::make_unique<TextBuffer>(newSize, TextAttribute{ 0x7 }, 0, false, renderer);
        TextBuffer::Reflow(originalBuffer, *buffer, std::nullopt, std::nullopt);
@@ -783,7 +783,7 @@ class ReflowTests
        VERIFY_ARE_EQUAL(testBuffer.cursor, buffer.GetCursor().GetPosition());
        VERIFY_ARE_EQUAL(testBuffer.size, buffer.GetSize().Dimensions());

-        size_t i{};
+        til::CoordType i{};
        for (const auto& testRow : testBuffer.rows)
        {
            NoThrowString indexString;
@@ -794,7 +794,7 @@ class ReflowTests
            indexString.Format(L"[Row %d]", i);
            VERIFY_ARE_EQUAL(testRow.wrap, row.WasWrapForced(), indexString);

-            size_t j{};
+            til::CoordType j{};
            for (auto it{ charRow.begin() }; it != charRow.end(); ++it)
            {
                indexString.Format(L"[Cell %d, %d; Text line index %d]", it - charRow.begin(), i, j);
--- a/src/buffer/out/ut_textbuffer/TextAttributeTests.cpp
+++ b/src/buffer/out/ut_textbuffer/TextAttributeTests.cpp
@@ -45,7 +45,7 @@ void TextAttributeTests::TestRoundtripLegacy()
    WORD expectedLegacy = FOREGROUND_BLUE | BACKGROUND_RED;
    WORD bgOnly = expectedLegacy & BG_ATTRS;
    WORD bgShifted = bgOnly >> 4;
-    BYTE bgByte = (BYTE)(bgShifted);
+    auto bgByte = (BYTE)(bgShifted);

    VERIFY_ARE_EQUAL(FOREGROUND_RED, bgByte);

@@ -65,9 +65,9 @@ void TextAttributeTests::TestRoundtripMetaBits()
        COMMON_LVB_UNDERSCORE
    };

-    for (int i = 0; i < ARRAYSIZE(metaFlags); ++i)
+    for (auto i = 0; i < ARRAYSIZE(metaFlags); ++i)
    {
-        WORD flag = metaFlags[i];
+        auto flag = metaFlags[i];
        WORD expectedLegacy = FOREGROUND_BLUE | BACKGROUND_RED | flag;
        WORD metaOnly = expectedLegacy & META_ATTRS;
        VERIFY_ARE_EQUAL(flag, metaOnly);
@@ -114,9 +114,9 @@ void TextAttributeTests::TestRoundtripExhaustive()
 void TextAttributeTests::TestTextAttributeColorGetters()
 {
    const auto& colorTable = _renderSettings.GetColorTable();
-    const COLORREF red = RGB(255, 0, 0);
-    const COLORREF faintRed = RGB(127, 0, 0);
-    const COLORREF green = RGB(0, 255, 0);
+    const auto red = RGB(255, 0, 0);
+    const auto faintRed = RGB(127, 0, 0);
+    const auto green = RGB(0, 255, 0);
    TextAttribute attr(red, green);

    // verify that calculated foreground/background are the same as the direct
@@ -178,8 +178,8 @@ void TextAttributeTests::TestTextAttributeColorGetters()
 void TextAttributeTests::TestReverseDefaultColors()
 {
    const auto& colorTable = _renderSettings.GetColorTable();
-    const COLORREF red = RGB(255, 0, 0);
-    const COLORREF green = RGB(0, 255, 0);
+    const auto red = RGB(255, 0, 0);
+    const auto green = RGB(0, 255, 0);
    TextAttribute attr{};

    // verify that calculated foreground/background are the same as the direct
@@ -260,9 +260,9 @@ void TextAttributeTests::TestRoundtripDefaultColors()
 void TextAttributeTests::TestIntenseAsBright()
 {
    const auto& colorTable = _renderSettings.GetColorTable();
-    const COLORREF darkBlack = til::at(colorTable, 0);
-    const COLORREF brightBlack = til::at(colorTable, 8);
-    const COLORREF darkGreen = til::at(colorTable, 2);
+    const auto darkBlack = til::at(colorTable, 0);
+    const auto brightBlack = til::at(colorTable, 8);
+    const auto darkGreen = til::at(colorTable, 2);

    TextAttribute attr{};

--- a/src/buffer/out/ut_textbuffer/TextColorTests.cpp
+++ b/src/buffer/out/ut_textbuffer/TextColorTests.cpp
@@ -118,7 +118,7 @@ void TextColorTests::TestBrightIndexColor()

 void TextColorTests::TestRgbColor()
 {
-    COLORREF myColor = RGB(7, 8, 9);
+    auto myColor = RGB(7, 8, 9);
    TextColor rgbColor(myColor);

    VERIFY_IS_FALSE(rgbColor.IsDefault());
@@ -140,7 +140,7 @@ void TextColorTests::TestRgbColor()

 void TextColorTests::TestChangeColor()
 {
-    COLORREF myColor = RGB(7, 8, 9);
+    auto myColor = RGB(7, 8, 9);
    TextColor rgbColor(myColor);

    VERIFY_IS_FALSE(rgbColor.IsDefault());
--- a/src/buffer/out/ut_textbuffer/UnicodeStorageTests.cpp
+++ b/src/buffer/out/ut_textbuffer/UnicodeStorageTests.cpp
@@ -18,7 +18,7 @@ class UnicodeStorageTests
    TEST_METHOD(CanOverwriteEmoji)
    {
        UnicodeStorage storage;
-        const COORD coord{ 1, 3 };
+        const til::point coord{ 1, 3 };
        const std::vector<wchar_t> newMoon{ 0xD83C, 0xDF11 };
        const std::vector<wchar_t> fullMoon{ 0xD83C, 0xDF15 };

@@ -28,7 +28,7 @@ class UnicodeStorageTests
        // verify it was stored
        auto findIt = storage._map.find(coord);
        VERIFY_ARE_NOT_EQUAL(findIt, storage._map.end());
-        const std::vector<wchar_t>& newMoonGlyph = findIt->second;
+        const auto& newMoonGlyph = findIt->second;
        VERIFY_ARE_EQUAL(newMoonGlyph.size(), newMoon.size());
        for (size_t i = 0; i < newMoon.size(); ++i)
        {
@@ -41,7 +41,7 @@ class UnicodeStorageTests
        // verify the glyph was overwritten
        findIt = storage._map.find(coord);
        VERIFY_ARE_NOT_EQUAL(findIt, storage._map.end());
-        const std::vector<wchar_t>& fullMoonGlyph = findIt->second;
+        const auto& fullMoonGlyph = findIt->second;
        VERIFY_ARE_EQUAL(fullMoonGlyph.size(), fullMoon.size());
        for (size_t i = 0; i < fullMoon.size(); ++i)
        {
--- a/src/buffer/out/ut_textbuffer/precomp.h
+++ b/src/buffer/out/ut_textbuffer/precomp.h
@@ -37,7 +37,6 @@ Abstract:

 // private dependencies
 #include "../host/conddkrefs.h"
-#include "../inc/operators.hpp"
 #include "../inc/unicode.hpp"
 #pragma warning(pop)

--- a/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest
@@ -100,6 +100,7 @@
                <com:ProxyStub Id="DEC4804D-56D1-4F73-9FBE-6828E7C85C56" DisplayName="OpenConsoleHandoffProxy" Path="OpenConsoleProxy.dll"/>
                <com:Interface Id="E686C757-9A35-4A1C-B3CE-0BCC8B5C69F4" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/>
                <com:Interface Id="59D55CCE-FC8A-48B4-ACE8-0A9286C6557F" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/>
+                <com:Interface Id="746E6BC0-AB05-4E38-AB14-71E86763141F" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/>
            </com:ComInterface>
        </com:Extension>
        <com:Extension Category="windows.comServer">
--- a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
@@ -189,6 +189,7 @@
                <com:ProxyStub Id="1833E661-CC81-4DD0-87C6-C2F74BD39EFA" DisplayName="OpenConsoleHandoffProxy" Path="OpenConsoleProxy.dll"/>
                <com:Interface Id="E686C757-9A35-4A1C-B3CE-0BCC8B5C69F4" ProxyStubClsid="1833E661-CC81-4DD0-87C6-C2F74BD39EFA"/>
                <com:Interface Id="59D55CCE-FC8A-48B4-ACE8-0A9286C6557F" ProxyStubClsid="1833E661-CC81-4DD0-87C6-C2F74BD39EFA"/>
+                <com:Interface Id="746E6BC0-AB05-4E38-AB14-71E86763141F" ProxyStubClsid="1833E661-CC81-4DD0-87C6-C2F74BD39EFA"/>
            </com:ComInterface>
        </com:Extension>
        <com:Extension Category="windows.comServer">
--- a/src/cascadia/CascadiaPackage/Package.appxmanifest
+++ b/src/cascadia/CascadiaPackage/Package.appxmanifest
@@ -189,6 +189,7 @@
                <com:ProxyStub Id="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F" DisplayName="OpenConsoleHandoffProxy" Path="OpenConsoleProxy.dll"/>
                <com:Interface Id="E686C757-9A35-4A1C-B3CE-0BCC8B5C69F4" ProxyStubClsid="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F"/>
                <com:Interface Id="59D55CCE-FC8A-48B4-ACE8-0A9286C6557F" ProxyStubClsid="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F"/>
+                <com:Interface Id="746E6BC0-AB05-4E38-AB14-71E86763141F" ProxyStubClsid="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F"/>
            </com:ComInterface>
        </com:Extension>
        <com:Extension Category="windows.comServer">
--- a/src/cascadia/LocalTests_SettingsModel/ColorSchemeTests.cpp
+++ b/src/cascadia/LocalTests_SettingsModel/ColorSchemeTests.cpp
@@ -90,7 +90,7 @@ namespace SettingsModelLocalTests
        }

        Log::Comment(L"Roundtrip Test for Color Scheme");
-        Json::Value outJson{ scheme->ToJson() };
+        auto outJson{ scheme->ToJson() };
        VERIFY_ARE_EQUAL(schemeObject, outJson);
    }

--- a/src/cascadia/LocalTests_SettingsModel/CommandTests.cpp
+++ b/src/cascadia/LocalTests_SettingsModel/CommandTests.cpp
@@ -58,7 +58,7 @@ namespace SettingsModelLocalTests
        const auto commands1Json = VerifyParseSucceeded(commands1String);
        const auto commands2Json = VerifyParseSucceeded(commands2String);

-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        auto commands = winrt::single_threaded_map<winrt::hstring, Command>();
        VERIFY_ARE_EQUAL(0u, commands.Size());
        {
            auto warnings = implementation::Command::LayerJson(commands, commands0Json);
@@ -92,7 +92,7 @@ namespace SettingsModelLocalTests
        const auto commands2Json = VerifyParseSucceeded(commands2String);
        const auto commands3Json = VerifyParseSucceeded(commands3String);

-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        auto commands = winrt::single_threaded_map<winrt::hstring, Command>();
        VERIFY_ARE_EQUAL(0u, commands.Size());
        {
            auto warnings = implementation::Command::LayerJson(commands, commands0Json);
@@ -154,7 +154,7 @@ namespace SettingsModelLocalTests

        const auto commands0Json = VerifyParseSucceeded(commands0String);

-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        auto commands = winrt::single_threaded_map<winrt::hstring, Command>();
        VERIFY_ARE_EQUAL(0u, commands.Size());
        auto warnings = implementation::Command::LayerJson(commands, commands0Json);
        VERIFY_ARE_EQUAL(0u, warnings.size());
@@ -272,7 +272,7 @@ namespace SettingsModelLocalTests

        const auto commands0Json = VerifyParseSucceeded(commands0String);

-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        auto commands = winrt::single_threaded_map<winrt::hstring, Command>();
        VERIFY_ARE_EQUAL(0u, commands.Size());
        auto warnings = implementation::Command::LayerJson(commands, commands0Json);
        VERIFY_ARE_EQUAL(3u, warnings.size());
@@ -298,7 +298,7 @@ namespace SettingsModelLocalTests
        const std::string commands0String{ R"([ { "name": { "key": "DuplicateTabCommandKey"}, "command": "copy" } ])" };
        const auto commands0Json = VerifyParseSucceeded(commands0String);

-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        auto commands = winrt::single_threaded_map<winrt::hstring, Command>();
        VERIFY_ARE_EQUAL(0u, commands.Size());
        {
            auto warnings = implementation::Command::LayerJson(commands, commands0Json);
@@ -340,7 +340,7 @@ namespace SettingsModelLocalTests

        const auto commands0Json = VerifyParseSucceeded(commands0String);

-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        auto commands = winrt::single_threaded_map<winrt::hstring, Command>();
        VERIFY_ARE_EQUAL(0u, commands.Size());
        auto warnings = implementation::Command::LayerJson(commands, commands0Json);
        VERIFY_ARE_EQUAL(0u, warnings.size());
@@ -410,7 +410,7 @@ namespace SettingsModelLocalTests

        const auto commands0Json = VerifyParseSucceeded(commands0String);

-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        auto commands = winrt::single_threaded_map<winrt::hstring, Command>();
        VERIFY_ARE_EQUAL(0u, commands.Size());
        auto warnings = implementation::Command::LayerJson(commands, commands0Json);
        VERIFY_ARE_EQUAL(0u, warnings.size());
@@ -473,7 +473,7 @@ namespace SettingsModelLocalTests

        const auto commands0Json = VerifyParseSucceeded(commands0String);

-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        auto commands = winrt::single_threaded_map<winrt::hstring, Command>();
        VERIFY_ARE_EQUAL(0u, commands.Size());
        auto warnings = implementation::Command::LayerJson(commands, commands0Json);
        VERIFY_ARE_EQUAL(0u, warnings.size());
--- a/src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp
+++ b/src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp
@@ -159,7 +159,7 @@ namespace SettingsModelLocalTests
        }
        {
            // Case 2: Bad settings
-            bool caughtExpectedException = false;
+            auto caughtExpectedException = false;
            try
            {
                auto settings = winrt::make_self<implementation::CascadiaSettings>(settingsWithoutProfiles);
@@ -173,7 +173,7 @@ namespace SettingsModelLocalTests
        }
        {
            // Case 3: Bad settings
-            bool caughtExpectedException = false;
+            auto caughtExpectedException = false;
            try
            {
                auto settings = winrt::make_self<implementation::CascadiaSettings>(settingsWithEmptyProfiles);
@@ -886,7 +886,7 @@ namespace SettingsModelLocalTests
        const winrt::guid guid1{ Utils::GuidFromString(L"{6239a42c-6666-49a3-80bd-e8fdd045185c}") };
        const winrt::guid guid2{ Utils::GuidFromString(L"{2C4DE342-38B7-51CF-B940-2309A097F518}") };
        const winrt::guid fakeGuid{ Utils::GuidFromString(L"{FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF}") };
-        const winrt::guid autogeneratedGuid{ implementation::Profile::_GenerateGuidForProfile(name3, L"") };
+        const auto autogeneratedGuid{ implementation::Profile::_GenerateGuidForProfile(name3, L"") };

        const auto settings = createSettings(settings0String);

--- a/src/cascadia/LocalTests_SettingsModel/JsonTestClass.h
+++ b/src/cascadia/LocalTests_SettingsModel/JsonTestClass.h
@@ -24,7 +24,7 @@ public:

        Json::Value root;
        std::string errs;
-        const bool parseResult = reader->parse(content.data(), content.data() + content.size(), &root, &errs);
+        const auto parseResult = reader->parse(content.data(), content.data() + content.size(), &root, &errs);
        VERIFY_IS_TRUE(parseResult, winrt::to_hstring(errs).c_str());
        return root;
    };
--- a/src/cascadia/LocalTests_SettingsModel/TerminalSettingsTests.cpp
+++ b/src/cascadia/LocalTests_SettingsModel/TerminalSettingsTests.cpp
@@ -82,9 +82,9 @@ namespace SettingsModelLocalTests
        expectedArgv.reserve(expectedArgc * 65);
        input.reserve(expectedArgc * 67);

-        for (int i = 0; i < expectedArgc; ++i)
+        for (auto i = 0; i < expectedArgc; ++i)
        {
-            const bool useQuotes = static_cast<bool>(rng(2));
+            const auto useQuotes = static_cast<bool>(rng(2));
            // We need to ensure there is at least one character
            const auto count = static_cast<size_t>(rng(64) + 1);
            const auto ch = static_cast<wchar_t>(rng('z' - 'a' + 1) + 'a');
--- a/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
@@ -199,7 +199,7 @@ namespace TerminalAppLocalTests
        VERIFY_SUCCEEDED(TestData::TryGetValue(L"testPass", testPass), L"Get a commandline to test");

        AppCommandlineArgs appArgs{};
-        std::vector<const wchar_t*>& rawCommands{ commandsToTest.at(testPass) };
+        auto& rawCommands{ commandsToTest.at(testPass) };
        _logCommandline(rawCommands);

        auto commandlines = AppCommandlineArgs::BuildCommands(rawCommands);
@@ -232,7 +232,7 @@ namespace TerminalAppLocalTests
        VERIFY_SUCCEEDED(TestData::TryGetValue(L"testPass", testPass), L"Get a commandline to test");

        AppCommandlineArgs appArgs{};
-        std::vector<const wchar_t*>& rawCommands{ commandsToTest.at(testPass) };
+        auto& rawCommands{ commandsToTest.at(testPass) };
        _logCommandline(rawCommands);

        auto commandlines = AppCommandlineArgs::BuildCommands(rawCommands);
@@ -266,7 +266,7 @@ namespace TerminalAppLocalTests
        VERIFY_SUCCEEDED(TestData::TryGetValue(L"testPass", testPass), L"Get a commandline to test");

        AppCommandlineArgs appArgs{};
-        std::vector<const wchar_t*>& rawCommands{ commandsToTest.at(testPass) };
+        auto& rawCommands{ commandsToTest.at(testPass) };
        _logCommandline(rawCommands);

        auto commandlines = AppCommandlineArgs::BuildCommands(rawCommands);
@@ -439,7 +439,7 @@ namespace TerminalAppLocalTests
        END_TEST_METHOD_PROPERTIES()

        INIT_TEST_PROPERTY(bool, useShortForm, L"If true, use `nt` instead of `new-tab`");
-        const wchar_t* subcommand = useShortForm ? L"nt" : L"new-tab";
+        auto subcommand = useShortForm ? L"nt" : L"new-tab";

        {
            AppCommandlineArgs appArgs{};
@@ -697,7 +697,7 @@ namespace TerminalAppLocalTests
        END_TEST_METHOD_PROPERTIES()

        INIT_TEST_PROPERTY(bool, useShortForm, L"If true, use `sp` instead of `split-pane`");
-        const wchar_t* subcommand = useShortForm ? L"sp" : L"split-pane";
+        auto subcommand = useShortForm ? L"sp" : L"split-pane";

        {
            AppCommandlineArgs appArgs{};
@@ -880,8 +880,8 @@ namespace TerminalAppLocalTests

        INIT_TEST_PROPERTY(bool, useShortFormNewTab, L"If true, use `nt` instead of `new-tab`");
        INIT_TEST_PROPERTY(bool, useShortFormSplitPane, L"If true, use `sp` instead of `split-pane`");
-        const wchar_t* ntSubcommand = useShortFormNewTab ? L"nt" : L"new-tab";
-        const wchar_t* spSubcommand = useShortFormSplitPane ? L"sp" : L"split-pane";
+        auto ntSubcommand = useShortFormNewTab ? L"nt" : L"new-tab";
+        auto spSubcommand = useShortFormSplitPane ? L"sp" : L"split-pane";

        AppCommandlineArgs appArgs{};
        std::vector<const wchar_t*> rawCommands{ L"wt.exe", ntSubcommand, L";", spSubcommand };
@@ -1009,7 +1009,7 @@ namespace TerminalAppLocalTests
        END_TEST_METHOD_PROPERTIES()

        INIT_TEST_PROPERTY(bool, useShortForm, L"If true, use `ft` instead of `focus-tab`");
-        const wchar_t* subcommand = useShortForm ? L"ft" : L"focus-tab";
+        auto subcommand = useShortForm ? L"ft" : L"focus-tab";

        {
            AppCommandlineArgs appArgs{};
@@ -1101,7 +1101,7 @@ namespace TerminalAppLocalTests
        END_TEST_METHOD_PROPERTIES()

        INIT_TEST_PROPERTY(bool, useShortForm, L"If true, use `mf` instead of `move-focus`");
-        const wchar_t* subcommand = useShortForm ? L"mf" : L"move-focus";
+        auto subcommand = useShortForm ? L"mf" : L"move-focus";

        {
            AppCommandlineArgs appArgs{};
@@ -1214,7 +1214,7 @@ namespace TerminalAppLocalTests

    void CommandlineTest::ParseSwapPaneArgs()
    {
-        const wchar_t* subcommand = L"swap-pane";
+        auto subcommand = L"swap-pane";

        {
            AppCommandlineArgs appArgs{};
@@ -1332,7 +1332,7 @@ namespace TerminalAppLocalTests
        END_TEST_METHOD_PROPERTIES()

        INIT_TEST_PROPERTY(bool, useShortForm, L"If true, use `fp` instead of `focus-pane`");
-        const wchar_t* subcommand = useShortForm ? L"fp" : L"focus-pane";
+        auto subcommand = useShortForm ? L"fp" : L"focus-pane";

        {
            AppCommandlineArgs appArgs{};
@@ -1765,7 +1765,7 @@ namespace TerminalAppLocalTests
        END_TEST_METHOD_PROPERTIES()

        INIT_TEST_PROPERTY(bool, useShortForm, L"If true, use `sp` instead of `split-pane`");
-        const wchar_t* subcommand = useShortForm ? L"sp" : L"split-pane";
+        auto subcommand = useShortForm ? L"sp" : L"split-pane";

        {
            AppCommandlineArgs appArgs{};
--- a/src/cascadia/LocalTests_TerminalApp/CppWinrtTailored.h
+++ b/src/cascadia/LocalTests_TerminalApp/CppWinrtTailored.h
@@ -81,7 +81,7 @@ HRESULT RunOnUIThread(const TFunction& function)
        return HRESULT_FROM_WIN32(::GetLastError());
    }

-    HRESULT invokeResult = E_FAIL;
+    auto invokeResult = E_FAIL;

    auto asyncAction = d.RunAsync(winrt::Windows::UI::Core::CoreDispatcherPriority::Normal,
                                  [&invokeResult, &function]() {
@@ -94,7 +94,7 @@ HRESULT RunOnUIThread(const TFunction& function)
    });

    // Wait for the callback to complete
-    HRESULT hr = completedEvent.Wait();
+    auto hr = completedEvent.Wait();
    if (FAILED(hr))
    {
        return hr;
--- a/src/cascadia/LocalTests_TerminalApp/TabTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/TabTests.cpp
@@ -681,6 +681,10 @@ namespace TerminalAppLocalTests

    void TabTests::TryZoomPane()
    {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
+        END_TEST_METHOD_PROPERTIES()
+
        auto page = _commonSetup();

        Log::Comment(L"Create a second pane");
@@ -1052,7 +1056,7 @@ namespace TerminalAppLocalTests
        VERIFY_ARE_EQUAL(4u, page->_tabs.Size());

        TestOnUIThread([&page]() {
-            uint32_t focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
+            auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify the fourth tab is the focused one");
        });

@@ -1062,7 +1066,7 @@ namespace TerminalAppLocalTests
        });

        TestOnUIThread([&page]() {
-            uint32_t focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
+            auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
            VERIFY_ARE_EQUAL(1u, focusedIndex, L"Verify the second tab is the focused one");
        });

@@ -1088,7 +1092,7 @@ namespace TerminalAppLocalTests
        });

        TestOnUIThread([&page]() {
-            uint32_t focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
+            auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify the fourth tab is the focused one");
        });

@@ -1109,7 +1113,7 @@ namespace TerminalAppLocalTests
        });

        TestOnUIThread([&page]() {
-            uint32_t focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
+            auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
            VERIFY_ARE_EQUAL(1u, focusedIndex, L"Verify the second tab is the focused one");
        });

@@ -1121,7 +1125,7 @@ namespace TerminalAppLocalTests
            page->_SelectNextTab(true, nullptr);
        });
        TestOnUIThread([&page]() {
-            uint32_t focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
+            auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
            VERIFY_ARE_EQUAL(2u, focusedIndex, L"Verify the third tab is the focused one");
        });

@@ -1133,7 +1137,7 @@ namespace TerminalAppLocalTests
            page->_SelectNextTab(true, nullptr);
        });
        TestOnUIThread([&page]() {
-            uint32_t focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
+            auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify the fourth tab is the focused one");
        });
    }
@@ -1244,7 +1248,7 @@ namespace TerminalAppLocalTests
            page->WindowName(args.ProposedName());
        });

-        bool windowNameChanged = false;
+        auto windowNameChanged = false;
        page->PropertyChanged([&page, &windowNameChanged](auto&&, const winrt::WUX::Data::PropertyChangedEventArgs& args) mutable {
            if (args.PropertyName() == L"WindowNameForDisplay")
            {
@@ -1274,7 +1278,7 @@ namespace TerminalAppLocalTests
            page->RenameFailed();
        });

-        bool windowNameChanged = false;
+        auto windowNameChanged = false;

        page->PropertyChanged([&page, &windowNameChanged](auto&&, const winrt::WUX::Data::PropertyChangedEventArgs& args) mutable {
            if (args.PropertyName() == L"WindowNameForDisplay")
@@ -1312,7 +1316,8 @@ namespace TerminalAppLocalTests
        TestOnUIThread([&page]() {
            Log::Comment(L"Emulate previewing the SetColorScheme action");
            SetColorSchemeArgs args{ L"Vintage" };
-            page->_PreviewColorScheme(args);
+            ActionAndArgs actionAndArgs{ ShortcutAction::SetColorScheme, args };
+            page->_PreviewAction(actionAndArgs);
        });

        TestOnUIThread([&page]() {
@@ -1379,7 +1384,8 @@ namespace TerminalAppLocalTests
        TestOnUIThread([&page]() {
            Log::Comment(L"Emulate previewing the SetColorScheme action");
            SetColorSchemeArgs args{ L"Vintage" };
-            page->_PreviewColorScheme(args);
+            ActionAndArgs actionAndArgs{ ShortcutAction::SetColorScheme, args };
+            page->_PreviewAction(actionAndArgs);
        });

        TestOnUIThread([&page]() {
--- a/src/cascadia/PublicTerminalCore/HwndTerminal.cpp
+++ b/src/cascadia/PublicTerminalCore/HwndTerminal.cpp
@@ -38,7 +38,7 @@ static bool _IsGlyphWideForceNarrowFallback(const std::wstring_view /* glyph */)
 static bool _EnsureStaticInitialization()
 {
    // use C++11 magic statics to make sure we only do this once.
-    static bool initialized = []() {
+    static auto initialized = []() {
        // *** THIS IS A SINGLETON ***
        SetGlyphWidthFallback(_IsGlyphWideForceNarrowFallback);

@@ -55,7 +55,7 @@ LRESULT CALLBACK HwndTerminal::HwndTerminalWndProc(
 try
 {
 #pragma warning(suppress : 26490) // Win32 APIs can only store void*, have to use reinterpret_cast
-    HwndTerminal* terminal = reinterpret_cast<HwndTerminal*>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
+    auto terminal = reinterpret_cast<HwndTerminal*>(GetWindowLongPtr(hwnd, GWLP_USERDATA));

    if (terminal)
    {
@@ -178,7 +178,7 @@ HwndTerminal::HwndTerminal(HWND parentHwnd) :
 {
    _EnsureStaticInitialization();

-    HINSTANCE hInstance = wil::GetModuleInstanceHandle();
+    auto hInstance = wil::GetModuleInstanceHandle();

    if (RegisterTermClass(hInstance))
    {
@@ -214,7 +214,9 @@ HRESULT HwndTerminal::Initialize()
    _terminal = std::make_unique<::Microsoft::Terminal::Core::Terminal>();
    auto renderThread = std::make_unique<::Microsoft::Console::Render::RenderThread>();
    auto* const localPointerToThread = renderThread.get();
-    const auto& renderSettings = _terminal->GetRenderSettings();
+    auto& renderSettings = _terminal->GetRenderSettings();
+    renderSettings.SetColorTableEntry(TextColor::DEFAULT_BACKGROUND, RGB(12, 12, 12));
+    renderSettings.SetColorTableEntry(TextColor::DEFAULT_FOREGROUND, RGB(204, 204, 204));
    _renderer = std::make_unique<::Microsoft::Console::Render::Renderer>(renderSettings, _terminal.get(), nullptr, 0, std::move(renderThread));
    RETURN_HR_IF_NULL(E_POINTER, localPointerToThread);
    RETURN_IF_FAILED(localPointerToThread->Initialize(_renderer.get()));
@@ -228,7 +230,7 @@ HRESULT HwndTerminal::Initialize()
    RECT windowRect;
    GetWindowRect(_hwnd.get(), &windowRect);

-    const COORD windowSize{ gsl::narrow<short>(windowRect.right - windowRect.left), gsl::narrow<short>(windowRect.bottom - windowRect.top) };
+    const til::size windowSize{ windowRect.right - windowRect.left, windowRect.bottom - windowRect.top };

    // Fist set up the dx engine with the window size in pixels.
    // Then, using the font, get the number of characters that can fit.
@@ -237,11 +239,7 @@ HRESULT HwndTerminal::Initialize()

    _renderEngine = std::move(dxEngine);

-    _terminal->SetBackgroundCallback([](auto) {});
-
-    _terminal->Create(COORD{ 80, 25 }, 1000, *_renderer);
-    _terminal->SetColorTableEntry(TextColor::DEFAULT_BACKGROUND, RGB(12, 12, 12));
-    _terminal->SetColorTableEntry(TextColor::DEFAULT_FOREGROUND, RGB(204, 204, 204));
+    _terminal->Create({ 80, 25 }, 1000, *_renderer);
    _terminal->SetWriteInputCallback([=](std::wstring_view input) noexcept { _WriteTextToConnection(input); });
    localPointerToThread->EnablePainting();

@@ -345,7 +343,7 @@ IRawElementProviderSimple* HwndTerminal::_GetUiaProvider() noexcept
    return _uiaProvider.Get();
 }

-HRESULT HwndTerminal::Refresh(const SIZE windowSize, _Out_ COORD* dimensions)
+HRESULT HwndTerminal::Refresh(const til::size windowSize, _Out_ til::size* dimensions)
 {
    RETURN_HR_IF_NULL(E_INVALIDARG, dimensions);

@@ -359,8 +357,7 @@ HRESULT HwndTerminal::Refresh(const SIZE windowSize, _Out_ COORD* dimensions)
    _renderer->TriggerRedrawAll();

    // Convert our new dimensions to characters
-    const auto viewInPixels = Viewport::FromDimensions({ 0, 0 },
-                                                       { gsl::narrow<short>(windowSize.cx), gsl::narrow<short>(windowSize.cy) });
+    const auto viewInPixels = Viewport::FromDimensions(windowSize);
    const auto vp = _renderEngine->GetViewportInCharacters(viewInPixels);

    // If this function succeeds with S_FALSE, then the terminal didn't
@@ -437,7 +434,7 @@ void _stdcall TerminalSendOutput(void* terminal, LPCWSTR data)
 /// <param name="height">New height of the terminal in pixels</param>
 /// <param name="dimensions">Out parameter containing the columns and rows that fit the new size.</param>
 /// <returns>HRESULT of the attempted resize.</returns>
-HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions)
+HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ til::CoordType width, _In_ til::CoordType height, _Out_ til::size* dimensions)
 {
    const auto publicTerminal = static_cast<HwndTerminal*>(terminal);

@@ -450,7 +447,7 @@ HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ short width, _I
        static_cast<int>(height),
        0));

-    const SIZE windowSize{ width, height };
+    const til::size windowSize{ width, height };
    return publicTerminal->Refresh(windowSize, dimensions);
 }

@@ -461,19 +458,19 @@ HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ short width, _I
 /// <param name="dimensionsInCharacters">New terminal size in row and column count.</param>
 /// <param name="dimensionsInPixels">Out parameter with the new size of the renderer.</param>
 /// <returns>HRESULT of the attempted resize.</returns>
-HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ COORD dimensionsInCharacters, _Out_ SIZE* dimensionsInPixels)
+HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ til::size dimensionsInCharacters, _Out_ til::size* dimensionsInPixels)
 {
    RETURN_HR_IF_NULL(E_INVALIDARG, dimensionsInPixels);

    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);

-    const auto viewInCharacters = Viewport::FromDimensions({ 0, 0 }, { (dimensionsInCharacters.X), (dimensionsInCharacters.Y) });
+    const auto viewInCharacters = Viewport::FromDimensions(dimensionsInCharacters);
    const auto viewInPixels = publicTerminal->_renderEngine->GetViewportInPixels(viewInCharacters);

    dimensionsInPixels->cx = viewInPixels.Width();
    dimensionsInPixels->cy = viewInPixels.Height();

-    COORD unused{ 0, 0 };
+    til::size unused;

    return TerminalTriggerResize(terminal, viewInPixels.Width(), viewInPixels.Height(), &unused);
 }
@@ -486,7 +483,7 @@ HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ CO
 /// <param name="height">Height of the terminal area to calculate.</param>
 /// <param name="dimensions">Out parameter containing the columns and rows that fit the new size.</param>
 /// <returns>HRESULT of the calculation.</returns>
-HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions)
+HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ til::CoordType width, _In_ til::CoordType height, _Out_ til::size* dimensions)
 {
    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);

@@ -536,7 +533,7 @@ try
    };

    auto lock = _terminal->LockForWriting();
-    const bool altPressed = GetKeyState(VK_MENU) < 0;
+    const auto altPressed = GetKeyState(VK_MENU) < 0;
    const til::size fontSize{ this->_actualFont.GetSize() };

    this->_terminal->SetBlockSelection(altPressed);
@@ -550,11 +547,11 @@ try

    if (multiClickMapper == 3)
    {
-        _terminal->MultiClickSelection((cursorPosition / fontSize).to_win32_coord(), ::Terminal::SelectionExpansion::Line);
+        _terminal->MultiClickSelection(cursorPosition / fontSize, ::Terminal::SelectionExpansion::Line);
    }
    else if (multiClickMapper == 2)
    {
-        _terminal->MultiClickSelection((cursorPosition / fontSize).to_win32_coord(), ::Terminal::SelectionExpansion::Word);
+        _terminal->MultiClickSelection(cursorPosition / fontSize, ::Terminal::SelectionExpansion::Word);
    }
    else
    {
@@ -595,13 +592,13 @@ try

        if (distanceSquared >= maxDistanceSquared)
        {
-            _terminal->SetSelectionAnchor((touchdownPoint / fontSize).to_win32_coord());
+            _terminal->SetSelectionAnchor(touchdownPoint / fontSize);
            // stop tracking the touchdown point
            _singleClickTouchdownPos = std::nullopt;
        }
    }

-    this->_terminal->SetSelectionEnd((cursorPosition / fontSize).to_win32_coord());
+    this->_terminal->SetSelectionEnd(cursorPosition / fontSize);
    this->_renderer->TriggerSelection();

    return S_OK;
@@ -626,7 +623,7 @@ void _stdcall TerminalClearSelection(void* terminal)
 bool _stdcall TerminalIsSelectionActive(void* terminal)
 {
    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
-    const bool selectionActive = publicTerminal->_terminal->IsSelectionActive();
+    const auto selectionActive = publicTerminal->_terminal->IsSelectionActive();
    return selectionActive;
 }

@@ -684,7 +681,7 @@ static ControlKeyStates getControlKeyState() noexcept
 bool HwndTerminal::_CanSendVTMouseInput() const noexcept
 {
    // Only allow the transit of mouse events if shift isn't pressed.
-    const bool shiftPressed = GetKeyState(VK_SHIFT) < 0;
+    const auto shiftPressed = GetKeyState(VK_SHIFT) < 0;
    return !shiftPressed && _focused && _terminal->IsTrackingMouseInput();
 }

@@ -703,9 +700,7 @@ try
        wheelDelta = HIWORD(wParam);

        // If it's a *WHEEL event, it's in screen coordinates, not window (?!)
-        POINT coordsToTransform = cursorPosition.to_win32_point();
-        ScreenToClient(_hwnd.get(), &coordsToTransform);
-        cursorPosition = til::point{ coordsToTransform };
+        ScreenToClient(_hwnd.get(), cursorPosition.as_win32_point());
    }

    const TerminalInput::MouseButtonState state{
@@ -714,7 +709,7 @@ try
        WI_IsFlagSet(GetKeyState(VK_RBUTTON), KeyPressed)
    };

-    return _terminal->SendMouseEvent((cursorPosition / fontSize).to_win32_coord(), uMsg, getControlKeyState(), wheelDelta, state);
+    return _terminal->SendMouseEvent(cursorPosition / fontSize, uMsg, getControlKeyState(), wheelDelta, state);
 }
 catch (...)
 {
@@ -782,21 +777,23 @@ void _stdcall DestroyTerminal(void* terminal)
 }

 // Updates the terminal font type, size, color, as well as the background/foreground colors to a specified theme.
-void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR fontFamily, short fontSize, int newDpi)
+void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR fontFamily, til::CoordType fontSize, int newDpi)
 {
    const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
    {
        auto lock = publicTerminal->_terminal->LockForWriting();

-        publicTerminal->_terminal->SetColorTableEntry(TextColor::DEFAULT_FOREGROUND, theme.DefaultForeground);
-        publicTerminal->_terminal->SetColorTableEntry(TextColor::DEFAULT_BACKGROUND, theme.DefaultBackground);
+        auto& renderSettings = publicTerminal->_terminal->GetRenderSettings();
+        renderSettings.SetColorTableEntry(TextColor::DEFAULT_FOREGROUND, theme.DefaultForeground);
+        renderSettings.SetColorTableEntry(TextColor::DEFAULT_BACKGROUND, theme.DefaultBackground);
+
        publicTerminal->_renderEngine->SetSelectionBackground(theme.DefaultSelectionBackground, theme.SelectionBackgroundAlpha);

        // Set the font colors
        for (size_t tableIndex = 0; tableIndex < 16; tableIndex++)
        {
            // It's using gsl::at to check the index is in bounds, but the analyzer still calls this array-to-pointer-decay
-            [[gsl::suppress(bounds .3)]] publicTerminal->_terminal->SetColorTableEntry(tableIndex, gsl::at(theme.ColorTable, tableIndex));
+            [[gsl::suppress(bounds .3)]] renderSettings.SetColorTableEntry(tableIndex, gsl::at(theme.ColorTable, tableIndex));
        }
    }

@@ -810,8 +807,8 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
    RECT windowRect;
    GetWindowRect(publicTerminal->_hwnd.get(), &windowRect);

-    COORD dimensions = {};
-    const SIZE windowSize{ windowRect.right - windowRect.left, windowRect.bottom - windowRect.top };
+    til::size dimensions;
+    const til::size windowSize{ windowRect.right - windowRect.left, windowRect.bottom - windowRect.top };
    publicTerminal->Refresh(windowSize, &dimensions);
 }

@@ -849,7 +846,7 @@ void __stdcall TerminalKillFocus(void* terminal)
 // Arguments:
 // - rows - Rows of text data to copy
 // - fAlsoCopyFormatting - true if the color and formatting should also be copied, false otherwise
-HRESULT HwndTerminal::_CopyTextToSystemClipboard(const TextBuffer::TextAndColor& rows, bool const fAlsoCopyFormatting)
+HRESULT HwndTerminal::_CopyTextToSystemClipboard(const TextBuffer::TextAndColor& rows, const bool fAlsoCopyFormatting)
 try
 {
    std::wstring finalString;
@@ -861,17 +858,17 @@ try
    }

    // allocate the final clipboard data
-    const size_t cchNeeded = finalString.size() + 1;
-    const size_t cbNeeded = sizeof(wchar_t) * cchNeeded;
+    const auto cchNeeded = finalString.size() + 1;
+    const auto cbNeeded = sizeof(wchar_t) * cchNeeded;
    wil::unique_hglobal globalHandle(GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cbNeeded));
    RETURN_LAST_ERROR_IF_NULL(globalHandle.get());

-    PWSTR pwszClipboard = static_cast<PWSTR>(GlobalLock(globalHandle.get()));
+    auto pwszClipboard = static_cast<PWSTR>(GlobalLock(globalHandle.get()));
    RETURN_LAST_ERROR_IF_NULL(pwszClipboard);

    // The pattern gets a bit strange here because there's no good wil built-in for global lock of this type.
    // Try to copy then immediately unlock. Don't throw until after (so the hglobal won't be freed until we unlock).
-    const HRESULT hr = StringCchCopyW(pwszClipboard, cchNeeded, finalString.data());
+    const auto hr = StringCchCopyW(pwszClipboard, cchNeeded, finalString.data());
    GlobalUnlock(globalHandle.get());
    RETURN_IF_FAILED(hr);

@@ -889,13 +886,13 @@ try
        if (fAlsoCopyFormatting)
        {
            const auto& fontData = _actualFont;
-            int const iFontHeightPoints = fontData.GetUnscaledSize().Y; // this renderer uses points already
-            const COLORREF bgColor = _terminal->GetAttributeColors({}).second;
+            const int iFontHeightPoints = fontData.GetUnscaledSize().Y; // this renderer uses points already
+            const auto bgColor = _terminal->GetAttributeColors({}).second;

-            std::string HTMLToPlaceOnClip = TextBuffer::GenHTML(rows, iFontHeightPoints, fontData.GetFaceName(), bgColor);
+            auto HTMLToPlaceOnClip = TextBuffer::GenHTML(rows, iFontHeightPoints, fontData.GetFaceName(), bgColor);
            _CopyToSystemClipboard(HTMLToPlaceOnClip, L"HTML Format");

-            std::string RTFToPlaceOnClip = TextBuffer::GenRTF(rows, iFontHeightPoints, fontData.GetFaceName(), bgColor);
+            auto RTFToPlaceOnClip = TextBuffer::GenRTF(rows, iFontHeightPoints, fontData.GetFaceName(), bgColor);
            _CopyToSystemClipboard(RTFToPlaceOnClip, L"Rich Text Format");
        }
    }
@@ -916,22 +913,22 @@ CATCH_RETURN()
 // - lpszFormat - the name of the format
 HRESULT HwndTerminal::_CopyToSystemClipboard(std::string stringToCopy, LPCWSTR lpszFormat)
 {
-    const size_t cbData = stringToCopy.size() + 1; // +1 for '\0'
+    const auto cbData = stringToCopy.size() + 1; // +1 for '\0'
    if (cbData)
    {
        wil::unique_hglobal globalHandleData(GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cbData));
        RETURN_LAST_ERROR_IF_NULL(globalHandleData.get());

-        PSTR pszClipboardHTML = static_cast<PSTR>(GlobalLock(globalHandleData.get()));
+        auto pszClipboardHTML = static_cast<PSTR>(GlobalLock(globalHandleData.get()));
        RETURN_LAST_ERROR_IF_NULL(pszClipboardHTML);

        // The pattern gets a bit strange here because there's no good wil built-in for global lock of this type.
        // Try to copy then immediately unlock. Don't throw until after (so the hglobal won't be freed until we unlock).
-        const HRESULT hr2 = StringCchCopyA(pszClipboardHTML, cbData, stringToCopy.data());
+        const auto hr2 = StringCchCopyA(pszClipboardHTML, cbData, stringToCopy.data());
        GlobalUnlock(globalHandleData.get());
        RETURN_IF_FAILED(hr2);

-        UINT const CF_FORMAT = RegisterClipboardFormatW(lpszFormat);
+        const auto CF_FORMAT = RegisterClipboardFormatW(lpszFormat);
        RETURN_LAST_ERROR_IF(0 == CF_FORMAT);

        RETURN_LAST_ERROR_IF_NULL(SetClipboardData(CF_FORMAT, globalHandleData.get()));
@@ -953,14 +950,14 @@ void HwndTerminal::_PasteTextFromClipboard() noexcept
        return;
    }

-    HANDLE ClipboardDataHandle = GetClipboardData(CF_UNICODETEXT);
+    auto ClipboardDataHandle = GetClipboardData(CF_UNICODETEXT);
    if (ClipboardDataHandle == nullptr)
    {
        CloseClipboard();
        return;
    }

-    PCWCH pwstr = static_cast<PCWCH>(GlobalLock(ClipboardDataHandle));
+    auto pwstr = static_cast<PCWCH>(GlobalLock(ClipboardDataHandle));

    _StringPaste(pwstr);

@@ -984,21 +981,21 @@ void HwndTerminal::_StringPaste(const wchar_t* const pData) noexcept
    CATCH_LOG();
 }

-COORD HwndTerminal::GetFontSize() const noexcept
+til::size HwndTerminal::GetFontSize() const noexcept
 {
    return _actualFont.GetSize();
 }

-RECT HwndTerminal::GetBounds() const noexcept
+til::rect HwndTerminal::GetBounds() const noexcept
 {
-    RECT windowRect;
-    GetWindowRect(_hwnd.get(), &windowRect);
+    til::rect windowRect;
+    GetWindowRect(_hwnd.get(), windowRect.as_win32_rect());
    return windowRect;
 }

-RECT HwndTerminal::GetPadding() const noexcept
+til::rect HwndTerminal::GetPadding() const noexcept
 {
-    return { 0 };
+    return {};
 }

 double HwndTerminal::GetScaleFactor() const noexcept
@@ -1006,7 +1003,7 @@ double HwndTerminal::GetScaleFactor() const noexcept
    return static_cast<double>(_currentDpi) / static_cast<double>(USER_DEFAULT_SCREEN_DPI);
 }

-void HwndTerminal::ChangeViewport(const SMALL_RECT NewWindow)
+void HwndTerminal::ChangeViewport(const til::inclusive_rect& NewWindow)
 {
    _terminal->UserScrollViewport(NewWindow.Top);
 }
--- a/src/cascadia/PublicTerminalCore/HwndTerminal.hpp
+++ b/src/cascadia/PublicTerminalCore/HwndTerminal.hpp
@@ -27,16 +27,16 @@ extern "C" {
 __declspec(dllexport) HRESULT _stdcall CreateTerminal(HWND parentHwnd, _Out_ void** hwnd, _Out_ void** terminal);
 __declspec(dllexport) void _stdcall TerminalSendOutput(void* terminal, LPCWSTR data);
 __declspec(dllexport) void _stdcall TerminalRegisterScrollCallback(void* terminal, void __stdcall callback(int, int, int));
-__declspec(dllexport) HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions);
-__declspec(dllexport) HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ COORD dimensions, _Out_ SIZE* dimensionsInPixels);
-__declspec(dllexport) HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions);
+__declspec(dllexport) HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ til::CoordType width, _In_ til::CoordType height, _Out_ til::size* dimensions);
+__declspec(dllexport) HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ til::size dimensions, _Out_ til::size* dimensionsInPixels);
+__declspec(dllexport) HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ til::CoordType width, _In_ til::CoordType height, _Out_ til::size* dimensions);
 __declspec(dllexport) void _stdcall TerminalDpiChanged(void* terminal, int newDpi);
 __declspec(dllexport) void _stdcall TerminalUserScroll(void* terminal, int viewTop);
 __declspec(dllexport) void _stdcall TerminalClearSelection(void* terminal);
 __declspec(dllexport) const wchar_t* _stdcall TerminalGetSelection(void* terminal);
 __declspec(dllexport) bool _stdcall TerminalIsSelectionActive(void* terminal);
 __declspec(dllexport) void _stdcall DestroyTerminal(void* terminal);
-__declspec(dllexport) void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR fontFamily, short fontSize, int newDpi);
+__declspec(dllexport) void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR fontFamily, til::CoordType fontSize, int newDpi);
 __declspec(dllexport) void _stdcall TerminalRegisterWriteCallback(void* terminal, const void __stdcall callback(wchar_t*));
 __declspec(dllexport) void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, WORD flags, bool keyDown);
 __declspec(dllexport) void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD flags, WORD scanCode);
@@ -60,7 +60,7 @@ public:
    HRESULT Initialize();
    void Teardown() noexcept;
    void SendOutput(std::wstring_view data);
-    HRESULT Refresh(const SIZE windowSize, _Out_ COORD* dimensions);
+    HRESULT Refresh(const til::size windowSize, _Out_ til::size* dimensions);
    void RegisterScrollCallback(std::function<void(int, int, int)> callback);
    void RegisterWriteCallback(const void _stdcall callback(wchar_t*));
    ::Microsoft::Console::Types::IUiaData* GetUiaData() const noexcept;
@@ -91,9 +91,9 @@ private:
    std::optional<til::point> _singleClickTouchdownPos;

    friend HRESULT _stdcall CreateTerminal(HWND parentHwnd, _Out_ void** hwnd, _Out_ void** terminal);
-    friend HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions);
-    friend HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ COORD dimensions, _Out_ SIZE* dimensionsInPixels);
-    friend HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ short width, _In_ short height, _Out_ COORD* dimensions);
+    friend HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ til::CoordType width, _In_ til::CoordType height, _Out_ til::size* dimensions);
+    friend HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ til::size dimensions, _Out_ til::size* dimensionsInPixels);
+    friend HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ til::CoordType width, _In_ til::CoordType height, _Out_ til::size* dimensions);
    friend void _stdcall TerminalDpiChanged(void* terminal, int newDpi);
    friend void _stdcall TerminalUserScroll(void* terminal, int viewTop);
    friend void _stdcall TerminalClearSelection(void* terminal);
@@ -101,7 +101,7 @@ private:
    friend bool _stdcall TerminalIsSelectionActive(void* terminal);
    friend void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, WORD flags, bool keyDown);
    friend void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD scanCode, WORD flags);
-    friend void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR fontFamily, short fontSize, int newDpi);
+    friend void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR fontFamily, til::CoordType fontSize, int newDpi);
    friend void _stdcall TerminalBlinkCursor(void* terminal);
    friend void _stdcall TerminalSetCursorVisible(void* terminal, const bool visible);
    friend void _stdcall TerminalSetFocus(void* terminal);
@@ -109,7 +109,7 @@ private:

    void _UpdateFont(int newDpi);
    void _WriteTextToConnection(const std::wstring_view text) noexcept;
-    HRESULT _CopyTextToSystemClipboard(const TextBuffer::TextAndColor& rows, bool const fAlsoCopyFormatting);
+    HRESULT _CopyTextToSystemClipboard(const TextBuffer::TextAndColor& rows, const bool fAlsoCopyFormatting);
    HRESULT _CopyToSystemClipboard(std::string stringToCopy, LPCWSTR lpszFormat);
    void _PasteTextFromClipboard() noexcept;
    void _StringPaste(const wchar_t* const pData) noexcept;
@@ -128,10 +128,10 @@ private:
    void _SendCharEvent(wchar_t ch, WORD scanCode, WORD flags) noexcept;

    // Inherited via IControlAccessibilityInfo
-    COORD GetFontSize() const noexcept override;
-    RECT GetBounds() const noexcept override;
+    til::size GetFontSize() const noexcept override;
+    til::rect GetBounds() const noexcept override;
    double GetScaleFactor() const noexcept override;
-    void ChangeViewport(const SMALL_RECT NewWindow) override;
+    void ChangeViewport(const til::inclusive_rect& NewWindow) override;
    HRESULT GetHostUiaProvider(IRawElementProviderSimple** provider) noexcept override;
-    RECT GetPadding() const noexcept override;
+    til::rect GetPadding() const noexcept override;
 };
--- a/src/cascadia/Remoting/CommandlineArgs.cpp
+++ b/src/cascadia/Remoting/CommandlineArgs.cpp
@@ -13,7 +13,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
    // It must be defined after CommandlineArgs.g.cpp, otherwise the compiler
    // will give you just the most impossible template errors to try and
    // decipher.
-    void CommandlineArgs::Commandline(winrt::array_view<const winrt::hstring> const& value)
+    void CommandlineArgs::Commandline(const winrt::array_view<const winrt::hstring>& value)
    {
        _args = { value.begin(), value.end() };
    }
--- a/src/cascadia/Remoting/CommandlineArgs.h
+++ b/src/cascadia/Remoting/CommandlineArgs.h
@@ -22,7 +22,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation

        winrt::hstring CurrentDirectory() { return _cwd; };

-        void Commandline(winrt::array_view<const winrt::hstring> const& value);
+        void Commandline(const winrt::array_view<const winrt::hstring>& value);
        winrt::com_array<winrt::hstring> Commandline();

    private:
--- a/src/cascadia/Remoting/Monarch.cpp
+++ b/src/cascadia/Remoting/Monarch.cpp
@@ -821,7 +821,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
    void Monarch::_renameRequested(const winrt::Windows::Foundation::IInspectable& /*sender*/,
                                   const winrt::Microsoft::Terminal::Remoting::RenameRequestArgs& args)
    {
-        bool successfullyRenamed = false;
+        auto successfullyRenamed = false;

        try
        {
@@ -972,7 +972,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation

    bool Monarch::DoesQuakeWindowExist()
    {
-        bool result = false;
+        auto result = false;
        const auto func = [&](const auto& /*id*/, const auto& p) {
            if (p.WindowName() == QuakeWindowName)
            {
--- a/src/cascadia/Remoting/Peasant.cpp
+++ b/src/cascadia/Remoting/Peasant.cpp
@@ -86,7 +86,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
        // activated.
        _lastActivatedArgs = args;

-        bool successfullyNotified = false;
+        auto successfullyNotified = false;
        // Raise our WindowActivated event, to let the monarch know we've been
        // activated.
        try
@@ -172,7 +172,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
    // - <none>
    void Peasant::RequestIdentifyWindows()
    {
-        bool successfullyNotified = false;
+        auto successfullyNotified = false;

        try
        {
@@ -197,7 +197,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation

    void Peasant::RequestRename(const winrt::Microsoft::Terminal::Remoting::RenameRequestArgs& args)
    {
-        bool successfullyNotified = false;
+        auto successfullyNotified = false;
        const auto oldName{ _WindowName };
        try
        {
--- a/src/cascadia/Remoting/WindowManager.cpp
+++ b/src/cascadia/Remoting/WindowManager.cpp
@@ -26,7 +26,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
        // Register with COM as a server for the Monarch class
        _registerAsMonarch();
        // Instantiate an instance of the Monarch. This may or may not be in-proc!
-        bool foundMonarch = false;
+        auto foundMonarch = false;
        while (!foundMonarch)
        {
            try
@@ -83,8 +83,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                          winrt::hstring& givenName)
    {
        // these two errors are Win32 errors, convert them to HRESULTS so we can actually compare below.
-        static constexpr HRESULT RPC_SERVER_UNAVAILABLE_HR = HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE);
-        static constexpr HRESULT RPC_CALL_FAILED_HR = HRESULT_FROM_WIN32(RPC_S_CALL_FAILED);
+        static constexpr auto RPC_SERVER_UNAVAILABLE_HR = HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE);
+        static constexpr auto RPC_CALL_FAILED_HR = HRESULT_FROM_WIN32(RPC_S_CALL_FAILED);

        // The monarch may respond back "you should be a new
        // window, with ID,name of (id, name)". Really the responses are:
@@ -101,7 +101,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
        // starting a defterm, and when that BP gets hit, kill the original
        // monarch, and see what happens here.

-        bool proposedCommandline = false;
+        auto proposedCommandline = false;
        Remoting::ProposeCommandlineResult result{ nullptr };
        while (!proposedCommandline)
        {
@@ -113,7 +113,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                // dies between now and the inspection of
                // `result.ShouldCreateWindow` below, we don't want to explode
                // (since _proposeToMonarch is not try/caught).
-                Remoting::ProposeCommandlineResult outOfProcResult = _monarch.ProposeCommandline(args);
+                auto outOfProcResult = _monarch.ProposeCommandline(args);
                result = winrt::make<implementation::ProposeCommandlineResult>(outOfProcResult);

                proposedCommandline = true;
@@ -550,7 +550,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
        waits[1] = _monarchWaitInterrupt.get();
        const auto peasantID = _peasant.GetID(); // safe: _peasant is in-proc.

-        bool exitThreadRequested = false;
+        auto exitThreadRequested = false;
        while (!exitThreadRequested)
        {
            // At any point in all this, the current monarch might die. If it
@@ -652,7 +652,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                  TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
-                bool foundNewMonarch = false;
+                auto foundNewMonarch = false;
                while (!foundNewMonarch)
                {
                    try
--- a/src/cascadia/ShellExtension/OpenTerminalHere.cpp
+++ b/src/cascadia/ShellExtension/OpenTerminalHere.cpp
@@ -97,7 +97,7 @@ HRESULT OpenTerminalHere::GetTitle(IShellItemArray* /*psiItemArray*/,
    return SHStrDup(resource.data(), ppszName);
 }

-HRESULT OpenTerminalHere::GetState(IShellItemArray* /*psiItemArray*/,
+HRESULT OpenTerminalHere::GetState(IShellItemArray* psiItemArray,
                                   BOOL /*fOkToBeSlow*/,
                                   EXPCMDSTATE* pCmdState)
 {
@@ -106,10 +106,25 @@ HRESULT OpenTerminalHere::GetState(IShellItemArray* /*psiItemArray*/,
    // E_PENDING and this object will be called back on a background thread with
    // fOkToBeSlow == TRUE

-    // We however don't need to bother with any of that, so we'll just return
-    // ECS_ENABLED.
+    // We however don't need to bother with any of that.
+
+    // If no item was selected when the context menu was opened and Explorer
+    // is not at a valid path (e.g. This PC or Quick Access), we should hide
+    // the verb from the context menu.
+    if (psiItemArray == nullptr)
+    {
+        const auto path = this->_GetPathFromExplorer();
+        *pCmdState = path.empty() ? ECS_HIDDEN : ECS_ENABLED;
+    }
+    else
+    {
+        winrt::com_ptr<IShellItem> psi;
+        psiItemArray->GetItemAt(0, psi.put());
+        SFGAOF attributes;
+        const bool isFileSystemItem = (psi->GetAttributes(SFGAO_FILESYSTEM, &attributes) == S_OK);
+        *pCmdState = isFileSystemItem ? ECS_ENABLED : ECS_HIDDEN;
+    }

-    *pCmdState = ECS_ENABLED;
    return S_OK;
 }

--- a/src/cascadia/TerminalApp/ActionPaletteItem.cpp
+++ b/src/cascadia/TerminalApp/ActionPaletteItem.cpp
@@ -18,7 +18,7 @@ using namespace winrt::Microsoft::Terminal::Settings::Model;

 namespace winrt::TerminalApp::implementation
 {
-    ActionPaletteItem::ActionPaletteItem(Microsoft::Terminal::Settings::Model::Command const& command) :
+    ActionPaletteItem::ActionPaletteItem(const Microsoft::Terminal::Settings::Model::Command& command) :
        _Command(command)
    {
        Name(command.Name());
--- a/src/cascadia/TerminalApp/ActionPaletteItem.h
+++ b/src/cascadia/TerminalApp/ActionPaletteItem.h
@@ -11,7 +11,7 @@ namespace winrt::TerminalApp::implementation
    struct ActionPaletteItem : ActionPaletteItemT<ActionPaletteItem, PaletteItem>
    {
        ActionPaletteItem() = default;
-        ActionPaletteItem(Microsoft::Terminal::Settings::Model::Command const& command);
+        ActionPaletteItem(const Microsoft::Terminal::Settings::Model::Command& command);

        WINRT_PROPERTY(Microsoft::Terminal::Settings::Model::Command, Command, nullptr);

--- a/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp
+++ b/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp
@@ -35,18 +35,18 @@ namespace winrt::TerminalApp::implementation
    // Method Description:
    // - Stop previewing the currently previewed action. We can use this to
    //   clean up any state from that action's preview.
-    // - We use _lastPreviewedCommand to determine what type of action to clean up.
+    // - We use _lastPreviewedAction to determine what type of action to clean up.
    // Arguments:
    // - <none>
    // Return Value:
    // - <none>
    void TerminalPage::_EndPreview()
    {
-        if (_lastPreviewedCommand == nullptr || _lastPreviewedCommand.ActionAndArgs() == nullptr)
+        if (_lastPreviewedAction == nullptr)
        {
            return;
        }
-        switch (_lastPreviewedCommand.ActionAndArgs().Action())
+        switch (_lastPreviewedAction.Action())
        {
        case ShortcutAction::SetColorScheme:
        case ShortcutAction::AdjustOpacity:
@@ -55,7 +55,7 @@ namespace winrt::TerminalApp::implementation
            break;
        }
        }
-        _lastPreviewedCommand = nullptr;
+        _lastPreviewedAction = nullptr;
    }

    // Method Description:
@@ -140,6 +140,29 @@ namespace winrt::TerminalApp::implementation
        });
    }

+    void TerminalPage::_PreviewAction(const Settings::Model::ActionAndArgs& args)
+    {
+        switch (args.Action())
+        {
+        case ShortcutAction::SetColorScheme:
+            _PreviewColorScheme(args.Args().try_as<SetColorSchemeArgs>());
+            break;
+        case ShortcutAction::AdjustOpacity:
+            _PreviewAdjustOpacity(args.Args().try_as<AdjustOpacityArgs>());
+            break;
+        }
+
+        // GH#9818 Other ideas for actions that could be preview-able:
+        // * Set Font size
+        // * Set acrylic true/false/opacity?
+        // * SetPixelShaderPath?
+        // * SetWindowTheme (light/dark/system/<some theme from #3327>)?
+
+        // Stash this action, so we know what to do when we're done
+        // previewing.
+        _lastPreviewedAction = args;
+    }
+
    // Method Description:
    // - Handler for the CommandPalette::PreviewAction event. The Command
    //   Palette will raise this even when an action is selected, but _not_
@@ -164,29 +187,7 @@ namespace winrt::TerminalApp::implementation
        }
        else
        {
-            switch (args.ActionAndArgs().Action())
-            {
-            case ShortcutAction::SetColorScheme:
-            {
-                _PreviewColorScheme(args.ActionAndArgs().Args().try_as<SetColorSchemeArgs>());
-                break;
-            }
-            case ShortcutAction::AdjustOpacity:
-            {
-                _PreviewAdjustOpacity(args.ActionAndArgs().Args().try_as<AdjustOpacityArgs>());
-                break;
-            }
-            }
-
-            // GH#9818 Other ideas for actions that could be preview-able:
-            // * Set Font size
-            // * Set acrylic true/false/opacity?
-            // * SetPixelShaderPath?
-            // * SetWindowTheme (light/dark/system/<some theme from #3327>)?
-
-            // Stash this action, so we know what to do when we're done
-            // previewing.
-            _lastPreviewedCommand = args;
+            _PreviewAction(args.ActionAndArgs());
        }
    }
 }
--- a/src/cascadia/TerminalApp/App.base.h
+++ b/src/cascadia/TerminalApp/App.base.h
@@ -7,12 +7,12 @@ namespace winrt::TerminalApp::implementation
    {
        using IXamlType = ::winrt::Windows::UI::Xaml::Markup::IXamlType;

-        IXamlType GetXamlType(::winrt::Windows::UI::Xaml::Interop::TypeName const& type)
+        IXamlType GetXamlType(const ::winrt::Windows::UI::Xaml::Interop::TypeName& type)
        {
            return _appProvider.GetXamlType(type);
        }

-        IXamlType GetXamlType(::winrt::hstring const& fullName)
+        IXamlType GetXamlType(const ::winrt::hstring& fullName)
        {
            return _appProvider.GetXamlType(fullName);
        }
--- a/src/cascadia/TerminalApp/App.cpp
+++ b/src/cascadia/TerminalApp/App.cpp
@@ -44,7 +44,7 @@ namespace winrt::TerminalApp::implementation
    /// will be used such as when the application is launched to open a specific file.
    /// </summary>
    /// <param name="e">Details about the launch request and process.</param>
-    void App::OnLaunched(LaunchActivatedEventArgs const& /*e*/)
+    void App::OnLaunched(const LaunchActivatedEventArgs& /*e*/)
    {
        // if this is a UWP... it means its our problem to hook up the content to the window here.
        if (_isUwp)
--- a/src/cascadia/TerminalApp/App.h
+++ b/src/cascadia/TerminalApp/App.h
@@ -12,7 +12,7 @@ namespace winrt::TerminalApp::implementation
    {
    public:
        App();
-        void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs const&);
+        void OnLaunched(const Windows::ApplicationModel::Activation::LaunchActivatedEventArgs&);

        TerminalApp::AppLogic Logic();

--- a/src/cascadia/TerminalApp/App.xaml
+++ b/src/cascadia/TerminalApp/App.xaml
@@ -46,10 +46,87 @@
                                     Color="{ThemeResource SystemErrorTextColor}" />

                    <!--  Suppress top padding  -->
-                    <Thickness x:Key="TabViewHeaderPadding">9,0,8,0</Thickness>
+                    <Thickness x:Key="TabViewHeaderPadding">9,0,5,0</Thickness>

-                    <!--  Remove when implementing WinUI 2.6  -->
-                    <Thickness x:Key="FlyoutContentPadding">12</Thickness>
+                    <!--  Shadow that can be used by any control.  -->
+                    <ThemeShadow x:Name="SharedShadow" />
+
+                    <!--  Colored button which changes on hover/press  -->
+                    <Style x:Key="ColorButtonStyle"
+                           TargetType="Button">
+                        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource ButtonBorderBrush}" />
+                        <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
+                        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+                        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+                        <Setter Property="FocusVisualMargin" Value="-3" />
+                        <Setter Property="Width" Value="32" />
+                        <Setter Property="Height" Value="32" />
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="Button">
+                                    <Grid>
+                                        <Border x:Name="ColorButtonBackground"
+                                                Background="{TemplateBinding Background}"
+                                                BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                                                BorderBrush="{TemplateBinding BorderBrush}"
+                                                BorderThickness="{TemplateBinding BorderThickness}"
+                                                CornerRadius="{TemplateBinding CornerRadius}" />
+                                        <VisualStateManager.VisualStateGroups>
+                                            <VisualStateGroup x:Name="CommonStates">
+                                                <VisualState x:Name="Normal" />
+
+                                                <VisualState x:Name="PointerOver">
+                                                    <Storyboard>
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ColorButtonBackground"
+                                                                                       Storyboard.TargetProperty="Opacity">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="0.9" />
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ColorButtonBackground"
+                                                                                       Storyboard.TargetProperty="BorderBrush">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource ButtonBorderBrushPointerOver}" />
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                    </Storyboard>
+                                                </VisualState>
+
+                                                <VisualState x:Name="Pressed">
+                                                    <Storyboard>
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ColorButtonBackground"
+                                                                                       Storyboard.TargetProperty="Opacity">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="0.8" />
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ColorButtonBackground"
+                                                                                       Storyboard.TargetProperty="BorderBrush">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource ButtonBorderBrushPressed}" />
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                    </Storyboard>
+                                                </VisualState>
+
+                                                <VisualState x:Name="Disabled">
+                                                    <Storyboard>
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ColorButtonBackground"
+                                                                                       Storyboard.TargetProperty="Background">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource ButtonBackgroundDisabled}" />
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ColorButtonBackground"
+                                                                                       Storyboard.TargetProperty="BorderBrush">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource ButtonBorderBrushDisabled}" />
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                    </Storyboard>
+                                                </VisualState>
+                                            </VisualStateGroup>
+                                        </VisualStateManager.VisualStateGroups>
+                                    </Grid>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>

                    <ResourceDictionary.ThemeDictionaries>
                        <ResourceDictionary x:Key="Dark">
@@ -76,8 +153,6 @@

                            <StaticResource x:Key="UnfocusedBorderBrush"
                                            ResourceKey="ApplicationPageBackgroundThemeBrush" />
-
-
                        </ResourceDictionary>

                        <ResourceDictionary x:Key="Light">
--- a/src/cascadia/TerminalApp/AppActionHandlers.cpp
+++ b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -189,6 +189,18 @@ namespace winrt::TerminalApp::implementation
        }
        else if (const auto& realArgs = args.ActionArgs().try_as<SplitPaneArgs>())
        {
+            if (const auto& newTerminalArgs{ realArgs.TerminalArgs() })
+            {
+                if (const auto index = realArgs.TerminalArgs().ProfileIndex())
+                {
+                    if (gsl::narrow<uint32_t>(index.Value()) >= _settings.ActiveProfiles().Size())
+                    {
+                        args.Handled(false);
+                        return;
+                    }
+                }
+            }
+
            _SplitPane(realArgs.SplitDirection(),
                       // This is safe, we're already filtering so the value is (0, 1)
                       ::base::saturated_cast<float>(realArgs.SplitSize()),
@@ -266,6 +278,55 @@ namespace winrt::TerminalApp::implementation
        args.Handled(true);
    }

+    void TerminalPage::_HandleScrollToMark(const IInspectable& /*sender*/,
+                                           const ActionEventArgs& args)
+    {
+        if (const auto& realArgs = args.ActionArgs().try_as<ScrollToMarkArgs>())
+        {
+            _ApplyToActiveControls([&realArgs](auto& control) {
+                control.ScrollToMark(realArgs.Direction());
+            });
+        }
+        args.Handled(true);
+    }
+    void TerminalPage::_HandleAddMark(const IInspectable& /*sender*/,
+                                      const ActionEventArgs& args)
+    {
+        if (const auto& realArgs = args.ActionArgs().try_as<AddMarkArgs>())
+        {
+            _ApplyToActiveControls([realArgs](auto& control) {
+                Control::ScrollMark mark;
+                if (realArgs.Color())
+                {
+                    mark.Color.Color = realArgs.Color().Value();
+                    mark.Color.HasValue = true;
+                }
+                else
+                {
+                    mark.Color.HasValue = false;
+                }
+                control.AddMark(mark);
+            });
+        }
+        args.Handled(true);
+    }
+    void TerminalPage::_HandleClearMark(const IInspectable& /*sender*/,
+                                        const ActionEventArgs& args)
+    {
+        _ApplyToActiveControls([](auto& control) {
+            control.ClearMark();
+        });
+        args.Handled(true);
+    }
+    void TerminalPage::_HandleClearAllMarks(const IInspectable& /*sender*/,
+                                            const ActionEventArgs& args)
+    {
+        _ApplyToActiveControls([](auto& control) {
+            control.ClearAllMarks();
+        });
+        args.Handled(true);
+    }
+
    void TerminalPage::_HandleFindMatch(const IInspectable& /*sender*/,
                                        const ActionEventArgs& args)
    {
@@ -305,6 +366,18 @@ namespace winrt::TerminalApp::implementation
        }
        else if (const auto& realArgs = args.ActionArgs().try_as<NewTabArgs>())
        {
+            if (const auto& newTerminalArgs{ realArgs.TerminalArgs() })
+            {
+                if (const auto index = newTerminalArgs.ProfileIndex())
+                {
+                    if (gsl::narrow<uint32_t>(index.Value()) >= _settings.ActiveProfiles().Size())
+                    {
+                        args.Handled(false);
+                        return;
+                    }
+                }
+            }
+
            LOG_IF_FAILED(_OpenNewTab(realArgs.TerminalArgs()));
            args.Handled(true);
        }
@@ -837,7 +910,7 @@ namespace winrt::TerminalApp::implementation
        if (WindowRenamer() == nullptr)
        {
            // We need to use FindName to lazy-load this object
-            if (MUX::Controls::TeachingTip tip{ FindName(L"WindowRenamer").try_as<MUX::Controls::TeachingTip>() })
+            if (auto tip{ FindName(L"WindowRenamer").try_as<MUX::Controls::TeachingTip>() })
            {
                tip.Closed({ get_weak(), &TerminalPage::_FocusActiveControl });
            }
@@ -1009,4 +1082,34 @@ namespace winrt::TerminalApp::implementation
            }
        }
    }
+
+    void TerminalPage::_HandleSelectAll(const IInspectable& /*sender*/,
+                                        const ActionEventArgs& args)
+    {
+        if (const auto& control{ _GetActiveControl() })
+        {
+            control.SelectAll();
+            args.Handled(true);
+        }
+    }
+
+    void TerminalPage::_HandleMarkMode(const IInspectable& /*sender*/,
+                                       const ActionEventArgs& args)
+    {
+        if (const auto& control{ _GetActiveControl() })
+        {
+            control.ToggleMarkMode();
+            args.Handled(true);
+        }
+    }
+
+    void TerminalPage::_HandleToggleBlockSelection(const IInspectable& /*sender*/,
+                                                   const ActionEventArgs& args)
+    {
+        if (const auto& control{ _GetActiveControl() })
+        {
+            const auto handled = control.ToggleBlockSelection();
+            args.Handled(handled);
+        }
+    }
 }
--- a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
+++ b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
@@ -30,7 +30,7 @@ AppCommandlineArgs::AppCommandlineArgs()
 // - nonzero return values are defined in CLI::ExitCodes
 int AppCommandlineArgs::ParseCommand(const Commandline& command)
 {
-    const int argc = static_cast<int>(command.Argc());
+    const auto argc = static_cast<int>(command.Argc());

    // Stash a pointer to the current Commandline instance we're parsing.
    // When we're trying to parse the commandline for a new-tab/split-pane
@@ -809,7 +809,7 @@ void AppCommandlineArgs::_addCommandsForArg(std::vector<Commandline>& commands,
        else
        {
            // Harder case: There was a match.
-            const bool matchedFirstChar = match.position(0) == 0;
+            const auto matchedFirstChar = match.position(0) == 0;
            // If the match was at the beginning of the string, then the
            // next arg should be "", since there was no content before the
            // delimiter. Otherwise, add one, since the regex will include
@@ -1013,7 +1013,7 @@ int AppCommandlineArgs::ParseArgs(const winrt::Microsoft::Terminal::Settings::Mo
    // Convert the commandline into an array of args with
    // CommandLineToArgvW, similar to how the app typically does when
    // called from the commandline.
-    int argc = 0;
+    auto argc = 0;
    wil::unique_any<LPWSTR*, decltype(&::LocalFree), ::LocalFree> argv{ CommandLineToArgvW(args.Commandline().c_str(), &argc) };
    if (argv)
    {
--- a/src/cascadia/TerminalApp/AppKeyBindings.h
+++ b/src/cascadia/TerminalApp/AppKeyBindings.h
@@ -18,8 +18,8 @@ namespace winrt::TerminalApp::implementation
    {
        AppKeyBindings() = default;

-        bool TryKeyChord(winrt::Microsoft::Terminal::Control::KeyChord const& kc);
-        bool IsKeyChordExplicitlyUnbound(winrt::Microsoft::Terminal::Control::KeyChord const& kc);
+        bool TryKeyChord(const winrt::Microsoft::Terminal::Control::KeyChord& kc);
+        bool IsKeyChordExplicitlyUnbound(const winrt::Microsoft::Terminal::Control::KeyChord& kc);

        void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);
        void SetActionMap(const Microsoft::Terminal::Settings::Model::IActionMapView& actionMap);
--- a/src/cascadia/TerminalApp/AppLogic.cpp
+++ b/src/cascadia/TerminalApp/AppLogic.cpp
@@ -122,10 +122,10 @@ static Documents::Run _BuildErrorRun(const winrt::hstring& text, const ResourceD
    textRun.Text(text);

    // Color the text red (light theme) or yellow (dark theme) based on the system theme
-    winrt::IInspectable key = winrt::box_value(L"ErrorTextBrush");
+    auto key = winrt::box_value(L"ErrorTextBrush");
    if (resources.HasKey(key))
    {
-        winrt::IInspectable g = resources.Lookup(key);
+        auto g = resources.Lookup(key);
        auto brush = g.try_as<winrt::Windows::UI::Xaml::Media::Brush>();
        textRun.Foreground(brush);
    }
@@ -601,7 +601,7 @@ namespace winrt::TerminalApp::implementation

        winrt::Windows::Foundation::Size proposedSize{};

-        const float scale = static_cast<float>(dpi) / static_cast<float>(USER_DEFAULT_SCREEN_DPI);
+        const auto scale = static_cast<float>(dpi) / static_cast<float>(USER_DEFAULT_SCREEN_DPI);
        if (const auto layout = _root->LoadPersistedLayout(_settings))
        {
            if (layout.InitialSize())
@@ -781,7 +781,7 @@ namespace winrt::TerminalApp::implementation
    // - S_OK if we successfully parsed the settings, otherwise an appropriate HRESULT.
    [[nodiscard]] HRESULT AppLogic::_TryLoadSettings() noexcept
    {
-        HRESULT hr = E_FAIL;
+        auto hr = E_FAIL;

        try
        {
@@ -1123,6 +1123,22 @@ namespace winrt::TerminalApp::implementation
        }
    }

+    // Method Description:
+    // - Used to tell the PTY connection that the window visibility has changed.
+    //   The underlying PTY might need to expose window visibility status to the
+    //   client application for the `::GetConsoleWindow()` API.
+    // Arguments:
+    // - showOrHide - True is show; false is hide.
+    // Return Value:
+    // - <none>
+    void AppLogic::WindowVisibilityChanged(const bool showOrHide)
+    {
+        if (_root)
+        {
+            _root->WindowVisibilityChanged(showOrHide);
+        }
+    }
+
    // Method Description:
    // - Implements the F7 handler (per GH#638)
    // - Implements the Alt handler (per GH#6421)
@@ -1354,7 +1370,7 @@ namespace winrt::TerminalApp::implementation
            // now.
            if (parsedTarget.empty())
            {
-                int32_t windowId = WindowingBehaviorUseNew;
+                auto windowId = WindowingBehaviorUseNew;
                switch (windowingBehavior)
                {
                case WindowingMode::UseNew:
@@ -1375,7 +1391,7 @@ namespace winrt::TerminalApp::implementation
            // window's ID:
            try
            {
-                int32_t windowId = ::base::saturated_cast<int32_t>(std::stoi(parsedTarget));
+                auto windowId = ::base::saturated_cast<int32_t>(std::stoi(parsedTarget));

                // If the user provides _any_ negative number, then treat it as
                // -1, for "use a new window".
--- a/src/cascadia/TerminalApp/AppLogic.h
+++ b/src/cascadia/TerminalApp/AppLogic.h
@@ -114,6 +114,7 @@ namespace winrt::TerminalApp::implementation
        bool OnDirectKeyEvent(const uint32_t vkey, const uint8_t scanCode, const bool down);

        void CloseWindow(Microsoft::Terminal::Settings::Model::LaunchPosition position);
+        void WindowVisibilityChanged(const bool showOrHide);

        winrt::TerminalApp::TaskbarState TaskbarState();

@@ -207,6 +208,7 @@ namespace winrt::TerminalApp::implementation
        FORWARDED_TYPED_EVENT(CloseRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, CloseRequested);
        FORWARDED_TYPED_EVENT(OpenSystemMenu, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, OpenSystemMenu);
        FORWARDED_TYPED_EVENT(QuitRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, QuitRequested);
+        FORWARDED_TYPED_EVENT(ShowWindowChanged, Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Control::ShowWindowArgs, _root, ShowWindowChanged);

 #ifdef UNIT_TESTING
        friend class TerminalAppLocalTests::CommandlineTest;
--- a/src/cascadia/TerminalApp/AppLogic.idl
+++ b/src/cascadia/TerminalApp/AppLogic.idl
@@ -91,6 +91,7 @@ namespace TerminalApp
        Single CalcSnappedDimension(Boolean widthOrHeight, Single dimension);
        void TitlebarClicked();
        void CloseWindow(Microsoft.Terminal.Settings.Model.LaunchPosition position);
+        void WindowVisibilityChanged(Boolean showOrHide);

        TaskbarState TaskbarState{ get; };

@@ -132,5 +133,6 @@ namespace TerminalApp
        event Windows.Foundation.TypedEventHandler<Object, Object> OpenSystemMenu;
        event Windows.Foundation.TypedEventHandler<Object, Object> QuitRequested;
        event Windows.Foundation.TypedEventHandler<Object, TerminalApp.SystemMenuChangeArgs> SystemMenuChangeRequested;
+        event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Control.ShowWindowArgs> ShowWindowChanged;
    }
 }
--- a/src/cascadia/TerminalApp/ColorHelper.cpp
+++ b/src/cascadia/TerminalApp/ColorHelper.cpp
@@ -67,9 +67,9 @@ HSL ColorHelper::RgbToHsl(const winrt::Windows::UI::Color& color)

    // three decimal places after the comma ought
    // to be enough for everybody - Bill Gates, 1981
-    float finalH = std::roundf(h * 60);
-    float finalS = std::roundf(s * 1000) / 1000;
-    float finalL = std::roundf(l * 1000) / 1000;
+    auto finalH = std::roundf(h * 60);
+    auto finalS = std::roundf(s * 1000) / 1000;
+    auto finalL = std::roundf(l * 1000) / 1000;

    return HSL{ finalH, finalS, finalL };
 }
@@ -264,6 +264,6 @@ float ColorHelper::GetLuminance(const winrt::Windows::UI::Color& color)
    {
        B = std::pow(((BsRGB + 0.055f) / 1.055f), 2.4f);
    }
-    float luminance = (0.2126f * R) + (0.7152f * G) + (0.0722f * B);
+    auto luminance = (0.2126f * R) + (0.7152f * G) + (0.0722f * B);
    return std::roundf(luminance * 10000) / 10000.f;
 }
--- a/src/cascadia/TerminalApp/ColorPickupFlyout.cpp
+++ b/src/cascadia/TerminalApp/ColorPickupFlyout.cpp
@@ -31,11 +31,10 @@ namespace winrt::TerminalApp::implementation
    // - sender: the rectangle that got clicked
    // Return Value:
    // - <none>
-    void ColorPickupFlyout::ColorButton_Click(IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const&)
+    void ColorPickupFlyout::ColorButton_Click(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs&)
    {
        auto button{ sender.as<Windows::UI::Xaml::Controls::Button>() };
-        auto rectangle{ button.Content().as<Windows::UI::Xaml::Shapes::Rectangle>() };
-        auto rectClr{ rectangle.Fill().as<Windows::UI::Xaml::Media::SolidColorBrush>() };
+        auto rectClr{ button.Background().as<Windows::UI::Xaml::Media::SolidColorBrush>() };
        _ColorSelectedHandlers(rectClr.Color());
        Hide();
    }
@@ -47,7 +46,7 @@ namespace winrt::TerminalApp::implementation
    // - <none>
    // Return Value:
    // - <none>
-    void ColorPickupFlyout::ClearColorButton_Click(IInspectable const&, Windows::UI::Xaml::RoutedEventArgs const&)
+    void ColorPickupFlyout::ClearColorButton_Click(const IInspectable&, const Windows::UI::Xaml::RoutedEventArgs&)
    {
        _ColorClearedHandlers();
        Hide();
@@ -61,7 +60,7 @@ namespace winrt::TerminalApp::implementation
    // - <none>
    // Return Value:
    // - <none>
-    void ColorPickupFlyout::ShowColorPickerButton_Click(Windows::Foundation::IInspectable const&, Windows::UI::Xaml::RoutedEventArgs const&)
+    void ColorPickupFlyout::ShowColorPickerButton_Click(const Windows::Foundation::IInspectable&, const Windows::UI::Xaml::RoutedEventArgs&)
    {
        auto visibility = customColorPanel().Visibility();
        if (visibility == winrt::Windows::UI::Xaml::Visibility::Collapsed)
@@ -81,7 +80,7 @@ namespace winrt::TerminalApp::implementation
    // - <none>
    // Return Value:
    // - <none>
-    void ColorPickupFlyout::CustomColorButton_Click(Windows::Foundation::IInspectable const&, Windows::UI::Xaml::RoutedEventArgs const&)
+    void ColorPickupFlyout::CustomColorButton_Click(const Windows::Foundation::IInspectable&, const Windows::UI::Xaml::RoutedEventArgs&)
    {
        auto color = customColorPicker().Color();
        _ColorSelectedHandlers(color);
--- a/src/cascadia/TerminalApp/ColorPickupFlyout.h
+++ b/src/cascadia/TerminalApp/ColorPickupFlyout.h
@@ -7,10 +7,10 @@ namespace winrt::TerminalApp::implementation
    {
        ColorPickupFlyout();

-        void ColorButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
-        void ShowColorPickerButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
-        void CustomColorButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
-        void ClearColorButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
+        void ColorButton_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
+        void ShowColorPickerButton_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
+        void CustomColorButton_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
+        void ClearColorButton_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
        void ColorPicker_ColorChanged(const Microsoft::UI::Xaml::Controls::ColorPicker&, const Microsoft::UI::Xaml::Controls::ColorChangedEventArgs& args);

        WINRT_CALLBACK(ColorCleared, TerminalApp::ColorClearedArgs);
--- a/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
+++ b/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
@@ -5,6 +5,8 @@
        xmlns:local="using:TerminalApp"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+        Placement="Bottom"
+        ShouldConstrainToRootBounds="False"
        mc:Ignorable="d">
    <Flyout.FlyoutPresenterStyle>
        <Style TargetType="FlyoutPresenter">
@@ -23,164 +25,105 @@
                                       MaximumRowsOrColumns="4"
                                       Orientation="Horizontal">
                    <VariableSizedWrapGrid.Resources>
-                        <Style TargetType="Rectangle">
-                            <Setter Property="Width" Value="30" />
-                            <Setter Property="Height" Value="30" />
-                        </Style>
-                        <Style TargetType="Button">
-                            <Setter Property="Padding" Value="-1" />
+                        <Style x:Name="ColorPickerColorButtonStyle"
+                               BasedOn="{StaticResource ColorButtonStyle}"
+                               TargetType="Button">
                            <Setter Property="Margin" Value="2" />
-                            <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-                            <Setter Property="BorderBrush" Value="{StaticResource SystemBaseLowColor}" />
                        </Style>
+                        <Style BasedOn="{StaticResource ColorPickerColorButtonStyle}"
+                               TargetType="Button" />
                    </VariableSizedWrapGrid.Resources>
+
                    <Button x:Uid="CrimsonColorButton"
                            AutomationProperties.Name="Crimson"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="Crimson" />
-                        </Button.Content>
-                    </Button>
+                            Background="Crimson"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="SteelBlueColorButton"
                            AutomationProperties.Name="SteelBlue"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="SteelBlue" />
-                        </Button.Content>
-                    </Button>
+                            Background="SteelBlue"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="MediumSeaGreenColorButton"
                            AutomationProperties.Name="MediumSeaGreen"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="MediumSeaGreen" />
-                        </Button.Content>
-                    </Button>
+                            Background="MediumSeaGreen"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="DarkOrangeColorButton"
                            AutomationProperties.Name="DarkOrange"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="DarkOrange" />
-                        </Button.Content>
-                    </Button>
+                            Background="DarkOrange"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="MediumVioletRedColorButton"
                            AutomationProperties.Name="MediumVioletRed"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="MediumVioletRed" />
-                        </Button.Content>
-                    </Button>
+                            Background="MediumVioletRed"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="DodgerBlueColorButton"
                            AutomationProperties.Name="DodgerBlue"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="DodgerBlue" />
-                        </Button.Content>
-                    </Button>
+                            Background="DodgerBlue"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="LimeGreenColorButton"
                            AutomationProperties.Name="LimeGreen"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="LimeGreen" />
-                        </Button.Content>
-                    </Button>
+                            Background="LimeGreen"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="YellowColorButton"
                            AutomationProperties.Name="Yellow"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="Yellow" />
-                        </Button.Content>
-                    </Button>
+                            Background="Yellow"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="BlueVioletColorButton"
                            AutomationProperties.Name="BlueViolet"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="BlueViolet" />
-                        </Button.Content>
-                    </Button>
+                            Background="BlueViolet"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="SlateBlueColorButton"
                            AutomationProperties.Name="SlateBlue"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="SlateBlue" />
-                        </Button.Content>
-                    </Button>
+                            Background="SlateBlue"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="LimeColorButton"
                            AutomationProperties.Name="Lime"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="Lime" />
-                        </Button.Content>
-                    </Button>
+                            Background="Lime"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="TanColorButton"
                            AutomationProperties.Name="Tan"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="Tan" />
-                        </Button.Content>
-                    </Button>
+                            Background="Tan"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="MagentaColorButton"
                            AutomationProperties.Name="Magenta"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="Magenta" />
-                        </Button.Content>
-                    </Button>
+                            Background="Magenta"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="CyanColorButton"
                            AutomationProperties.Name="Cyan"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="Cyan" />
-                        </Button.Content>
-                    </Button>
+                            Background="Cyan"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="SkyBlueColorButton"
                            AutomationProperties.Name="SkyBlue"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="SkyBlue" />
-                        </Button.Content>
-                    </Button>
+                            Background="SkyBlue"
+                            Click="ColorButton_Click" />
                    <Button x:Uid="DarkGrayColorButton"
                            AutomationProperties.Name="DarkGray"
-                            Click="ColorButton_Click">
-                        <Button.Content>
-                            <Rectangle Fill="DarkGray" />
-                        </Button.Content>
-                    </Button>
+                            Background="DarkGray"
+                            Click="ColorButton_Click" />
                </VariableSizedWrapGrid>
            </Grid>
-            <Grid Margin="0,12,0,0"
-                  Padding="-2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <StackPanel Margin="0,12,0,0"
+                        Orientation="Horizontal"
+                        Spacing="8">
                <Button x:Name="ClearColorButton"
                        x:Uid="TabColorClearButton"
                        Grid.Column="0"
-                        Margin="2"
                        HorizontalAlignment="Stretch"
                        Click="ClearColorButton_Click"
                        Content="Reset" />
                <ToggleButton x:Name="CustomColorButton"
                              x:Uid="TabColorCustomButton"
                              Grid.Column="1"
-                              Margin="2"
                              HorizontalAlignment="Stretch"
                              Click="ShowColorPickerButton_Click"
                              Content="Custom"
                              IsChecked="False" />
-            </Grid>
+            </StackPanel>
        </StackPanel>
-        <Grid x:Name="customColorPanel"
-              Margin="16,0,0,0"
-              Visibility="Collapsed">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
+        <StackPanel x:Name="customColorPanel"
+                    Margin="16,0,0,0"
+                    Spacing="12"
+                    Visibility="Collapsed">
            <muxc:ColorPicker x:Name="customColorPicker"
                              Grid.Row="0"
-                              Margin="0,0,0,12"
                              ColorChanged="ColorPicker_ColorChanged"
                              FontSize="10"
                              IsAlphaEnabled="False"
@@ -198,6 +141,6 @@
                    Click="CustomColorButton_Click"
                    Content="OK"
                    Style="{ThemeResource AccentButtonStyle}" />
-        </Grid>
+        </StackPanel>
    </StackPanel>
 </Flyout>
--- a/src/cascadia/TerminalApp/CommandLinePaletteItem.cpp
+++ b/src/cascadia/TerminalApp/CommandLinePaletteItem.cpp
@@ -18,7 +18,7 @@ using namespace winrt::Microsoft::Terminal::Settings::Model;

 namespace winrt::TerminalApp::implementation
 {
-    CommandLinePaletteItem::CommandLinePaletteItem(winrt::hstring const& commandLine) :
+    CommandLinePaletteItem::CommandLinePaletteItem(const winrt::hstring& commandLine) :
        _CommandLine(commandLine)
    {
        Name(commandLine);
--- a/src/cascadia/TerminalApp/CommandLinePaletteItem.h
+++ b/src/cascadia/TerminalApp/CommandLinePaletteItem.h
@@ -11,7 +11,7 @@ namespace winrt::TerminalApp::implementation
    struct CommandLinePaletteItem : CommandLinePaletteItemT<CommandLinePaletteItem, PaletteItem>
    {
        CommandLinePaletteItem() = default;
-        CommandLinePaletteItem(winrt::hstring const& commandLine);
+        CommandLinePaletteItem(const winrt::hstring& commandLine);

        WINRT_PROPERTY(winrt::hstring, CommandLine);
    };
--- a/src/cascadia/TerminalApp/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -39,17 +39,6 @@ namespace winrt::TerminalApp::implementation

        _switchToMode(CommandPaletteMode::ActionMode);

-        if (CommandPaletteShadow())
-        {
-            // Hook up the shadow on the command palette to the backdrop that
-            // will actually show it. This needs to be done at runtime, and only
-            // if the shadow actually exists. ThemeShadow isn't supported below
-            // version 18362.
-            CommandPaletteShadow().Receivers().Append(_shadowBackdrop());
-            // "raise" the command palette up by 16 units, so it will cast a shadow.
-            _backdrop().Translation({ 0, 0, 16 });
-        }
-
        // Whatever is hosting us will enable us by setting our visibility to
        // "Visible". When that happens, set focus to our search box.
        RegisterPropertyChangedCallback(UIElement::VisibilityProperty(), [this](auto&&, auto&&) {
@@ -119,7 +108,7 @@ namespace winrt::TerminalApp::implementation
    void CommandPalette::SelectNextItem(const bool moveDown)
    {
        auto selected = _filteredActionsView().SelectedIndex();
-        const int numItems = ::base::saturated_cast<int>(_filteredActionsView().Items().Size());
+        const auto numItems = ::base::saturated_cast<int>(_filteredActionsView().Items().Size());

        // Do not try to select an item if
        // - the list is empty
@@ -262,8 +251,8 @@ namespace winrt::TerminalApp::implementation
        }
    }

-    void CommandPalette::_previewKeyDownHandler(IInspectable const& /*sender*/,
-                                                Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e)
+    void CommandPalette::_previewKeyDownHandler(const IInspectable& /*sender*/,
+                                                const Windows::UI::Xaml::Input::KeyRoutedEventArgs& e)
    {
        const auto key = e.OriginalKey();
        const auto scanCode = e.KeyStatus().ScanCode;
@@ -411,8 +400,8 @@ namespace winrt::TerminalApp::implementation
        return handled;
    }

-    void CommandPalette::_keyUpHandler(IInspectable const& /*sender*/,
-                                       Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e)
+    void CommandPalette::_keyUpHandler(const IInspectable& /*sender*/,
+                                       const Windows::UI::Xaml::Input::KeyRoutedEventArgs& e)
    {
        if (_currentMode == CommandPaletteMode::TabSwitchMode)
        {
@@ -453,8 +442,8 @@ namespace winrt::TerminalApp::implementation
    // - <unused>
    // Return Value:
    // - <none>
-    void CommandPalette::_rootPointerPressed(Windows::Foundation::IInspectable const& /*sender*/,
-                                             Windows::UI::Xaml::Input::PointerRoutedEventArgs const& /*e*/)
+    void CommandPalette::_rootPointerPressed(const Windows::Foundation::IInspectable& /*sender*/,
+                                             const Windows::UI::Xaml::Input::PointerRoutedEventArgs& /*e*/)
    {
        if (Visibility() != Visibility::Collapsed)
        {
@@ -476,8 +465,8 @@ namespace winrt::TerminalApp::implementation
    // - <unused>
    // Return Value:
    // - <none>
-    void CommandPalette::_lostFocusHandler(Windows::Foundation::IInspectable const& /*sender*/,
-                                           Windows::UI::Xaml::RoutedEventArgs const& /*args*/)
+    void CommandPalette::_lostFocusHandler(const Windows::Foundation::IInspectable& /*sender*/,
+                                           const Windows::UI::Xaml::RoutedEventArgs& /*args*/)
    {
        const auto flyout = _searchBox().ContextFlyout();
        if (flyout && flyout.IsOpen())
@@ -511,8 +500,8 @@ namespace winrt::TerminalApp::implementation
    // - e: the PointerRoutedEventArgs that we want to mark as handled
    // Return Value:
    // - <none>
-    void CommandPalette::_backdropPointerPressed(Windows::Foundation::IInspectable const& /*sender*/,
-                                                 Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e)
+    void CommandPalette::_backdropPointerPressed(const Windows::Foundation::IInspectable& /*sender*/,
+                                                 const Windows::UI::Xaml::Input::PointerRoutedEventArgs& e)
    {
        e.Handled(true);
    }
@@ -525,8 +514,8 @@ namespace winrt::TerminalApp::implementation
    // - e: an ItemClickEventArgs who's ClickedItem() will be the command that was clicked on.
    // Return Value:
    // - <none>
-    void CommandPalette::_listItemClicked(Windows::Foundation::IInspectable const& /*sender*/,
-                                          Windows::UI::Xaml::Controls::ItemClickEventArgs const& e)
+    void CommandPalette::_listItemClicked(const Windows::Foundation::IInspectable& /*sender*/,
+                                          const Windows::UI::Xaml::Controls::ItemClickEventArgs& e)
    {
        const auto selectedCommand = e.ClickedItem();
        if (const auto filteredCommand = selectedCommand.try_as<winrt::TerminalApp::FilteredCommand>())
@@ -543,8 +532,8 @@ namespace winrt::TerminalApp::implementation
    // - sender: the button that got clicked
    // Return Value:
    // - <none>
-    void CommandPalette::_moveBackButtonClicked(Windows::Foundation::IInspectable const& /*sender*/,
-                                                Windows::UI::Xaml::RoutedEventArgs const&)
+    void CommandPalette::_moveBackButtonClicked(const Windows::Foundation::IInspectable& /*sender*/,
+                                                const Windows::UI::Xaml::RoutedEventArgs&)
    {
        _PreviewActionHandlers(*this, nullptr);
        _nestedActionStack.Clear();
@@ -628,7 +617,7 @@ namespace winrt::TerminalApp::implementation
    // - command: the Command to dispatch. This might be null.
    // Return Value:
    // - <none>
-    void CommandPalette::_dispatchCommand(winrt::TerminalApp::FilteredCommand const& filteredCommand)
+    void CommandPalette::_dispatchCommand(const winrt::TerminalApp::FilteredCommand& filteredCommand)
    {
        if (_currentMode == CommandPaletteMode::CommandlineMode)
        {
@@ -724,7 +713,7 @@ namespace winrt::TerminalApp::implementation
    // - filteredCommand - Selected filtered command - might be null
    // Return Value:
    // - <none>
-    void CommandPalette::_switchToTab(winrt::TerminalApp::FilteredCommand const& filteredCommand)
+    void CommandPalette::_switchToTab(const winrt::TerminalApp::FilteredCommand& filteredCommand)
    {
        if (filteredCommand)
        {
@@ -744,7 +733,7 @@ namespace winrt::TerminalApp::implementation
    // - filteredCommand - Selected filtered command - might be null
    // Return Value:
    // - <none>
-    void CommandPalette::_dispatchCommandline(winrt::TerminalApp::FilteredCommand const& command)
+    void CommandPalette::_dispatchCommandline(const winrt::TerminalApp::FilteredCommand& command)
    {
        const auto filteredCommand = command ? command : _buildCommandLineCommand(winrt::hstring(_getTrimmedInput()));
        if (filteredCommand.has_value())
@@ -804,8 +793,8 @@ namespace winrt::TerminalApp::implementation
    // - <unused>
    // Return Value:
    // - <none>
-    void CommandPalette::_filterTextChanged(IInspectable const& /*sender*/,
-                                            Windows::UI::Xaml::RoutedEventArgs const& /*args*/)
+    void CommandPalette::_filterTextChanged(const IInspectable& /*sender*/,
+                                            const Windows::UI::Xaml::RoutedEventArgs& /*args*/)
    {
        if (_currentMode == CommandPaletteMode::CommandlineMode)
        {
@@ -906,7 +895,7 @@ namespace winrt::TerminalApp::implementation
        _actionMap = actionMap;
    }

-    void CommandPalette::SetCommands(Collections::IVector<Command> const& actions)
+    void CommandPalette::SetCommands(const Collections::IVector<Command>& actions)
    {
        _allCommands.Clear();
        for (const auto& action : actions)
@@ -934,8 +923,8 @@ namespace winrt::TerminalApp::implementation
    // Return Value:
    // - <none>
    void CommandPalette::_bindTabs(
-        Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase> const& source,
-        Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand> const& target)
+        const Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase>& source,
+        const Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand>& target)
    {
        target.Clear();
        for (const auto& tab : source)
@@ -946,13 +935,13 @@ namespace winrt::TerminalApp::implementation
        }
    }

-    void CommandPalette::SetTabs(Collections::IObservableVector<TabBase> const& tabs, Collections::IObservableVector<TabBase> const& mruTabs)
+    void CommandPalette::SetTabs(const Collections::IObservableVector<TabBase>& tabs, const Collections::IObservableVector<TabBase>& mruTabs)
    {
        _bindTabs(tabs, _tabActions);
        _bindTabs(mruTabs, _mruTabActions);
    }

-    void CommandPalette::EnableCommandPaletteMode(CommandPaletteLaunchMode const launchMode)
+    void CommandPalette::EnableCommandPaletteMode(const CommandPaletteLaunchMode launchMode)
    {
        const auto mode = (launchMode == CommandPaletteLaunchMode::CommandLine) ?
                              CommandPaletteMode::CommandlineMode :
@@ -1088,11 +1077,11 @@ namespace winrt::TerminalApp::implementation
        // This allows WinUI to nicely animate the ListView as it changes.
        for (uint32_t i = 0; i < _filteredActions.Size() && i < actions.size(); i++)
        {
-            for (uint32_t j = i; j < _filteredActions.Size(); j++)
+            for (auto j = i; j < _filteredActions.Size(); j++)
            {
                if (_filteredActions.GetAt(j).Item() == actions[i].Item())
                {
-                    for (uint32_t k = i; k < j; k++)
+                    for (auto k = i; k < j; k++)
                    {
                        _filteredActions.RemoveAt(i);
                    }
@@ -1174,8 +1163,8 @@ namespace winrt::TerminalApp::implementation
    // Return Value:
    // - <none>
    void CommandPalette::_choosingItemContainer(
-        Windows::UI::Xaml::Controls::ListViewBase const& /*sender*/,
-        Windows::UI::Xaml::Controls::ChoosingItemContainerEventArgs const& args)
+        const Windows::UI::Xaml::Controls::ListViewBase& /*sender*/,
+        const Windows::UI::Xaml::Controls::ChoosingItemContainerEventArgs& args)
    {
        const auto dataTemplate = _itemTemplateSelector.SelectTemplate(args.Item());
        const auto itemContainer = args.ItemContainer();
@@ -1223,8 +1212,8 @@ namespace winrt::TerminalApp::implementation
    // Return Value:
    // - <none>
    void CommandPalette::_containerContentChanging(
-        Windows::UI::Xaml::Controls::ListViewBase const& /*sender*/,
-        Windows::UI::Xaml::Controls::ContainerContentChangingEventArgs const& args)
+        const Windows::UI::Xaml::Controls::ListViewBase& /*sender*/,
+        const Windows::UI::Xaml::Controls::ContainerContentChangingEventArgs& args)
    {
        const auto itemContainer = args.ItemContainer();
        if (args.InRecycleQueue() && itemContainer && itemContainer.ContentTemplate())
--- a/src/cascadia/TerminalApp/CommandPalette.h
+++ b/src/cascadia/TerminalApp/CommandPalette.h
@@ -29,8 +29,8 @@ namespace winrt::TerminalApp::implementation

        Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::FilteredCommand> FilteredActions();

-        void SetCommands(Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::Command> const& actions);
-        void SetTabs(Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase> const& tabs, Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase> const& mruTabs);
+        void SetCommands(const Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::Command>& actions);
+        void SetTabs(const Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase>& tabs, const Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase>& mruTabs);
        void SetActionMap(const Microsoft::Terminal::Settings::Model::IActionMapView& actionMap);

        bool OnDirectKeyEvent(const uint32_t vkey, const uint8_t scanCode, const bool down);
@@ -71,28 +71,28 @@ namespace winrt::TerminalApp::implementation

        bool _lastFilterTextWasEmpty{ true };

-        void _filterTextChanged(Windows::Foundation::IInspectable const& sender,
-                                Windows::UI::Xaml::RoutedEventArgs const& args);
-        void _previewKeyDownHandler(Windows::Foundation::IInspectable const& sender,
-                                    Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
+        void _filterTextChanged(const Windows::Foundation::IInspectable& sender,
+                                const Windows::UI::Xaml::RoutedEventArgs& args);
+        void _previewKeyDownHandler(const Windows::Foundation::IInspectable& sender,
+                                    const Windows::UI::Xaml::Input::KeyRoutedEventArgs& e);

-        void _keyUpHandler(Windows::Foundation::IInspectable const& sender,
-                           Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
+        void _keyUpHandler(const Windows::Foundation::IInspectable& sender,
+                           const Windows::UI::Xaml::Input::KeyRoutedEventArgs& e);

-        void _selectedCommandChanged(Windows::Foundation::IInspectable const& sender,
-                                     Windows::UI::Xaml::RoutedEventArgs const& args);
+        void _selectedCommandChanged(const Windows::Foundation::IInspectable& sender,
+                                     const Windows::UI::Xaml::RoutedEventArgs& args);

        void _updateUIForStackChange();

-        void _rootPointerPressed(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
+        void _rootPointerPressed(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& e);

-        void _lostFocusHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
+        void _lostFocusHandler(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);

-        void _backdropPointerPressed(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
+        void _backdropPointerPressed(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& e);

-        void _listItemClicked(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Controls::ItemClickEventArgs const& e);
+        void _listItemClicked(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::Controls::ItemClickEventArgs& e);

-        void _moveBackButtonClicked(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const&);
+        void _moveBackButtonClicked(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs&);

        void _updateFilteredActions();

@@ -114,14 +114,14 @@ namespace winrt::TerminalApp::implementation
        Microsoft::Terminal::Settings::Model::TabSwitcherMode _tabSwitcherMode;
        uint32_t _switcherStartIdx;

-        void _bindTabs(Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase> const& source, Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand> const& target);
+        void _bindTabs(const Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase>& source, const Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand>& target);
        void _anchorKeyUpHandler();

        winrt::Windows::UI::Xaml::Controls::ListView::SizeChanged_revoker _sizeChangedRevoker;

-        void _dispatchCommand(winrt::TerminalApp::FilteredCommand const& command);
-        void _dispatchCommandline(winrt::TerminalApp::FilteredCommand const& command);
-        void _switchToTab(winrt::TerminalApp::FilteredCommand const& command);
+        void _dispatchCommand(const winrt::TerminalApp::FilteredCommand& command);
+        void _dispatchCommandline(const winrt::TerminalApp::FilteredCommand& command);
+        void _switchToTab(const winrt::TerminalApp::FilteredCommand& command);
        static std::optional<winrt::TerminalApp::FilteredCommand> _buildCommandLineCommand(const winrt::hstring& commandLine);

        void _dismissPalette();
@@ -134,8 +134,8 @@ namespace winrt::TerminalApp::implementation
        static void _updateRecentCommands(const winrt::hstring& command);
        ::TerminalApp::AppCommandlineArgs _appArgs;

-        void _choosingItemContainer(Windows::UI::Xaml::Controls::ListViewBase const& sender, Windows::UI::Xaml::Controls::ChoosingItemContainerEventArgs const& args);
-        void _containerContentChanging(Windows::UI::Xaml::Controls::ListViewBase const& sender, Windows::UI::Xaml::Controls::ContainerContentChangingEventArgs const& args);
+        void _choosingItemContainer(const Windows::UI::Xaml::Controls::ListViewBase& sender, const Windows::UI::Xaml::Controls::ChoosingItemContainerEventArgs& args);
+        void _containerContentChanging(const Windows::UI::Xaml::Controls::ListViewBase& sender, const Windows::UI::Xaml::Controls::ContainerContentChangingEventArgs& args);
        winrt::TerminalApp::PaletteItemTemplateSelector _itemTemplateSelector{ nullptr };
        std::unordered_map<Windows::UI::Xaml::DataTemplate, std::unordered_set<Windows::UI::Xaml::Controls::Primitives::SelectorItem>> _listViewItemsCache;
        Windows::UI::Xaml::DataTemplate _listItemTemplate;
--- a/src/cascadia/TerminalApp/CommandPalette.xaml
+++ b/src/cascadia/TerminalApp/CommandPalette.xaml
@@ -6,7 +6,6 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:SettingsModel="using:Microsoft.Terminal.Settings.Model"
-             xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:local="using:TerminalApp"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -24,13 +23,6 @@

    <UserControl.Resources>
        <ResourceDictionary>
-
-            <!--
-                ThemeShadow is only on 18362. This "Windows10version1903" bit
-                adds it conditionally
-            -->
-            <Windows10version1903:ThemeShadow x:Name="CommandPaletteShadow" />
-
            <!--  This creates an instance of our CommandKeyChordVisibilityConverter we can reference below  -->
            <local:EmptyStringVisibilityConverter x:Key="CommandKeyChordVisibilityConverter" />
            <local:EmptyStringVisibilityConverter x:Key="ParsedCommandLineTextVisibilityConverter" />
@@ -142,16 +134,11 @@
                                   Text="{x:Bind Item.KeyChordText, Mode=OneWay}" />
                    </Border>

-                    <!--  xE70E is ChevronUp. Rotated 90 degrees, it's _ChevronRight_  -->
                    <FontIcon Grid.Column="2"
                              HorizontalAlignment="Right"
                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                              Glyph="&#xE70E;">
-
-                        <FontIcon.RenderTransform>
-                            <RotateTransform Angle="90" CenterX="0.5" CenterY="0.5" />
-                        </FontIcon.RenderTransform>
-                    </FontIcon>
+                              FontSize="12"
+                              Glyph="&#xE76C;" />

                </Grid>
            </DataTemplate>
@@ -228,48 +215,13 @@

            <ResourceDictionary.ThemeDictionaries>
                <ResourceDictionary x:Key="Dark">
-                    <Style x:Key="CommandPaletteBackground"
-                           TargetType="Grid">
-                        <Setter Property="Background" Value="#333333" />
-                    </Style>
-                    <!--  TextBox colors !  -->
-                    <SolidColorBrush x:Key="TextControlBackground"
-                                     Color="#333333" />
-                    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush"
-                                     Color="#B5B5B5" />
-                    <SolidColorBrush x:Key="TextControlForeground"
-                                     Color="#B5B5B5" />
-                    <SolidColorBrush x:Key="TextControlBorderBrush"
-                                     Color="#404040" />
-                    <SolidColorBrush x:Key="TextControlButtonForeground"
-                                     Color="#B5B5B5" />
-
-                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver"
-                                     Color="#404040" />
-                    <SolidColorBrush x:Key="TextControlForegroundPointerOver"
-                                     Color="#FFFFFF" />
-                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver"
-                                     Color="#404040" />
-                    <SolidColorBrush x:Key="TextControlButtonForegroundPointerOver"
-                                     Color="#FF4343" />
-
-                    <SolidColorBrush x:Key="TextControlBackgroundFocused"
-                                     Color="#333333" />
-                    <SolidColorBrush x:Key="TextControlForegroundFocused"
-                                     Color="#FFFFFF" />
-                    <SolidColorBrush x:Key="TextControlBorderBrushFocused"
-                                     Color="#404040" />
-                    <SolidColorBrush x:Key="TextControlButtonForegroundPressed"
-                                     Color="#FFFFFF" />
-                    <SolidColorBrush x:Key="TextControlButtonBackgroundPressed"
-                                     Color="#FF4343" />

                    <!--  KeyChordText styles  -->
                    <Style x:Key="KeyChordBorderStyle"
                           TargetType="Border">
                        <Setter Property="BorderThickness" Value="1" />
-                        <Setter Property="CornerRadius" Value="1" />
-                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="CornerRadius" Value="2" />
+                        <Setter Property="Background" Value="Transparent" />
                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
                    </Style>
                    <Style x:Key="KeyChordTextBlockStyle"
@@ -281,9 +233,9 @@
                    <Style x:Key="ParsedCommandLineBorderStyle"
                           TargetType="Border">
                        <Setter Property="BorderThickness" Value="1" />
-                        <Setter Property="CornerRadius" Value="1" />
-                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
-                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+                        <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
                    </Style>
                    <Style x:Key="ParsedCommandLineTextBlockStyle"
                           TargetType="TextBlock">
@@ -291,42 +243,13 @@
                    </Style>
                </ResourceDictionary>
                <ResourceDictionary x:Key="Light">
-                    <Style x:Key="CommandPaletteBackground"
-                           TargetType="Grid">
-                        <Setter Property="Background" Value="#CCCCCC" />
-                    </Style>
-                    <!--  TextBox colors !  -->
-                    <SolidColorBrush x:Key="TextControlBackground"
-                                     Color="#CCCCCC" />
-                    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush"
-                                     Color="#636363" />
-                    <SolidColorBrush x:Key="TextControlBorderBrush"
-                                     Color="#636363" />
-                    <SolidColorBrush x:Key="TextControlButtonForeground"
-                                     Color="#636363" />
-
-                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver"
-                                     Color="#DADADA" />
-                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver"
-                                     Color="#636363" />
-                    <SolidColorBrush x:Key="TextControlButtonForegroundPointerOver"
-                                     Color="#FF4343" />
-
-                    <SolidColorBrush x:Key="TextControlBackgroundFocused"
-                                     Color="#CCCCCC" />
-                    <SolidColorBrush x:Key="TextControlBorderBrushFocused"
-                                     Color="#636363" />
-                    <SolidColorBrush x:Key="TextControlButtonForegroundPressed"
-                                     Color="#FFFFFF" />
-                    <SolidColorBrush x:Key="TextControlButtonBackgroundPressed"
-                                     Color="#FF4343" />

                    <!--  KeyChordText styles  -->
                    <Style x:Key="KeyChordBorderStyle"
                           TargetType="Border">
                        <Setter Property="BorderThickness" Value="1" />
-                        <Setter Property="CornerRadius" Value="1" />
-                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="CornerRadius" Value="2" />
+                        <Setter Property="Background" Value="Transparent" />
                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
                    </Style>
                    <Style x:Key="KeyChordTextBlockStyle"
@@ -338,9 +261,9 @@
                    <Style x:Key="ParsedCommandLineBorderStyle"
                           TargetType="Border">
                        <Setter Property="BorderThickness" Value="1" />
-                        <Setter Property="CornerRadius" Value="1" />
-                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
-                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+                        <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
                    </Style>
                    <Style x:Key="ParsedCommandLineTextBlockStyle"
                           TargetType="TextBlock">
@@ -348,10 +271,6 @@
                    </Style>
                </ResourceDictionary>
                <ResourceDictionary x:Key="HighContrast">
-                    <Style x:Key="CommandPaletteBackground"
-                           TargetType="Grid">
-                        <Setter Property="Background" Value="{ThemeResource SystemColorWindowColor}" />
-                    </Style>

                    <!--  KeyChordText styles (use XAML defaults for High Contrast theme)  -->
                    <Style x:Key="KeyChordBorderStyle"
@@ -381,37 +300,23 @@
            <RowDefinition Height="2*" />
        </Grid.RowDefinitions>

-        <!--
-            Setting the row/col span of this shadow backdrop is a bit of a hack. In
-            order to receive pointer events, an element needs to be _not_ transparent.
-            However, we want to be able to eat all the clicks outside the immediate
-            bounds of the command palette, and we don't want a semi-transparent overlay
-            over all of the UI. Fortunately, if we make this _shadowBackdrop the size of
-            the entire page, then it can be mostly transparent, and cause the root grid
-            to receive clicks _anywhere_ in its bounds.
-        -->
-
-        <Grid x:Name="_shadowBackdrop"
-              Grid.Row="0"
-              Grid.RowSpan="2"
-              Grid.Column="0"
-              Grid.ColumnSpan="3"
-              HorizontalAlignment="Stretch"
-              VerticalAlignment="Stretch"
-              Background="Transparent" />
-
        <Grid x:Name="_backdrop"
              Grid.Row="0"
              Grid.Column="1"
              Margin="8"
+              Padding="0,8,0,0"
              HorizontalAlignment="Stretch"
              VerticalAlignment="Top"
-              Windows10version1903:Shadow="{StaticResource CommandPaletteShadow}"
+              Background="{ThemeResource FlyoutPresenterBackground}"
+              BorderBrush="{ThemeResource FlyoutBorderThemeBrush}"
+              BorderThickness="{ThemeResource FlyoutBorderThemeThickness}"
              CornerRadius="{ThemeResource OverlayCornerRadius}"
              PointerPressed="_backdropPointerPressed"
-              Style="{ThemeResource CommandPaletteBackground}">
+              Shadow="{StaticResource SharedShadow}"
+              Translation="0,0,32">

            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
                <RowDefinition Height="Auto" />
                <RowDefinition Height="Auto" />
                <RowDefinition Height="*" />
@@ -419,7 +324,7 @@

            <TextBox x:Name="_searchBox"
                     Grid.Row="0"
-                     Margin="8"
+                     Margin="8,0,8,8"
                     Padding="18,8,8,8"
                     IsSpellCheckEnabled="False"
                     PlaceholderText="{x:Bind SearchBoxPlaceholderText, Mode=OneWay}"
@@ -428,45 +333,39 @@

            <TextBlock x:Name="_prefixCharacter"
                       Grid.Row="0"
-                       Margin="16,16,0,-8"
+                       Margin="8,0,8,8"
+                       Padding="8,0,0,0"
                       HorizontalAlignment="Left"
+                       VerticalAlignment="Center"
                       FontSize="14"
                       Text="{x:Bind PrefixCharacter, Mode=OneWay}"
                       Visibility="{x:Bind PrefixCharacter, Mode=OneWay, Converter={StaticResource ParentCommandVisibilityConverter}}" />

            <StackPanel Grid.Row="1"
-                        Padding="16,0,16,4"
+                        Margin="8,0,8,8"
                        Orientation="Horizontal"
                        Visibility="{x:Bind ParentCommandName, Mode=OneWay, Converter={StaticResource ParentCommandVisibilityConverter}}">

                <Button x:Name="_parentCommandBackButton"
                        x:Uid="ParentCommandBackButton"
                        VerticalAlignment="Center"
-                        Background="Transparent"
                        Click="_moveBackButtonClicked"
                        ClickMode="Press">
                    <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                              FontSize="12"
+                              FontSize="11"
                              Glyph="&#xE76b;" />
                </Button>

                <TextBlock x:Name="_parentCommandText"
-                           Grid.Row="1"
-                           Padding="16,0,16,4"
+                           Padding="16,4"
                           VerticalAlignment="Center"
                           FontStyle="Italic"
                           Text="{x:Bind ParentCommandName, Mode=OneWay}" />
            </StackPanel>

-            <TextBlock x:Name="_noMatchesText"
-                       Grid.Row="1"
-                       Padding="16"
-                       FontStyle="Italic"
-                       Text="{x:Bind NoMatchesText, Mode=OneWay}"
-                       Visibility="Collapsed" />
-
            <Border Grid.Row="1"
-                    Padding="16"
+                    Margin="8,0,8,8"
+                    Padding="16,12"
                    HorizontalAlignment="Stretch"
                    VerticalAlignment="Center"
                    Style="{ThemeResource ParsedCommandLineBorderStyle}"
@@ -480,8 +379,20 @@
                </ScrollViewer>
            </Border>

+            <Border x:Name="_noMatchesText"
+                    Grid.Row="3"
+                    Height="36"
+                    Margin="8,0,8,8"
+                    Visibility="Collapsed">
+                <TextBlock Padding="12,0"
+                           VerticalAlignment="Center"
+                           FontStyle="Italic"
+                           Text="{x:Bind NoMatchesText, Mode=OneWay}" />
+            </Border>
+
            <ListView x:Name="_filteredActionsView"
-                      Grid.Row="2"
+                      Grid.Row="3"
+                      Padding="4,-2,4,6"
                      HorizontalAlignment="Stretch"
                      VerticalAlignment="Stretch"
                      AllowDrop="False"
--- a/src/cascadia/TerminalApp/Commandline.cpp
+++ b/src/cascadia/TerminalApp/Commandline.cpp
@@ -27,8 +27,8 @@ const std::vector<std::string>& Commandline::Args() const
 void Commandline::AddArg(const std::wstring& nextArg)
 {
    // Attempt to convert '\;' in the arg to just '\', removing the escaping
-    std::wstring modifiedArg{ nextArg };
-    size_t pos = modifiedArg.find(EscapedDelimiter, 0);
+    auto modifiedArg{ nextArg };
+    auto pos = modifiedArg.find(EscapedDelimiter, 0);
    while (pos != std::string::npos)
    {
        modifiedArg.replace(pos, EscapedDelimiter.length(), Delimiter);
--- a/src/cascadia/TerminalApp/DebugTapConnection.cpp
+++ b/src/cascadia/TerminalApp/DebugTapConnection.cpp
@@ -39,17 +39,17 @@ namespace winrt::Microsoft::TerminalApp::implementation

            _wrappedConnection.Start();
        }
-        void WriteInput(hstring const& data)
+        void WriteInput(const hstring& data)
        {
            _pairedTap->_PrintInput(data);
            _wrappedConnection.WriteInput(data);
        }
        void Resize(uint32_t rows, uint32_t columns) { _wrappedConnection.Resize(rows, columns); }
        void Close() { _wrappedConnection.Close(); }
-        winrt::event_token TerminalOutput(TerminalOutputHandler const& args) { return _wrappedConnection.TerminalOutput(args); };
-        void TerminalOutput(winrt::event_token const& token) noexcept { _wrappedConnection.TerminalOutput(token); };
-        winrt::event_token StateChanged(TypedEventHandler<ITerminalConnection, IInspectable> const& handler) { return _wrappedConnection.StateChanged(handler); };
-        void StateChanged(winrt::event_token const& token) noexcept { _wrappedConnection.StateChanged(token); };
+        winrt::event_token TerminalOutput(const TerminalOutputHandler& args) { return _wrappedConnection.TerminalOutput(args); };
+        void TerminalOutput(const winrt::event_token& token) noexcept { _wrappedConnection.TerminalOutput(token); };
+        winrt::event_token StateChanged(const TypedEventHandler<ITerminalConnection, IInspectable>& handler) { return _wrappedConnection.StateChanged(handler); };
+        void StateChanged(const winrt::event_token& token) noexcept { _wrappedConnection.StateChanged(token); };
        ConnectionState State() const noexcept { return _wrappedConnection.State(); }

    private:
@@ -78,7 +78,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
        _start.count_down();
    }

-    void DebugTapConnection::WriteInput(hstring const& data)
+    void DebugTapConnection::WriteInput(const hstring& data)
    {
        // If the user types into the tap side, forward it to the input side
        if (auto strongInput{ _inputSide.get() })
--- a/src/cascadia/TerminalApp/DebugTapConnection.h
+++ b/src/cascadia/TerminalApp/DebugTapConnection.h
@@ -16,7 +16,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
        void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/){};
        ~DebugTapConnection();
        void Start();
-        void WriteInput(hstring const& data);
+        void WriteInput(const hstring& data);
        void Resize(uint32_t rows, uint32_t columns);
        void Close();
        winrt::Microsoft::Terminal::TerminalConnection::ConnectionState State() const noexcept;
--- a/src/cascadia/TerminalApp/EmptyStringVisibilityConverter.cpp
+++ b/src/cascadia/TerminalApp/EmptyStringVisibilityConverter.cpp
@@ -18,20 +18,20 @@ namespace winrt::TerminalApp::implementation
    // - value: the input object to attempt to convert into a Visibility.
    // Return Value:
    // - Visible if the object was a string and wasn't the empty string.
-    Foundation::IInspectable EmptyStringVisibilityConverter::Convert(Foundation::IInspectable const& value,
-                                                                     Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
-                                                                     Foundation::IInspectable const& /* parameter */,
-                                                                     hstring const& /* language */)
+    Foundation::IInspectable EmptyStringVisibilityConverter::Convert(const Foundation::IInspectable& value,
+                                                                     const Windows::UI::Xaml::Interop::TypeName& /* targetType */,
+                                                                     const Foundation::IInspectable& /* parameter */,
+                                                                     const hstring& /* language */)
    {
        const auto& name = winrt::unbox_value_or<hstring>(value, L"");
        return winrt::box_value(name.empty() ? Visibility::Collapsed : Visibility::Visible);
    }

    // unused for one-way bindings
-    Foundation::IInspectable EmptyStringVisibilityConverter::ConvertBack(Foundation::IInspectable const& /* value */,
-                                                                         Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
-                                                                         Foundation::IInspectable const& /* parameter */,
-                                                                         hstring const& /* language */)
+    Foundation::IInspectable EmptyStringVisibilityConverter::ConvertBack(const Foundation::IInspectable& /* value */,
+                                                                         const Windows::UI::Xaml::Interop::TypeName& /* targetType */,
+                                                                         const Foundation::IInspectable& /* parameter */,
+                                                                         const hstring& /* language */)
    {
        throw hresult_not_implemented();
    }
--- a/Show More
+++ b/Show More