Migrate spelling-0.0.21 changes from main

Migrate spelling-0.0.19 changes from main
Okay so this will have it convert correctly, but the caller isn't allocating enough memory to get this back now. So we have to look a layer up.
2026-04-08 07:11:08 +00:00 · 2020-10-20 16:39:36 -07:00 · 2020-10-20 16:39:36 -07:00 · 2020-10-20 16:39:36 -07:00 · 2020-10-16 02:02:59 +00:00 · 2020-10-15 17:45:33 -07:00
219 changed files with 9887 additions and 7859 deletions
--- a/.github/linters/.markdown-lint.yml
+++ b/.github/linters/.markdown-lint.yml
@@ -0,0 +1,40 @@
+---
+###########################
+###########################
+## Markdown Linter rules ##
+###########################
+###########################
+
+# Linter rules doc:
+# - https://github.com/DavidAnson/markdownlint
+#
+# Note:
+# To comment out a single error:
+#   <!-- markdownlint-disable -->
+#   any violations you want
+#   <!-- markdownlint-restore -->
+#
+# To run the linter locally:
+# 1. install the npm package:
+#    `npm install -g markdownlint-cli`
+# 2. Then run it in the root of the repo with
+#    `markdownlint -c .github\linters\.markdown-lint.yml ./*.md`
+
+###############
+# Rules by id #
+###############
+MD004: false                  # Unordered list style
+MD007:
+  indent: 2                   # Unordered list indentation
+MD013:
+  line_length: 400            # Line length 80 is far to short
+MD026:
+  punctuation: ".,;:!。，；:"  # List of not allowed
+MD029: false                  # Ordered list item prefix
+MD033: false                  # Allow inline HTML
+MD036: false                  # Emphasis used instead of a heading
+
+#################
+# Rules by tags #
+#################
+blank_lines: false  # Error on blank lines
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -0,0 +1,51 @@
+---
+###########################
+###########################
+## Linter GitHub Actions ##
+###########################
+###########################
+name: Lint Code Base
+
+#
+# Documentation:
+# https://help.github.com/en/articles/workflow-syntax-for-github-actions
+#
+
+#############################
+# Start the job on all push #
+#############################
+on:
+  pull_request:
+    branches: [master]
+
+###############
+# Set the Job #
+###############
+jobs:
+  build:
+    # Name the Job
+    name: Lint Code Base
+    # Set the agent to run on
+    runs-on: ubuntu-latest
+
+    ##################
+    # Load all steps #
+    ##################
+    steps:
+      ##########################
+      # Checkout the code base #
+      ##########################
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      ################################
+      # Run Linter against code base #
+      ################################
+      - name: Lint Code Base
+        uses: github/super-linter@v3.10.0
+        env:
+          VALIDATE_ALL_CODEBASE: false
+          DEFAULT_BRANCH: master
+          MARKDOWN_CONFIG_FILE: .markdown-lint.yml
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VALIDATE_EDITORCONFIG: false
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -140,6 +140,13 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and you
 1. Create & push a feature branch
 1. Create a [Draft Pull Request (PR)](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
 1. Work on your changes
+1. Build and see if it works. Consult [How to build OpenConsole](./doc/building.md) if you have problems.
+
+### Testing
+
+Testing is a key component in the development workflow. Both Windows Terminal and Windows Console use TAEF(the Test Authoring and Execution Framework) as the main framework for testing.
+
+If your changes affect existing test cases, or you're working on brand new features and also the accompanying test cases, see [TAEF](./doc/TAEF.md) for more information about how to validate your work locally.

 ### Code Review

--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -87,8 +87,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.Tests.Feature", "src\h
 	ProjectSection(ProjectDependencies) = postProject
 		{18D09A24-8240-42D6-8CB6-236EEE820263} = {18D09A24-8240-42D6-8CB6-236EEE820263}
 		{FC802440-AD6A-4919-8F2C-7701F2B38D79} = {FC802440-AD6A-4919-8F2C-7701F2B38D79}
-		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
 		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A} = {58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}
+		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalParser.UnitTests", "src\terminal\parser\ut_parser\Parser.UnitTests.vcxproj", "{12144E07-FE63-4D33-9231-748B8D8C3792}"
@@ -180,6 +180,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia\TerminalApp\dll\TerminalApp.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
+		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
 	EndProjectSection
@@ -225,16 +226,21 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalApp", "src\cascadia\ut_app\TerminalApp.UnitTests.vcxproj", "{CA5CAD1A-9333-4D05-B12A-1905CBF112F9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\cascadia\TerminalApp\TerminalAppLib.vcxproj", "{CA5CAD1A-9A12-429C-B551-8562EC954746}"
 	ProjectSection(ProjectDependencies) = postProject
+		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_TerminalApp", "src\cascadia\LocalTests_TerminalApp\TerminalApp.LocalTests.vcxproj", "{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
+		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
+		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererUia", "src\renderer\uia\lib\uia.vcxproj", "{48D21369-3D7B-4431-9967-24E81292CF63}"
@@ -250,6 +256,8 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestHostApp", "src\cascadia\LocalTests_TerminalApp\TestHostApp\TestHostApp.vcxproj", "{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506} = {CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}
+		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42} = {CA5CAD1A-9B68-456A-B13E-C8218070DC42}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BDB237B6-1D1D-400F-84CC-40A58FA59C8E}"
@@ -307,6 +315,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "s
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wt", "src\cascadia\wt\wt.vcxproj", "{506FD703-BAA7-4F6E-9361-64F550EC8FCA}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Settings.Model.Lib", "src\cascadia\TerminalSettingsModel\Microsoft.Terminal.Settings.ModelLib.vcxproj", "{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Settings.Model", "src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj", "{CA5CAD1A-082C-4476-9F33-94B339494076}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_SettingsModel", "src\cascadia\LocalTests_SettingsModel\SettingsModel.LocalTests.vcxproj", "{CA5CAD1A-9B68-456A-B13E-C8218070DC42}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
+		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
+		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -1986,6 +2012,84 @@ Global
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA}.Release|x64.Build.0 = Release|x64
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA}.Release|x86.ActiveCfg = Release|Win32
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA}.Release|x86.Build.0 = Release|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x64.ActiveCfg = Release|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|ARM64.Build.0 = Debug|ARM64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|x64.ActiveCfg = Debug|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|x64.Build.0 = Debug|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|x86.ActiveCfg = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|x86.Build.0 = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|Any CPU.ActiveCfg = Release|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|ARM64.ActiveCfg = Release|ARM64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|ARM64.Build.0 = Release|ARM64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x64.ActiveCfg = Release|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x64.Build.0 = Release|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x86.ActiveCfg = Release|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x86.Build.0 = Release|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|x64.ActiveCfg = Release|x64
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|ARM64.Build.0 = Debug|ARM64
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|x64.ActiveCfg = Debug|x64
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|x64.Build.0 = Debug|x64
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|x86.ActiveCfg = Debug|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|x86.Build.0 = Debug|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|Any CPU.ActiveCfg = Release|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|ARM64.ActiveCfg = Release|ARM64
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|ARM64.Build.0 = Release|ARM64
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|x64.ActiveCfg = Release|x64
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|x64.Build.0 = Release|x64
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|x86.ActiveCfg = Release|Win32
+		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|x86.Build.0 = Release|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|ARM64.Build.0 = Debug|ARM64
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|x64.ActiveCfg = Debug|x64
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|x64.Build.0 = Debug|x64
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|x86.ActiveCfg = Debug|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|x86.Build.0 = Debug|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|Any CPU.ActiveCfg = Release|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|ARM64.ActiveCfg = Release|ARM64
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|ARM64.Build.0 = Release|ARM64
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x64.ActiveCfg = Release|x64
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x64.Build.0 = Release|x64
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x86.ActiveCfg = Release|Win32
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2066,6 +2170,9 @@ Global
 		{6BAE5851-50D5-4934-8D5E-30361A8A40F3} = {81C352DB-1818-45B7-A284-18E259F1CC87}
 		{1588FD7C-241E-4E7D-9113-43735F3E6BAD} = {59840756-302F-44DF-AA47-441A9D673202}
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA} = {59840756-302F-44DF-AA47-441A9D673202}
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {59840756-302F-44DF-AA47-441A9D673202}
+		{CA5CAD1A-082C-4476-9F33-94B339494076} = {59840756-302F-44DF-AA47-441A9D673202}
+		{CA5CAD1A-9B68-456A-B13E-C8218070DC42} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}
--- a/README.md
+++ b/README.md
@@ -7,21 +7,25 @@ This repository contains the source code for:
 * The Windows console host (`conhost.exe`)
 * Components shared between the two projects
 * [ColorTool](https://github.com/Microsoft/Terminal/tree/master/src/tools/ColorTool)
-* [Sample projects](https://github.com/Microsoft/Terminal/tree/master/samples) that show how to consume the Windows Console APIs
+* [Sample projects](https://github.com/Microsoft/Terminal/tree/master/samples)
+  that show how to consume the Windows Console APIs

 Related repositories include:

-* [Windows Terminal Documentation](https://docs.microsoft.com/windows/terminal) ([Repo: Contribute to the docs](https://github.com/MicrosoftDocs/terminal))
+* [Windows Terminal Documentation](https://docs.microsoft.com/windows/terminal)
+  ([Repo: Contribute to the docs](https://github.com/MicrosoftDocs/terminal))
 * [Console API Documentation](https://github.com/MicrosoftDocs/Console-Docs)
 * [Cascadia Code Font](https://github.com/Microsoft/Cascadia-Code)

 ## Installing and running Windows Terminal

-> 👉 Note: Windows Terminal requires Windows 10 1903 (build 18362) or later
+> 🔴 Note: Windows Terminal requires Windows 10 1903 (build 18362) or later

 ### Microsoft Store [Recommended]

-Install the [Windows Terminal from the Microsoft Store][store-install-link]. This allows you to always be on the latest version when we release new builds with automatic upgrades.
+Install the [Windows Terminal from the Microsoft Store][store-install-link].
+This allows you to always be on the latest version when we release new builds
+with automatic upgrades.

 This is our preferred method.

@@ -29,16 +33,21 @@ This is our preferred method.

 #### Via GitHub

-For users who are unable to install Terminal from the Microsoft Store, Terminal builds can be manually downloaded from this repository's [Releases page](https://github.com/microsoft/terminal/releases).
+For users who are unable to install Terminal from the Microsoft Store, Terminal
+builds can be manually downloaded from this repository's [Releases
+page](https://github.com/microsoft/terminal/releases).

-> ⚠ Note: If you install Terminal manually:
+> 🔴 Note: If you install Terminal manually:
 >
-> * Be sure to install the [Desktop Bridge VC++ v14 Redistributable Package](https://www.microsoft.com/en-us/download/details.aspx?id=53175) otherwise Terminal may not install and/or run and may crash at startup
-> * Terminal will not auto-update when new builds are released so you will need to regularly install the latest Terminal release to receive all the latest fixes and improvements!
+> * Terminal will not auto-update when new builds are released so you will need
+>   to regularly install the latest Terminal release to receive all the latest
+>   fixes and improvements!

 #### Via Windows Package Manager CLI (aka winget)

-[winget](https://github.com/microsoft/winget-cli) users can download and install the latest Terminal release by installing the `Microsoft.WindowsTerminal` package:
+[winget](https://github.com/microsoft/winget-cli) users can download and install
+the latest Terminal release by installing the `Microsoft.WindowsTerminal`
+package:

 ```powershell
 winget install --id=Microsoft.WindowsTerminal -e
@@ -46,7 +55,8 @@ winget install --id=Microsoft.WindowsTerminal -e

 #### Via Chocolatey (unofficial)

-[Chocolatey](https://chocolatey.org) users can download and install the latest Terminal release by installing the `microsoft-windows-terminal` package:
+[Chocolatey](https://chocolatey.org) users can download and install the latest
+Terminal release by installing the `microsoft-windows-terminal` package:

 ```powershell
 choco install microsoft-windows-terminal
@@ -58,11 +68,15 @@ To upgrade Windows Terminal using Chocolatey, run the following:
 choco upgrade microsoft-windows-terminal
 ```

-If you have any issues when installing/upgrading the package please go to the [Windows Terminal package page](https://chocolatey.org/packages/microsoft-windows-terminal) and follow the [Chocolatey triage process](https://chocolatey.org/docs/package-triage-process)
+If you have any issues when installing/upgrading the package please go to the
+[Windows Terminal package
+page](https://chocolatey.org/packages/microsoft-windows-terminal) and follow the
+[Chocolatey triage process](https://chocolatey.org/docs/package-triage-process)

 #### Via Scoop (unofficial)

-[Scoop](https://scoop.sh) users can download and install the latest Terminal release by installing the `windows-terminal` package:
+[Scoop](https://scoop.sh) users can download and install the latest Terminal
+release by installing the `windows-terminal` package:

 ```powershell
 scoop install windows-terminal
@@ -74,70 +88,123 @@ To update Windows Terminal using Scoop, run the following:
 scoop update windows-terminal
 ```

-If you have any issues when installing/updating the package, please search for or report the same on the [issues page](https://github.com/lukesampson/scoop-extras/issues) of Scoop Extras bucket repository.  
+If you have any issues when installing/updating the package, please search for
+or report the same on the [issues
+page](https://github.com/lukesampson/scoop-extras/issues) of Scoop Extras bucket
+repository.

 ---

 ## Windows Terminal 2.0 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 delivering Windows Terminal 2.0 [is described
+here](/doc/terminal-v2-roadmap.md) and will be updated as the project proceeds.

 ## Project Build Status

 Project|Build Status
 ---|---
-Terminal|[![Build Status](https://dev.azure.com/ms/Terminal/_apis/build/status/Terminal%20CI?branchName=master)](https://dev.azure.com/ms/Terminal/_build?definitionId=136)
-ColorTool|![](https://microsoft.visualstudio.com/_apis/public/build/definitions/c93e867a-8815-43c1-92c4-e7dd5404f1e1/17023/badge)
+Terminal|[![Terminal Build Status](https://dev.azure.com/ms/Terminal/_apis/build/status/Terminal%20CI?branchName=master)](https://dev.azure.com/ms/Terminal/_build?definitionId=136)
+ColorTool|![Colortool Build Status](https://microsoft.visualstudio.com/_apis/public/build/definitions/c93e867a-8815-43c1-92c4-e7dd5404f1e1/17023/badge)

 ---

 ## Terminal & Console Overview

-Please take a few minutes to review the overview below before diving into the code:
+Please take a few minutes to review the overview below before diving into the
+code:

 ### Windows Terminal

-Windows Terminal is a new, modern, feature-rich, productive terminal application for command-line users. It includes many of the features most frequently requested by the Windows command-line community including support for tabs, rich text, globalization, configurability, theming & styling, and more.
+Windows Terminal is a new, modern, feature-rich, productive terminal application
+for command-line users. It includes many of the features most frequently
+requested by the Windows command-line community including support for tabs, rich
+text, globalization, configurability, theming & styling, and more.

-The Terminal will also need to meet our goals and measures to ensure it remains fast and efficient, and doesn't consume vast amounts of memory or power.
+The Terminal will also need to meet our goals and measures to ensure it remains
+fast and efficient, and doesn't consume vast amounts of memory or power.

 ### The Windows Console Host

-The Windows Console host, `conhost.exe`, is Windows' original command-line user experience. It also hosts Windows' command-line infrastructure and the Windows Console API server, input engine, rendering engine, user preferences, etc. The console host code in this repository is the actual source from which the `conhost.exe` in Windows itself is built.
+The Windows Console host, `conhost.exe`, is Windows' original command-line user
+experience. It also hosts Windows' command-line infrastructure and the Windows
+Console API server, input engine, rendering engine, user preferences, etc. The
+console host code in this repository is the actual source from which the
+`conhost.exe` in Windows itself is built.

-Since taking ownership of the Windows command-line in 2014, the team added several new features to the Console, including background transparency, line-based selection, support for [ANSI / Virtual Terminal sequences](https://en.wikipedia.org/wiki/ANSI_escape_code), [24-bit color](https://devblogs.microsoft.com/commandline/24-bit-color-in-the-windows-console/), a [Pseudoconsole ("ConPTY")](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/), and more.
+Since taking ownership of the Windows command-line in 2014, the team added
+several new features to the Console, including background transparency,
+line-based selection, support for [ANSI / Virtual Terminal
+sequences](https://en.wikipedia.org/wiki/ANSI_escape_code), [24-bit
+color](https://devblogs.microsoft.com/commandline/24-bit-color-in-the-windows-console/),
+a [Pseudoconsole
+("ConPTY")](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/),
+and more.

-However, because Windows Console's primary goal is to maintain backward compatibility, we have been unable to add many of the features the community (and the team) have been wanting for the last several years including tabs, unicode text, and emoji.
+However, because Windows Console's primary goal is to maintain backward
+compatibility, we have been unable to add many of the features the community
+(and the team) have been wanting for the last several years including tabs,
+unicode text, and emoji.

 These limitations led us to create the new Windows Terminal.

-> You can read more about the evolution of the command-line in general, and the Windows command-line specifically in [this accompanying series of blog posts](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/) on the Command-Line team's blog.
+> You can read more about the evolution of the command-line in general, and the
+> Windows command-line specifically in [this accompanying series of blog
+> posts](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/)
+> on the Command-Line team's blog.

 ### Shared Components

-While overhauling Windows Console, we modernized its codebase considerably, cleanly separating logical entities into modules and classes, introduced some key extensibility points, replaced several old, home-grown collections and containers with safer, more efficient [STL containers](https://docs.microsoft.com/en-us/cpp/standard-library/stl-containers?view=vs-2019), and made the code simpler and safer by using Microsoft's [Windows Implementation Libraries - WIL](https://github.com/Microsoft/wil).
+While overhauling Windows Console, we modernized its codebase considerably,
+cleanly separating logical entities into modules and classes, introduced some
+key extensibility points, replaced several old, home-grown collections and
+containers with safer, more efficient [STL
+containers](https://docs.microsoft.com/en-us/cpp/standard-library/stl-containers?view=vs-2019),
+and made the code simpler and safer by using Microsoft's [Windows Implementation
+Libraries - WIL](https://github.com/Microsoft/wil).

-This overhaul resulted in several of Console's key components being available for re-use in any terminal implementation on Windows. These components include a new DirectWrite-based text layout and rendering engine, a text buffer capable of storing both UTF-16 and UTF-8, a VT parser/emitter, and more.
+This overhaul resulted in several of Console's key components being available
+for re-use in any terminal implementation on Windows. These components include a
+new DirectWrite-based text layout and rendering engine, a text buffer capable of
+storing both UTF-16 and UTF-8, a VT parser/emitter, and more.

 ### Creating the new Windows Terminal

-When we started planning the new Windows Terminal application, we explored and evaluated several approaches and technology stacks. We ultimately decided that our goals would be best met by continuing our investment in our C++ codebase, which would allow us to reuse several of the aforementioned modernized components in both the existing Console and the new Terminal. Further, we realized that this would allow us to build much of the Terminal's core itself as a reusable UI control that others can incorporate into their own applications.
+When we started planning the new Windows Terminal application, we explored and
+evaluated several approaches and technology stacks. We ultimately decided that
+our goals would be best met by continuing our investment in our C++ codebase,
+which would allow us to reuse several of the aforementioned modernized
+components in both the existing Console and the new Terminal. Further, we
+realized that this would allow us to build much of the Terminal's core itself as
+a reusable UI control that others can incorporate into their own applications.

-The result of this work is contained within this repo and delivered as the Windows Terminal application you can download from the Microsoft Store, or [directly from this repo's releases](https://github.com/microsoft/terminal/releases).
+The result of this work is contained within this repo and delivered as the
+Windows Terminal application you can download from the Microsoft Store, or
+[directly from this repo's
+releases](https://github.com/microsoft/terminal/releases).

 ---

 ## Resources

-For more information about Windows Terminal, you may find some of these resources useful and interesting:
+For more information about Windows Terminal, you may find some of these
+resources useful and interesting:

 * [Command-Line Blog](https://devblogs.microsoft.com/commandline)
-* [Command-Line Backgrounder Blog Series](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/)
-* Windows Terminal Launch: [Terminal "Sizzle Video"](https://www.youtube.com/watch?v=8gw0rXPMMPE&list=PLEHMQNlPj-Jzh9DkNpqipDGCZZuOwrQwR&index=2&t=0s)
-* Windows Terminal Launch: [Build 2019 Session](https://www.youtube.com/watch?v=KMudkRcwjCw)
-* Run As Radio: [Show 645 - Windows Terminal with Richard Turner](http://www.runasradio.com/Shows/Show/645)
-* Azure Devops Podcast: [Episode 54 - Kayla Cinnamon and Rich Turner on DevOps on the Windows Terminal](http://azuredevopspodcast.clear-measure.com/kayla-cinnamon-and-rich-turner-on-devops-on-the-windows-terminal-team-episode-54)
-* Microsoft Ignite 2019 Session: [The Modern Windows Command Line: Windows Terminal - BRK3321](https://myignite.techcommunity.microsoft.com/sessions/81329?source=sessions)
+* [Command-Line Backgrounder Blog
+  Series](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/)
+* Windows Terminal Launch: [Terminal "Sizzle
+  Video"](https://www.youtube.com/watch?v=8gw0rXPMMPE&list=PLEHMQNlPj-Jzh9DkNpqipDGCZZuOwrQwR&index=2&t=0s)
+* Windows Terminal Launch: [Build 2019
+  Session](https://www.youtube.com/watch?v=KMudkRcwjCw)
+* Run As Radio: [Show 645 - Windows Terminal with Richard
+  Turner](http://www.runasradio.com/Shows/Show/645)
+* Azure Devops Podcast: [Episode 54 - Kayla Cinnamon and Rich Turner on DevOps
+  on the Windows
+  Terminal](http://azuredevopspodcast.clear-measure.com/kayla-cinnamon-and-rich-turner-on-devops-on-the-windows-terminal-team-episode-54)
+* Microsoft Ignite 2019 Session: [The Modern Windows Command Line: Windows
+  Terminal -
+  BRK3321](https://myignite.techcommunity.microsoft.com/sessions/81329?source=sessions)

 ---

@@ -147,35 +214,50 @@ For more information about Windows Terminal, you may find some of these resource

 Cause: You're launching the incorrect solution in Visual Studio.

-Solution: Make sure you're building & deploying the `CascadiaPackage` project in Visual Studio.
+Solution: Make sure you're building & deploying the `CascadiaPackage` project in
+Visual Studio.

-> ⚠ Note: `OpenConsole.exe` is just a locally-built `conhost.exe`, the classic Windows Console that hosts Windows' command-line infrastructure. OpenConsole is used by Windows Terminal to connect to and communicate with command-line applications (via [ConPty](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/)).
+> ⚠ Note: `OpenConsole.exe` is just a locally-built `conhost.exe`, the classic
+> Windows Console that hosts Windows' command-line infrastructure. OpenConsole
+> is used by Windows Terminal to connect to and communicate with command-line
+> applications (via
+> [ConPty](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/)).

 ---

 ## Documentation

-All project documentation is located at aka.ms/terminal-docs. If you would like to contribute to the documentation, please submit a pull request on the [Windows Terminal Documentation repo](https://github.com/MicrosoftDocs/terminal).
+All project documentation is located at aka.ms/terminal-docs. If you would like
+to contribute to the documentation, please submit a pull request on the [Windows
+Terminal Documentation repo](https://github.com/MicrosoftDocs/terminal).

 ---

 ## Contributing

-We are excited to work alongside you, our amazing community, to build and enhance Windows Terminal\!
+We are excited to work alongside you, our amazing community, to build and
+enhance Windows Terminal\!

-***BEFORE you start work on a feature/fix***, please read & follow our [Contributor's Guide](https://github.com/microsoft/terminal/blob/master/CONTRIBUTING.md) to help avoid any wasted or duplicate effort.
+***BEFORE you start work on a feature/fix***, please read & follow our
+[Contributor's
+Guide](https://github.com/microsoft/terminal/blob/master/CONTRIBUTING.md) to
+help avoid any wasted or duplicate effort.

 ## Communicating with the Team

 The easiest way to communicate with the team is via GitHub issues.

-Please file new issues, feature requests and suggestions, but **DO search for similar open/closed pre-existing issues before creating a new issue.**
+Please file new issues, feature requests and suggestions, but **DO search for
+similar open/closed pre-existing issues before creating a new issue.**

-If you would like to ask a question that you feel doesn't warrant an issue (yet), please reach out to us via Twitter:
+If you would like to ask a question that you feel doesn't warrant an issue
+(yet), please reach out to us via Twitter:

-* Kayla Cinnamon, Program Manager: [@cinnamon\_msft](https://twitter.com/cinnamon_msft)
+* Kayla Cinnamon, Program Manager:
+  [@cinnamon\_msft](https://twitter.com/cinnamon_msft)
 * Dustin Howett, Engineering Lead: [@dhowett](https://twitter.com/DHowett)
-* Michael Niksa, Senior Developer: [@michaelniksa](https://twitter.com/MichaelNiksa)
+* Michael Niksa, Senior Developer:
+  [@michaelniksa](https://twitter.com/MichaelNiksa)
 * Mike Griese, Developer: [@zadjii](https://twitter.com/zadjii)
 * Carlos Zamora, Developer: [@cazamor_msft](https://twitter.com/cazamor_msft)
 * Leon Liang, Developer: [@leonmsft](https://twitter.com/leonmsft)
@@ -185,11 +267,19 @@ If you would like to ask a question that you feel doesn't warrant an issue (yet)

 ## Prerequisites

-* You must be running Windows 1903 (build >= 10.0.18362.0) or later to run Windows Terminal
-* You must [enable Developer Mode in the Windows Settings app](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development) to locally install and run Windows Terminal
-* You must have the [Windows 10 1903 SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk) installed
-* You must have at least [VS 2019](https://visualstudio.microsoft.com/downloads/) installed
-* You must install the following Workloads via the VS Installer. Note: Opening the solution in VS 2019 will [prompt you to install missing components automatically](https://devblogs.microsoft.com/setup/configure-visual-studio-across-your-organization-with-vsconfig/):
+* You must be running Windows 1903 (build >= 10.0.18362.0) or later to run
+  Windows Terminal
+* You must [enable Developer Mode in the Windows Settings
+  app](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development)
+  to locally install and run Windows Terminal
+* You must have the [Windows 10 1903
+  SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
+  installed
+* You must have at least [VS
+  2019](https://visualstudio.microsoft.com/downloads/) installed
+* You must install the following Workloads via the VS Installer. Note: Opening
+  the solution in VS 2019 will [prompt you to install missing components
+  automatically](https://devblogs.microsoft.com/setup/configure-visual-studio-across-your-organization-with-vsconfig/):
  * Desktop Development with C++
  * Universal Windows Platform Development
  * **The following Individual Components**
@@ -197,13 +287,17 @@ If you would like to ask a question that you feel doesn't warrant an issue (yet)

 ## Building the Code

-This repository uses [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) for some of its dependencies. To make sure submodules are restored or updated, be sure to run the following prior to building:
+This repository uses [git
+submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) for some of its
+dependencies. To make sure submodules are restored or updated, be sure to run
+the following prior to building:

 ```shell
 git submodule update --init --recursive
 ```

-OpenConsole.sln may be built from within Visual Studio or from the command-line using a set of convenience scripts & tools in the **/tools** directory:
+OpenConsole.sln may be built from within Visual Studio or from the command-line
+using a set of convenience scripts & tools in the **/tools** directory:

 ### Building in PowerShell

@@ -222,19 +316,28 @@ bcz

 ## Running & Debugging

-To debug the Windows Terminal in VS, right click on `CascadiaPackage` (in the Solution Explorer) and go to properties. In the Debug menu, change "Application process" and "Background task process" to "Native Only".
+To debug the Windows Terminal in VS, right click on `CascadiaPackage` (in the
+Solution Explorer) and go to properties. In the Debug menu, change "Application
+process" and "Background task process" to "Native Only".

-You should then be able to build & debug the Terminal project by hitting <kbd>F5</kbd>.
+You should then be able to build & debug the Terminal project by hitting
+<kbd>F5</kbd>.

-> 👉 You will _not_ be able to launch the Terminal directly by running the WindowsTerminal.exe. For more details on why, see [#926](https://github.com/microsoft/terminal/issues/926), [#4043](https://github.com/microsoft/terminal/issues/4043)
+> 👉 You will _not_ be able to launch the Terminal directly by running the
+> WindowsTerminal.exe. For more details on why, see
+> [#926](https://github.com/microsoft/terminal/issues/926),
+> [#4043](https://github.com/microsoft/terminal/issues/4043)

 ### Coding Guidance

 Please review these brief docs below about our coding practices.

-> 👉 If you find something missing from these docs, feel free to contribute to any of our documentation files anywhere in the repository (or write some new ones!)
+> 👉 If you find something missing from these docs, feel free to contribute to
+> any of our documentation files anywhere in the repository (or write some new
+> ones!)

-This is a work in progress as we learn what we'll need to provide people in order to be effective contributors to our project.
+This is a work in progress as we learn what we'll need to provide people in
+order to be effective contributors to our project.

 * [Coding Style](https://github.com/Microsoft/Terminal/blob/master/doc/STYLE.md)
 * [Code Organization](https://github.com/Microsoft/Terminal/blob/master/doc/ORGANIZATION.md)
@@ -243,10 +346,12 @@ This is a work in progress as we learn what we'll need to provide people in orde

 ---

-# Code of Conduct
+## Code of Conduct

-This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
-For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any additional questions or comments.
+This project has adopted the [Microsoft Open Source Code of
+Conduct][conduct-code]. For more information see the [Code of Conduct
+FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any
+additional questions or comments.

 [conduct-code]: https://opensource.microsoft.com/codeofconduct/
 [conduct-FAQ]: https://opensource.microsoft.com/codeofconduct/faq/
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -0,0 +1,17 @@
+# Support
+
+## How to file issues and get help  
+
+This project uses [GitHub issues][gh-issue] to [track bugs][gh-bug] and [feature requests][gh-feature]. Please search the existing issues before filing new issues to avoid duplicates. For new topics, file your bug or feature request as a new issue.
+
+For help and questions about using this project, please look at the [docs site for Windows Terminal][docs] and our [Contributor's Guide][contributor] if you want to work on Windows Terminal.
+
+## Microsoft Support Policy  
+
+Support for Windows Terminal is limited to the resources listed above.
+
+[gh-issue]: https://github.com/microsoft/terminal/issues/new/choose
+[gh-bug]: https://github.com/microsoft/terminal/issues/new?assignees=&labels=Issue-Bug&template=bug_report.md&title=
+[gh-feature]: https://github.com/microsoft/terminal/issues/new?assignees=&labels=Issue-Feature&template=Feature_Request.md&title=
+[docs]: https://docs.microsoft.com/windows/terminal
+[contributor]: https://github.com/microsoft/terminal/blob/master/CONTRIBUTING.md
--- a/build/pipelines/templates/build-console-steps.yml
+++ b/build/pipelines/templates/build-console-steps.yml
@@ -41,6 +41,8 @@ steps:
    configuration: '$(BuildConfiguration)'
    msbuildArgs: "${{ parameters.additionalBuildArguments }}"
    clean: true
+    # The build agents cannot currently support parallel build due to the
+    # memory requirements of our PCH files.
    maximumCpuCount: false

 - task: PowerShell@2
--- a/build/scripts/Test-WindowsTerminalPackage.ps1
+++ b/build/scripts/Test-WindowsTerminalPackage.ps1
@@ -106,6 +106,10 @@ Try {
        Throw "Failed to find wt.exe/wtd.exe -- check the WAP packaging project"
    }

+    If ($null -eq (Get-Item "$AppxPackageRootPath\OpenConsole.exe" -EA:Ignore)) {
+        Throw "Failed to find OpenConsole.exe -- check the WAP packaging project"
+    }
+
 } Finally {
    Remove-Item -Recurse -Force $AppxPackageRootPath
 }
--- a/custom.props
+++ b/custom.props
@@ -5,7 +5,7 @@
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
    <XesBaseYearForStoreVersion>2020</XesBaseYearForStoreVersion>
    <VersionMajor>1</VersionMajor>
-    <VersionMinor>4</VersionMinor>
+    <VersionMinor>5</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
  </PropertyGroup>
 </Project>
--- a/doc/TAEF.md
+++ b/doc/TAEF.md
@@ -1,9 +1,30 @@
-### TAEF ###
+### TAEF Overview ###
+
 TAEF, the Test Authoring and Execution Framework, is used extensively within the Windows organization to test the operating system code in a unified manner for system, driver, and application code. As the console is a Windows OS Component, we strive to continue using the same system such that tests can be ran in a unified manner both externally to Microsoft as well as inside the official OS Build/Test system.

-The [official documentation](https://msdn.microsoft.com/en-us/library/windows/hardware/hh439725\(v=vs.85\).aspx) for TAEF describes the basic architecture, usage, and functionality of the test system. It is similar to Visual Studio test, but a bit more comprehensive and flexible.
+The [official documentation](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/) for TAEF describes the basic architecture, usage, and functionality of the test system. It is similar to Visual Studio test, but a bit more comprehensive and flexible.

-For the purposes of the console project, you can run the tests using the *TE.exe* that matches the architecture for which the test was build (x86/x64) in the pattern
+### Writing Tests
+
+You may want to read the section [Authoring Tests in C++](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/authoring-tests-in-c--) before getting your hands dirty. Note that the quoted header name in `#include "WexTestClass.h"` might be a bit confusing. You are not required to copy TAEF headers into the project folder.
+
+Use the [TAEF Verify Macros for C++](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/verify) in your test code to perform verifications.
+
+### Running Tests
+
+If you have Visual Studio and related C++ components installed, and you have successfully restored NuGets, you should have the TAEF test runner `te.exe` available locally as part of the `Taef.Redist.Wlk` package.
+
+> Note that you cannot easily run TAEF tests directly through Visual Studio. The `Taef.Redist.Wlk` NuGet package comes with an adapter that will let you browse and execute TAEF tests inside of Visual Studio, but its performance and reliability prevent us from recommending it here.
+
+In a "normal" CMD environment, `te.exe` may not be directly available. Try the following command to set up the development enviroment first:
+
+```shell
+.\tools\razzle.cmd
+```
+
+Then you should be able to use `%TAEF%` as an alias of the actual `te.exe`.
+
+For the purposes of the OpenConsole project, you can run the tests using the `te.exe` that matches the architecture for which the test was built (x86/x64):

 	te.exe Console.Unit.Tests.dll

@@ -15,6 +36,15 @@ Limiting the tests to be run is also useful with:

 Any pattern of class/method names can be specified after the */name:* flag with wildcard patterns.

-For any further details on the functionality of the TAEF test runner, *TE.exe*, please see the documentation above or run the embedded help with
+For any further details on the functionality of the TAEF test runner, please see the [Executing Tests](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/executing-tests) section in the official documentation. Or run the embedded help with

 	te.exe /!
+
+If you use PowerShell, try the following command:
+
+```powershell
+Import-Module .\tools\OpenConsole.psm1
+Invoke-OpenConsoleTests
+```
+
+`Invoke-OpenConsoleTests` supports a number of options, which you can enumerate by running `Invoke-OpenConsoleTests -?`.
--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@@ -26,11 +26,25 @@
      ],
      "type": "string"
    },
+    "BellStyle": {
+      "enum": [
+        "none",
+        "audible"
+      ],
+      "type": "string"
+    },
    "ProfileGuid": {
      "default": "{}",
      "pattern": "^\\{[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\\}$",
      "type": "string"
    },
+    "Icon": {
+      "description": "Image file location or an emoji to be used as an icon. Displays within the tab, the dropdown menu, and jumplist.",
+      "type": [
+        "string",
+        "null"
+      ]
+    },
    "ShortcutActionName": {
      "enum": [
        "adjustFontSize",
@@ -465,6 +479,14 @@
              "type": "array"
            }
          ]
+        },
+        "icon": { "$ref": "#/definitions/Icon" },
+        "name": {
+          "description": "The name that will appear in the command palette. If one isn't provided, the terminal will attempt to automatically generate a name.",
+          "type": [
+            "string",
+            "null"
+          ]
        }
      },
      "required": [
@@ -497,6 +519,11 @@
          "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",
          "$ref": "#/definitions/CopyFormat"
        },
+        "disableAnimations": {
+          "default": false,
+          "description": "When set to `true`, visual animations will be disabled across the application.",
+          "type": "boolean"
+        },
        "largePasteWarning": {
          "default": true,
          "description": "When set to true, trying to paste text with more than 5 KiB of characters will display a warning asking you whether to continue or not with the paste.",
@@ -528,18 +555,18 @@
        },
        "initialCols": {
          "default": 120,
-          "description": "The number of columns displayed in the window upon first load.",
+          "description": "The number of columns displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
          "maximum": 999,
          "minimum": 1,
          "type": "integer"
        },
        "initialPosition": {
          "$ref": "#/definitions/Coordinates",
-          "description": "The position of the top left corner of the window upon first load. On a system with multiple displays, these coordinates are relative to the top left of the primary display. If \"launchMode\" is set to maximized, the window will be maximized on the monitor specified by those coordinates."
+          "description": "The position of the top left corner of the window upon first load. On a system with multiple displays, these coordinates are relative to the top left of the primary display. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), the window will be maximized on the monitor specified by those coordinates."
        },
        "initialRows": {
          "default": 30,
-          "description": "The number of rows displayed in the window upon first load.",
+          "description": "The number of rows displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
          "maximum": 999,
          "minimum": 1,
          "type": "integer"
@@ -551,11 +578,13 @@
        },
        "launchMode": {
          "default": "default",
-          "description": "Defines whether the terminal will launch as maximized, full screen, or in a window.",
+          "description": "Defines whether the terminal will launch as maximized, full screen, or in a window. Setting this to \"focus\" is equivalent to launching the terminal in the \"default\" mode, but with the focus mode enabled. Similar, setting this to \"maximizedFocus\" will result in launching the terminal in a maximized window with the focus mode enabled.",
          "enum": [
            "fullscreen",
            "maximized",
-            "default"
+            "default",
+            "focus",
+            "maximizedFocus"
          ],
          "type": "string"
        },
@@ -620,7 +649,7 @@
          "type": "boolean"
        },
        "useTabSwitcher": {
-          "default": false,
+          "default": true,
          "description": "When set to \"true\", the \"nextTab\" and \"prevTab\" commands will use the tab switcher UI.",
          "type": "boolean"
        }
@@ -695,6 +724,11 @@
          ],
          "type": "string"
        },
+        "bellStyle": {
+          "default": "audible",
+          "description": "Controls what happens when the application emits a BEL character. When set to \"audible\", the Terminal will play a sound. When set to \"none\", nothing will happen.",
+          "$ref": "#/definitions/BellStyle"
+        },
        "closeOnExit": {
          "default": "graceful",
          "description": "Sets how the profile reacts to termination or failure to launch. Possible values:\n -\"graceful\" (close when exit is typed or the process exits normally)\n -\"always\" (always close)\n -\"never\" (never close).\ntrue and false are accepted as synonyms for \"graceful\" and \"never\" respectively.",
@@ -810,10 +844,7 @@
          "minimum": -1,
          "type": "integer"
        },
-        "icon": {
-          "description": "Image file location of the icon used in the profile. Displays within the tab and the dropdown menu.",
-          "type": ["string", "null"]
-        },
+        "icon":{ "$ref": "#/definitions/Icon" },
        "name": {
          "description": "Name of the profile. Displays in the dropdown menu.",
          "minLength": 1,
--- a/doc/creating_a_new_project.md
+++ b/doc/creating_a_new_project.md
@@ -0,0 +1,54 @@
+# Creating a New Project
+
+## Creating a new WinRT Component DLL and referencing it in another project
+
+When creating a new DLL, it was really helpful to reference an existing DLL's `.vcxproj` like `TerminalControl.vcxproj`. While you should mostly try to copy what the existing `.vcxproj` has, here's a handful of things to double check for as you go along.
+
+- [ ] Make sure to `<Import>` our pre props at the _top_ of the vcxproj, and our post props at the _bottom_ of the vcxproj.
+```
+<!-- pre props --> 
+<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
+<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
+
+<!-- everything else -->
+
+<!-- post props -->
+<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
+```
+- [ ] Add a `<ProjectReference>` to your new `.vcxproj` in both `WindowsTerminal.vcxproj` and `TerminalApp.vcxproj`
+- [ ] Add a `<Reference>` to `TerminalAppLib.vcxproj` similar to this:
+```
+    <Reference Include="Microsoft.Terminal.NewDLL">
+      <HintPath>$(_BinRoot)TerminalNewDLL\Microsoft.Terminal.NewDLL.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
+```
+- [ ] Make sure the project has a `.def` file with the following lines. The `WINRT_GetActivationFactory` part is important to expose the new DLL's activation factory so that other projects can successfully call the DLL's `GetActivationFactory` to get the DLL's classes.
+```
+EXPORTS
+DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
+DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE
+```
+- For a bit more context on this whole process, the `AppXManifest.xml` file defines which classes belong to which DLLs. If your project wants class `X.Y.Z`, it can look it up in the manifest's definitions and see that it came from `X.Y.dll`. Then it'll load up the DLL, and call a particular function called `GetActivationFactory(L"X.Y.Z")` to get the class it wants. So, the definitions in `AppXManifest` are _required_ for this activation to work properly, and I found myself double checking the file to see that the definitions I expect are there.
+- _Note_: If your new library eventually rolls up as a reference to our Centennial Packaging project `CascadiaPackage`, you don't have to worry about manually adding your definitions to the `AppXManifest.xml` because the Centennial Packaging project automatically enumerates the reference tree of WinMDs and stitches that information into the `AppXManifest.xml`. However, if your new project does _not_ ultimately roll up to a packaging project that will automatically put the references into `AppXManifest`, you will have to add them in manually.
+
+### Troubleshooting
+- If you hit an error that looks like this: 
+    ```
+    X found processing metadata file ..\blah1\Microsoft.UI.Xaml.winmd, type already exists in file ..\blah\NewDLLProject\Microsoft.UI.Xaml.winmd.
+    ```
+    The `Microsoft.UI.Xaml.winmd` is showing up in the output folder when it shouldn't. Try adding this block at the top of your `.vcxproj`
+    ```
+    <ItemDefinitionGroup>
+    <Reference>
+        <Private>false</Private>
+    </Reference>
+    </ItemDefinitionGroup>
+    ```
+    This will make all references non-private, meaning "don't copy it into my folder" by default.
+
+- If you hit a `Class not Registered` error, this might be because a class isn't getting registered in the app manifest. You can go check `src/cascadia/CascadiaPackage/bin/x64/Debug/AppX/AppXManifest.xml` to see if there exist entries to the classes of your newly created DLL. If the references aren't there, double check that you've added `<ProjectReference>` blocks to both `WindowsTerminal.vcxproj` and `TerminalApp.vcxproj`.
+
+- If you hit an extremely vague error along the lines of `Error in the DLL`, and right before that line you notice that your new DLL is loaded and unloaded right after each other, double check that your new DLL's definitions show up in the `AppXManifest.xml` file. If your new DLL is included as a reference to a project that rolls up to `CascadiaPackage`, double check that you've created a `.def` file for the project. Otherwise if your new project _does not_ roll up to a package that populates the `AppXManifest` references for you, you'll have to add those references yourself.
--- a/doc/specs/#885
+++ b/doc/specs/#885
@@ -0,0 +1,251 @@
+---
+author: Carlos Zamora @carlos-zamora
+created on: 2020-07-10
+last updated: 2020-07-10
+issue id: [#885](https://github.com/microsoft/terminal/issues/885)
+---
+
+# Terminal Settings Model
+
+## Abstract
+
+This spec proposes a major refactor and repurposing of the TerminalSettings project as the TerminalSettingsModel.
+ TerminalSettingsModel would be responsible for exposing, serializing, and deserializing settings as WinRT objects
+ for Windows Terminal. In doing so, Terminal's settings model is accessible as WinRT objects to existing components
+ like TerminalApp, TerminalControl, and TerminalCore. Additionally, Terminal Settings can be used by the Settings UI or
+ Shell Extensions to modify or reference Terminal's settings respectively.
+
+## Inspiration
+
+The main driver for this change is the Settings UI. The Settings UI will need to read and modify Terminal's settings
+ objects. At the time of writing this spec, the Terminal's settings are serialized as objects in the TerminalApp project.
+ To access these objects via XAML, the Settings UI needs them to be WinRT objects. Additional features that need the
+ settings objects to be WinRT objects include future shell extensions, like jumplist.
+
+## Solution Design
+
+### Terminal Settings Model: Objects and Projections
+
+The following TerminalApp objects will become WinRT objects and will be moved to the TerminalSettingsModel project
+(formerly TerminalSettings):
+- ColorScheme
+- Profile
+- GlobalAppSettings
+- CascadiaSettings
+
+The TerminalSettingsModel project will have a root namespace of `Microsoft.Terminal.Settings.Model`.
+
+Adjacent to the introduction of these settings objects, `IControlSettings` and `ICoreSettings` will be moved
+ to the `Microsoft.Terminal.TerminalControl` namespace. This allows for a better consumption of the
+ settings model that is covered later in the (Consumption section)[#terminal-settings-model:-consumption].
+
+#### Moving/Splitting the Action Model
+
+Windows Terminal represents actions via several objects:
+- `AppKeyBindings`: a map of all the defined keybindings and their corresponding actions
+- `ActionAndArgs`: a (de)serializable action (this holds more objects inside of it, but we won't focus on that for now)
+- `ShortcutActionDispatch`: responsible for dispatching events pertinent to a given ActionAndArgs object
+`TerminalApp`'s `TerminalPage` handles any events dispatched by the `ShortcutActionDispatch`.
+
+With the introduction of the TerminalSettingsModel, we will split `AppKeyBindings` using a `KeyMapping` class.
+ This separation will look something like the following:
+```c++
+namespace TerminalApp
+{
+    [default_interface] runtimeclass AppKeyBindings : Microsoft.Terminal.TerminalControl.IKeyBindings
+    {
+        AppKeyBindings();
+
+        // NOTE: It may be possible to move both of these to the constructor instead
+        void SetDispatch(ShortcutActionDispatch dispatch);
+        void SetKeyMap(KeyMapping keymap);
+    }
+}
+
+namespace TerminalSettingsModel
+{
+    [default_interface] runtimeclass KeyMapping
+    {
+        void SetKeyBinding(ActionAndArgs actionAndArgs, Microsoft.Terminal.TerminalControl.KeyChord chord);
+        void ClearKeyBinding(Microsoft.Terminal.TerminalControl.KeyChord chord);
+
+        Microsoft.Terminal.TerminalControl.KeyChord GetKeyBindingForAction(ShortcutAction action);
+        Microsoft.Terminal.TerminalControl.KeyChord GetKeyBindingForActionWithArgs(ActionAndArgs actionAndArgs);
+    }
+}
+```
+This separation leaves `AppKeyBindings` with the responsibility of detecting and dispatching actions, whereas
+ `KeyMapping` handles the (de)serialization and navigation of the key bindings.
+
+
+### Terminal Settings Model: Serialization and Deserialization
+
+Introducing these `Microsoft.Terminal.Settings.Model` WinRT objects also allow the serialization and deserialization
+ logic from TerminalApp to be moved to TerminalSettings. `JsonUtils` introduces several quick and easy methods
+ for setting serialization. This will be moved into the `Microsoft.Terminal.Settings.Model` namespace too.
+
+Deserialization will be an extension of the existing `JsonUtils` `ConversionTrait` struct template. `ConversionTrait`
+ already includes `FromJson` and `CanConvert`. Serialization would be handled by a `ToJson` function.
+
+
+### Terminal Settings Model: Warnings and Serialization Errors
+
+Today, if the deserialization of `CascadiaSettings` encounters any errors, an exception is thrown and caught/handled
+ by falling back to a simple `CascadiaSettings` object. However, WinRT does not support exceptions.
+
+To get around this issue, when `CascadiaSettings` encounters a serialization error, it must internally record
+ any pertinent information for that error, and return the simple `CascadiaSettings` as if nothing happened.
+ The consumer must then call `CascadiaSettings::GetErrors()` and `CascadiaSettings::GetWarnings()` to properly
+ understand whether an error ocurred and how to present that to the user.
+
+
+#### TerminalApp: Loading and Reloading Changes
+
+TerminalApp will construct and reference a `CascadiaSettings settings` as follows:
+- TerminalApp will have a global reference to the "settings.json" filepath
+- construct an `CascadiaSettings` using `CascadiaSettings("settings.json")`. This builds an `CascadiaSettings`
+   from the "defaults.json" file data (which is already compiled as a string literal)
+   and layers the settings.json data on top of it.
+- check for errors/warnings, and handle them appropriately
+
+This will be different from the current model which has the settings.json path hardcoded, and is simplified
+ to a `LoadAll()` call wrapped in error handlers.
+
+**NOTE:** This model allows us to layer even more settings files on top of the existing Terminal Settings
+ Model, if so desired. This could be helpful when importing additional settings files from an external location
+ such as a marketplace.
+
+When TerminalApp detects a change to settings.json, it'll repeat the steps above. We could cache the result from
+ constructing an `CascadiaSettings` from "defaults.json" data to improve performance.
+
+
+#### TerminalControl: Acquiring and Applying the Settings
+
+At the time of writing this spec, TerminalApp constructs `TerminalControl.TerminalSettings` WinRT objects
+ to expose `IControlSettings` and `ICoreSettings` to any hosted terminals. In moving `IControlSettings`
+ and `ICoreSettings` down to the TerminalControl layer, TerminalApp can now have better control over
+ how to expose relevant settings to a TerminalControl instance.
+
+`TerminalSettings` (which implements `IControlSettings` and `ICoreSettings`) will be moved to
+ TerminalApp and act as a bridge connecting `CascadiaSettings` to the TermControl. It will operate
+ very similarly as it does today. On construction of the TermControl or hot-reload,
+ `TerminalSettings` will be constructed by copying the relevant values of `CascadiaSettings`.
+ Then, it will be passed to TermControl (and TermCore by extension).
+
+
+## UI/UX Design
+
+N/A
+
+## Capabilities
+
+### Accessibility
+
+N/A
+
+### Security
+
+N/A
+
+### Reliability
+
+N/A
+
+### Compatibility
+
+N/A
+
+### Performance, Power, and Efficiency
+
+## Potential Issues
+
+N/A
+
+## Future considerations
+
+### TerminalSettings: passing by reference
+
+`TermApp` synthesizes a `TerminalSettings` by copying the relevant values of `CascadiaSettings`,
+ then giving it to a Terminal Control. Some visual keybindings and interactions like ctrl+scroll
+ and ctrl+shift+scroll to change the font size and acrylic opacity operate by directly modifying
+ the value of the instantiated `TerminalSettings`. However, when a settings reload occurs,
+ these instanced changes are lost.
+
+`TerminalSettings` can be used as a WinRT object that references (instead of copies) the relevant
+ values of `CascadiaSettings`. This would prevent those instanced changes from being lost on a settings
+ reload.
+
+Since previewing commands like `setColorScheme` would require a clone of the existing `TerminalSettings`,
+ a `Clone` API can be added on `TerminalSettings` to accomplish that. When passing by value,
+ `TerminalSettings` can just overwrite the existing property (i.e.: color scheme). When passing
+ by reference, a slightly more complex mechanism is required to override the value.
+
+Now, instead of overwriting the value, we need to override the reference to a constant value
+(i.e.: `snapOnInput=true`) or a referenced value (i.e.: `colorScheme`).
+
+### Layering Additional Settings
+As we begin to introduce more sources that affect the settings (via extensions or themes),
+ we can introduce a `LayerSettings(String path)`. This layers the new settings file
+ onto the existing `CascadiaSettings`. This is already done internally, we would just expose
+ it via C++/WinRT.
+
+```c++
+runtimeclass CascadiaSettings
+{
+    // Load a settings file, and layer those changes on top of the existing CascadiaSettings
+    void LayerSettings(String path);
+}
+```
+
+### Settings UI: Modifying and Applying the Settings (DRAFT)
+
+```c++
+runtimeclass CascadiaSettings
+{
+    // Create a copy of the existing CascadiaSettings
+    CascadiaSettings Clone();
+
+    // Compares object to "source" and applies changes to
+    // the settings file at "outPath"
+    void Save(String outPath);
+}
+```
+
+The Settings UI will also have a reference to the `CascadiaSettings settings` from TerminalApp
+ as `settingsSource`. When the Settings UI is opened up, the Settings UI will also have its own `CascadiaSettings settingsClone`
+ that is a clone of TerminalApp's `CascadiaSettings`.
+```c++
+settingsClone = settingsSource.Clone()
+```
+
+As the user navigates the Settings UI, the relevant contents of `settingsClone` will be retrieved and presented.
+ As the user makes changes to the Settings UI, XAML will update `settingsClone` using XAML data binding.
+ When the user saves/applies the changes in the XAML, `settingsClone.Save("settings.json")` is called;
+ this compares the changes between `settingsClone` and `settingsSource`, then injects the changes (if any) to `settings.json`.
+
+As mentioned earlier, TerminalApp detects a change to "settings.json" to update its `CascadiaSettings`.
+ Since the above triggers a change to `settings.json`, TerminalApp will also update itself. When
+ something like this occurs, `settingsSource` will automatically be updated too.
+
+In the case that a user is simultaneously updating the settings file directly and the Settings UI,
+ `settingsSource` and `settingsClone` can be compared to ensure that the Settings UI, the TerminalApp,
+ and the settings files are all in sync.
+
+ **NOTE:** In the event that the user would want to export their current configuration, `Save`
+ can be used to export the changes to a new file.
+
+ ### Reserialization (DRAFT)
+
+After deserializing the settings, injecting the new json into settings.json
+ should not remove the existing comments or formatting.
+
+The reserialization process takes place right after comparing the `settingsSource` and `settingsClone` objects.
+ For each setting found in the diff, we go to the relevant part of the JSON and see if the key is already there.
+ If it is, we update the value to be the one from `settingsClone`. Otherwise, we append the key/value pair
+ at the end of the section (much like we do with dynamic profiles in `profiles`).
+
+## Resources
+
+- [Preview Commands](https://github.com/microsoft/terminal/issues/6689)
+- [New JSON Utils](https://github.com/microsoft/terminal/pull/6590)
+- [Spec: Settings UI](https://github.com/microsoft/terminal/pull/6720)
--- a/doc/terminal-v2-roadmap.md
+++ b/doc/terminal-v2-roadmap.md
@@ -22,15 +22,14 @@ 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 | |
-| 2020-08-31 | 1.3 in Windows Terminal Preview<br>[1.2] in Windows Terminal | |
-| 2020-09-30 | 1.4 in Windows Terminal Preview<br>1.3 in Windows Terminal | |
-| 2020-10-31 | 1.5 in Windows Terminal Preview<br>1.4 in Windows Terminal | |
-| 2020-11-30 | 1.6 in Windows Terminal Preview<br>1.5 in Windows Terminal | |
-| 2020-12-31 | 1.7 in Windows Terminal Preview<br>1.6 in Windows Terminal | |
-| 2021-01-31 | 1.8 in Windows Terminal Preview<br>1.7 in Windows Terminal | |
-| 2021-02-28 | 1.9 in Windows Terminal Preview<br>1.8 in Windows Terminal | |
-| 2021-03-31 | 1.10 in Windows Terminal Preview<br>1.9 in Windows Terminal | |
+| 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 | |
+| 2020-12-31 | 1.6 in Windows Terminal Preview<br>[1.5] in Windows Terminal | |
+| 2021-01-31 | 1.7 in Windows Terminal Preview<br>1.6 in Windows Terminal | |
+| 2021-02-28 | 1.8 in Windows Terminal Preview<br>1.8 in Windows Terminal | |
+| 2021-03-31 | 1.9 in Windows Terminal Preview<br>1.9 in Windows Terminal | |
 | 2021-04-30 | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
 | 2021-05-31 | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |

@@ -50,11 +49,11 @@ The following are a list of the key scenarios we're aiming to deliver for Termin

 | Priority\* | Scenario | Description/Notes |
 | ---------- | -------- | ----------------- |
-| 0 | Settings UI | A user interface that connects to settings.json. This provides a way for people to edit their settings without having to edit a JSON file.<br><br>Issue: [#1564] |
-| 0 | Command palette | A popup menu to list possible actions and commands.<br><br>Issues: [#5400], [#2046]<br>Spec: [#2193] |
+| 0 | Settings UI | A user interface that connects to settings.json. This provides a way for people to edit their settings without having to edit a JSON file.<br><br>Issue: [#1564]<br>Specs: [#6720], [#6904]<br>Implementation: [#7283], [#7370] |
+| 0 | Command palette | A popup menu to list possible actions and commands.<br><br>Issues: [#5400], [#2046]<br>Spec: [#2193]<br>Implementation: [#6635] |
 | 1 | Tab tear-off | The ability to tear a tab out of the current window and spawn a new window or attach it to a separate window.<br><br>Issue: [#1256]<br>Spec: [#2080] |
-| 1 | Clickable links | Hyperlinking any links that appear in the text buffer. When clicking on the link, the link will open in your default browser.<br><br>Issue: [#574] |
-| 1 | Default terminal | If a command-line application is spawned, it should open in Windows Terminal (if installed) or your preferred terminal<br><br>Issue: [#492]<br>Spec: [#2080] |
+| 1 | Clickable links | Hyperlinking any links that appear in the text buffer. When clicking on the link, the link will open in your default browser.<br><br>Issue: [#574]<br>Implementation: [#7251] |
+| 1 | Default terminal | If a command-line application is spawned, it should open in Windows Terminal (if installed) or your preferred terminal<br><br>Issue: [#492]<br>Spec: [#2080], [#7414] |
 | 1 | Overall theme support | Tab coloring, title bar coloring, pane border coloring, pane border width, definition of what makes a theme<br><br>Issue: [#3327]<br>Spec: [#5772] |
 | 1 | Open tab as admin/other user | Open tab in existing Windows Terminal instance as admin (if Terminal was run unelevated) or as another user.<br><br>Issue: [#5000] |
 | 1 | Traditional opacity | Have a transparent background without the acrylic blur.<br><br>Issue: [#603] |
@@ -62,7 +61,7 @@ The following are a list of the key scenarios we're aiming to deliver for Termin
 | 2 | Infinite scrollback | Have an infinite history for the text buffer.<br><br>Issue: [#1410] |
 | 2 | Pane management | All issues listed out in the original issue. Some features include pane resizing with mouse, pane zooming, and opening a pane by prompting which profile to use.<br><br>Issue: [#1000] |
 | 2 | Theme marketplace | Marketplace for creation and distribution of themes.<br>Dependent on overall theming |
-| 2 | Jump list | Show profiles from task bar (on right click)/start menu.<br><br>Issue: [#576] |
+| 2 | Jump list | Show profiles from task bar (on right click)/start menu.<br><br>Issue: [#576]<br>Implementation: [#7515] |
 | 2 | Open with multiple tabs | A setting that allows Windows Terminal to launch with a specific tab configuration (not using only command line arguments).<br><br>Issue: [#756] |
 | 3 | Open in Windows Terminal | Functionality to right click on a file or folder and select Open in Windows Terminal.<br><br>Issue: [#1060]<br>Implementation: [#6100] |
 | 3 | Session restoration | Launch Windows Terminal and the previous session is restored with the proper tab and pane configuration and starting directories.<br><br>Issues: [#961], [#960], [#766] |
@@ -80,16 +79,26 @@ Feature Notes:

 [1.1]: https://github.com/microsoft/terminal/milestone/24
 [1.2]: https://github.com/microsoft/terminal/milestone/25
+[1.3]: https://github.com/microsoft/terminal/milestone/26
+[1.4]: https://github.com/microsoft/terminal/milestone/28
+[1.5]: https://github.com/microsoft/terminal/milestone/30
 [2.0]: https://github.com/microsoft/terminal/milestone/22
 [#1564]: https://github.com/microsoft/terminal/issues/1564
+[#6720]: https://github.com/microsoft/terminal/pull/6720
+[#6904]: https://github.com/microsoft/terminal/pull/6904
+[#7283]: https://github.com/microsoft/terminal/pull/7283
+[#7370]: https://github.com/microsoft/terminal/pull/7370
 [#5400]: https://github.com/microsoft/terminal/issues/5400
 [#2046]: https://github.com/microsoft/terminal/issues/2046
 [#2193]: https://github.com/microsoft/terminal/pull/2193
+[#6635]: https://github.com/microsoft/terminal/pull/6635
 [#1256]: https://github.com/microsoft/terminal/issues/1256
 [#2080]: https://github.com/microsoft/terminal/pull/2080
 [#574]: https://github.com/microsoft/terminal/issues/574
+[#7251]: https://github.com/microsoft/terminal/pull/7251
 [#492]: https://github.com/microsoft/terminal/issues/492
 [#2080]: https://github.com/microsoft/terminal/pull/2080
+[#7414]: https://github.com/microsoft/terminal/pull/7414
 [#3327]: https://github.com/microsoft/terminal/issues/3327
 [#5772]: https://github.com/microsoft/terminal/pull/5772
 [#5000]: https://github.com/microsoft/terminal/issues/5000
@@ -100,6 +109,7 @@ Feature Notes:
 [#1410]: https://github.com/microsoft/terminal/issues/1410
 [#1000]: https://github.com/microsoft/terminal/issues/1000
 [#576]: https://github.com/microsoft/terminal/issues/576
+[#7515]: https://github.com/microsoft/terminal/pull/7515
 [#756]: https://github.com/microsoft/terminal/issues/756
 [#1060]: https://github.com/microsoft/terminal/issues/1060
 [#6100]: https://github.com/microsoft/terminal/pull/6100
--- a/src/buffer/out/textBuffer.cpp
+++ b/src/buffer/out/textBuffer.cpp
@@ -2281,35 +2281,32 @@ std::wstring TextBuffer::GetHyperlinkUriFromId(uint16_t id) const
 // - The user-defined id
 // Return value:
 // - The internal hyperlink ID
-uint16_t TextBuffer::GetHyperlinkId(std::wstring_view uri, std::wstring_view id)
+uint16_t TextBuffer::GetHyperlinkId(std::wstring_view params)
 {
-    uint16_t numericId = 0;
-    if (id.empty())
+    uint16_t id = 0;
+    if (params.empty())
    {
        // no custom id specified, return our internal count
-        numericId = _currentHyperlinkId;
+        id = _currentHyperlinkId;
        ++_currentHyperlinkId;
    }
    else
    {
        // assign _currentHyperlinkId if the custom id does not already exist
-        std::wstring newId{ id };
-        // hash the URL and add it to the custom ID - GH#7698
-        newId += L"%" + std::to_wstring(std::hash<std::wstring_view>{}(uri));
-        const auto result = _hyperlinkCustomIdMap.emplace(newId, _currentHyperlinkId);
+        const auto result = _hyperlinkCustomIdMap.emplace(params, _currentHyperlinkId);
        if (result.second)
        {
            // the custom id did not already exist
            ++_currentHyperlinkId;
        }
-        numericId = (*(result.first)).second;
+        id = (*(result.first)).second;
    }
    // _currentHyperlinkId could overflow, make sure its not 0
    if (_currentHyperlinkId == 0)
    {
        ++_currentHyperlinkId;
    }
-    return numericId;
+    return id;
 }

 // Method Description:
@@ -2350,13 +2347,11 @@ std::wstring TextBuffer::GetCustomIdFromId(uint16_t id) const
 }

 // Method Description:
-// - Copies the hyperlink/customID maps of the old buffer into this one,
-//   also copies currentHyperlinkId
+// - Copies the hyperlink/customID maps of the old buffer into this one
 // Arguments:
 // - The other buffer
 void TextBuffer::CopyHyperlinkMaps(const TextBuffer& other)
 {
    _hyperlinkMap = other._hyperlinkMap;
    _hyperlinkCustomIdMap = other._hyperlinkCustomIdMap;
-    _currentHyperlinkId = other._currentHyperlinkId;
 }
--- a/src/buffer/out/textBuffer.hpp
+++ b/src/buffer/out/textBuffer.hpp
@@ -143,7 +143,7 @@ public:

    void AddHyperlinkToMap(std::wstring_view uri, uint16_t id);
    std::wstring GetHyperlinkUriFromId(uint16_t id) const;
-    uint16_t GetHyperlinkId(std::wstring_view uri, std::wstring_view id);
+    uint16_t GetHyperlinkId(std::wstring_view params);
    void RemoveHyperlinkFromMap(uint16_t id);
    std::wstring GetCustomIdFromId(uint16_t id) const;
    void CopyHyperlinkMaps(const TextBuffer& OtherBuffer);
--- a/src/cascadia/CascadiaResources.build.items
+++ b/src/cascadia/CascadiaResources.build.items
@@ -26,7 +26,7 @@
      <Link>ProfileIcons\%(RecursiveDir)%(FileName)%(Extension)</Link>
    </Content>
    <!-- Default Settings -->
-    <Content Include="$(OpenConsoleDir)src\cascadia\TerminalApp\defaults.json">
+    <Content Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsModel\defaults.json">
      <DeploymentContent>true</DeploymentContent>
      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
    </Content>
--- a/src/cascadia/LocalTests_SettingsModel/ColorSchemeTests.cpp
+++ b/src/cascadia/LocalTests_SettingsModel/ColorSchemeTests.cpp
@@ -3,18 +3,17 @@

 #include "pch.h"

-#include "../TerminalApp/ColorScheme.h"
-#include "../TerminalApp/CascadiaSettings.h"
+#include "../TerminalSettingsModel/ColorScheme.h"
+#include "../TerminalSettingsModel/CascadiaSettings.h"
 #include "JsonTestClass.h"

 using namespace Microsoft::Console;
-using namespace TerminalApp;
-using namespace winrt::TerminalApp::implementation;
+using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;

-namespace TerminalAppLocalTests
+namespace SettingsModelLocalTests
 {
    // TODO:microsoft/terminal#3838:
    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
@@ -131,11 +130,11 @@ namespace TerminalAppLocalTests
        const auto scheme2Json = VerifyParseSucceeded(scheme2String);

        auto scheme0 = ColorScheme::FromJson(scheme0Json);
-        VERIFY_ARE_EQUAL(L"scheme0", scheme0->_schemeName);
-        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_defaultForeground);
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_defaultBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 0), scheme0->_selectionBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 1), scheme0->_cursorColor);
+        VERIFY_ARE_EQUAL(L"scheme0", scheme0->_Name);
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_Foreground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_Background);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 0), scheme0->_SelectionBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 1), scheme0->_CursorColor);
        VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 0), scheme0->_table[XTERM_RED_ATTR]);
        VERIFY_ARE_EQUAL(ARGB(0, 0, 1, 0), scheme0->_table[XTERM_GREEN_ATTR]);
        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 1), scheme0->_table[XTERM_BLUE_ATTR]);
@@ -144,10 +143,10 @@ namespace TerminalAppLocalTests
            L"Layering scheme1 on top of scheme0"));
        scheme0->LayerJson(scheme1Json);

-        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme0->_defaultForeground);
-        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme0->_defaultBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 0), scheme0->_selectionBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 4, 0, 4), scheme0->_cursorColor);
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme0->_Foreground);
+        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme0->_Background);
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 0), scheme0->_SelectionBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 4, 0, 4), scheme0->_CursorColor);
        VERIFY_ARE_EQUAL(ARGB(0, 2, 0, 0), scheme0->_table[XTERM_RED_ATTR]);
        VERIFY_ARE_EQUAL(ARGB(0, 0, 1, 0), scheme0->_table[XTERM_GREEN_ATTR]);
        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 2), scheme0->_table[XTERM_BLUE_ATTR]);
@@ -156,10 +155,10 @@ namespace TerminalAppLocalTests
            L"Layering scheme2Json on top of (scheme0+scheme1)"));
        scheme0->LayerJson(scheme2Json);

-        VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_defaultForeground);
-        VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_defaultBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 0), scheme0->_selectionBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 6, 0, 6), scheme0->_cursorColor);
+        VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_Foreground);
+        VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_Background);
+        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 0), scheme0->_SelectionBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 6, 0, 6), scheme0->_CursorColor);
        VERIFY_ARE_EQUAL(ARGB(0, 3, 0, 0), scheme0->_table[XTERM_RED_ATTR]);
        VERIFY_ARE_EQUAL(ARGB(0, 0, 3, 0), scheme0->_table[XTERM_GREEN_ATTR]);
        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 2), scheme0->_table[XTERM_BLUE_ATTR]);
@@ -193,7 +192,7 @@ namespace TerminalAppLocalTests
        const auto scheme2Json = VerifyParseSucceeded(scheme2String);
        const auto scheme3Json = VerifyParseSucceeded(scheme3String);

-        auto settings = winrt::make_self<winrt::TerminalApp::implementation::CascadiaSettings>();
+        auto settings = winrt::make_self<CascadiaSettings>();

        VERIFY_ARE_EQUAL(0u, settings->_globals->ColorSchemes().Size());
        VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme0Json));
@@ -218,8 +217,8 @@ namespace TerminalAppLocalTests
            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme1Json));
            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
-            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_defaultForeground);
-            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_Foreground);
+            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_Background);
        }

        settings->_LayerOrCreateColorScheme(scheme1Json);
@@ -238,10 +237,10 @@ namespace TerminalAppLocalTests
            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme1Json));
            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
-            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_defaultForeground);
-            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_defaultBackground);
-            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_defaultForeground);
-            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_Foreground);
+            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_Background);
+            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_Foreground);
+            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_Background);
        }
        settings->_LayerOrCreateColorScheme(scheme2Json);

@@ -259,10 +258,10 @@ namespace TerminalAppLocalTests
            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme1Json));
            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
-            VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_defaultForeground);
-            VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_defaultBackground);
-            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_defaultForeground);
-            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_Foreground);
+            VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_Background);
+            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_Foreground);
+            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_Background);
        }
        settings->_LayerOrCreateColorScheme(scheme3Json);

@@ -283,12 +282,12 @@ namespace TerminalAppLocalTests
            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme1Json));
            VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
            VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
-            VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_defaultForeground);
-            VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_defaultBackground);
-            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_defaultForeground);
-            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_defaultBackground);
-            VERIFY_ARE_EQUAL(ARGB(0, 6, 6, 6), scheme2->_defaultForeground);
-            VERIFY_ARE_EQUAL(ARGB(0, 7, 7, 7), scheme2->_defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_Foreground);
+            VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_Background);
+            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_Foreground);
+            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_Background);
+            VERIFY_ARE_EQUAL(ARGB(0, 6, 6, 6), scheme2->_Foreground);
+            VERIFY_ARE_EQUAL(ARGB(0, 7, 7, 7), scheme2->_Background);
        }
    }
 }
--- a/src/cascadia/LocalTests_SettingsModel/CommandTests.cpp
+++ b/src/cascadia/LocalTests_SettingsModel/CommandTests.cpp
@@ -3,20 +3,19 @@

 #include "pch.h"

-#include "../TerminalApp/CascadiaSettings.h"
+#include "../TerminalSettingsModel/CascadiaSettings.h"
 #include "JsonTestClass.h"
 #include "TestUtils.h"

 using namespace Microsoft::Console;
-using namespace TerminalApp;
-using namespace winrt::TerminalApp;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Windows::Foundation::Collections;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;

-namespace TerminalAppLocalTests
+namespace SettingsModelLocalTests
 {
    // TODO:microsoft/terminal#3838:
    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
@@ -62,7 +61,7 @@ namespace TerminalAppLocalTests
        const auto commands1Json = VerifyParseSucceeded(commands1String);
        const auto commands2Json = VerifyParseSucceeded(commands2String);

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

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

        const auto commands0Json = VerifyParseSucceeded(commands0String);

-        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
+        IMap<winrt::hstring, Command> 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());
@@ -168,7 +167,7 @@ namespace TerminalAppLocalTests
            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
        }
        {
            auto command = commands.Lookup(L"command1");
@@ -178,7 +177,7 @@ namespace TerminalAppLocalTests
            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
        }
        {
            auto command = commands.Lookup(L"command2");
@@ -188,7 +187,7 @@ namespace TerminalAppLocalTests
            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
        }
        {
            auto command = commands.Lookup(L"command4");
@@ -198,7 +197,7 @@ namespace TerminalAppLocalTests
            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
        }
        {
            auto command = commands.Lookup(L"command5");
@@ -208,7 +207,7 @@ namespace TerminalAppLocalTests
            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
        }
    }
    void CommandTests::TestResourceKeyName()
@@ -218,7 +217,7 @@ namespace TerminalAppLocalTests
        const std::string commands0String{ R"([ { "name": { "key": "DuplicateTabCommandKey"}, "command": "copy" } ])" };
        const auto commands0Json = VerifyParseSucceeded(commands0String);

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

        const auto commands0Json = VerifyParseSucceeded(commands0String);

-        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
+        IMap<winrt::hstring, Command> 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());
@@ -284,7 +283,7 @@ namespace TerminalAppLocalTests
            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
        }
        {
            auto command = commands.Lookup(L"Split pane, split: vertical");
@@ -294,7 +293,7 @@ namespace TerminalAppLocalTests
            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
        }
        {
            auto command = commands.Lookup(L"Split pane, split: horizontal");
@@ -304,7 +303,7 @@ namespace TerminalAppLocalTests
            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
        }
    }
    void CommandTests::TestLayerOnAutogeneratedName()
@@ -316,7 +315,7 @@ namespace TerminalAppLocalTests

        const auto commands0Json = VerifyParseSucceeded(commands0String);

-        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
+        IMap<winrt::hstring, Command> 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());
@@ -330,7 +329,7 @@ namespace TerminalAppLocalTests
            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
        }
    }
 }
--- a/src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp
+++ b/src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp
--- a/src/cascadia/LocalTests_SettingsModel/JsonTestClass.h
+++ b/src/cascadia/LocalTests_SettingsModel/JsonTestClass.h
--- a/src/cascadia/LocalTests_SettingsModel/KeyBindingsTests.cpp
+++ b/src/cascadia/LocalTests_SettingsModel/KeyBindingsTests.cpp
@@ -3,21 +3,20 @@

 #include "pch.h"

-#include "../TerminalApp/ColorScheme.h"
-#include "../TerminalApp/CascadiaSettings.h"
-#include "../KeyMapping.h"
+#include "../TerminalSettingsModel/ColorScheme.h"
+#include "../TerminalSettingsModel/CascadiaSettings.h"
+#include "../TerminalSettingsModel/KeyMapping.h"
 #include "JsonTestClass.h"
 #include "TestUtils.h"

 using namespace Microsoft::Console;
-using namespace TerminalApp;
-using namespace winrt::TerminalApp;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;

-namespace TerminalAppLocalTests
+namespace SettingsModelLocalTests
 {
    // TODO:microsoft/terminal#3838:
    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
@@ -67,7 +66,7 @@ namespace TerminalAppLocalTests
        const auto bindings1Json = VerifyParseSucceeded(bindings1String);
        const auto bindings2Json = VerifyParseSucceeded(bindings2String);

-        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        auto keymap = winrt::make_self<implementation::KeyMapping>();
        VERIFY_IS_NOT_NULL(keymap);
        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());

@@ -91,7 +90,7 @@ namespace TerminalAppLocalTests
        const auto bindings1Json = VerifyParseSucceeded(bindings1String);
        const auto bindings2Json = VerifyParseSucceeded(bindings2String);

-        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        auto keymap = winrt::make_self<implementation::KeyMapping>();
        VERIFY_IS_NOT_NULL(keymap);
        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());

@@ -121,7 +120,7 @@ namespace TerminalAppLocalTests
        const auto bindings4Json = VerifyParseSucceeded(bindings4String);
        const auto bindings5Json = VerifyParseSucceeded(bindings5String);

-        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        auto keymap = winrt::make_self<implementation::KeyMapping>();
        VERIFY_IS_NOT_NULL(keymap);
        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());

@@ -190,7 +189,7 @@ namespace TerminalAppLocalTests

        const auto bindings0Json = VerifyParseSucceeded(bindings0String);

-        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        auto keymap = winrt::make_self<implementation::KeyMapping>();
        VERIFY_IS_NOT_NULL(keymap);
        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
        keymap->LayerJson(bindings0Json);
@@ -200,7 +199,7 @@ namespace TerminalAppLocalTests
            Log::Comment(NoThrowString().Format(
                L"Verify that `copy` without args parses as Copy(SingleLine=false)"));
            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
@@ -211,7 +210,7 @@ namespace TerminalAppLocalTests
            Log::Comment(NoThrowString().Format(
                L"Verify that `copy` with args parses them correctly"));
            KeyChord kc{ true, false, true, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
@@ -222,7 +221,7 @@ namespace TerminalAppLocalTests
            Log::Comment(NoThrowString().Format(
                L"Verify that `copy` with args parses them correctly"));
            KeyChord kc{ false, true, true, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
@@ -233,7 +232,7 @@ namespace TerminalAppLocalTests
            Log::Comment(NoThrowString().Format(
                L"Verify that `newTab` without args parses as NewTab(Index=null)"));
            KeyChord kc{ true, false, false, static_cast<int32_t>('T') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
@@ -245,7 +244,7 @@ namespace TerminalAppLocalTests
            Log::Comment(NoThrowString().Format(
                L"Verify that `newTab` parses args correctly"));
            KeyChord kc{ true, false, true, static_cast<int32_t>('T') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
@@ -259,7 +258,7 @@ namespace TerminalAppLocalTests
                L"Verify that `newTab` with an index greater than the legacy "
                L"args afforded parses correctly"));
            KeyChord kc{ true, false, true, static_cast<int32_t>('Y') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
@@ -273,7 +272,7 @@ namespace TerminalAppLocalTests
            Log::Comment(NoThrowString().Format(
                L"Verify that `copy` ignores args it doesn't understand"));
            KeyChord kc{ true, false, true, static_cast<int32_t>('B') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::CopyText, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
@@ -285,7 +284,7 @@ namespace TerminalAppLocalTests
            Log::Comment(NoThrowString().Format(
                L"Verify that `copy` null as it's `args` parses as the default option"));
            KeyChord kc{ true, false, true, static_cast<int32_t>('B') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::CopyText, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
@@ -297,7 +296,7 @@ namespace TerminalAppLocalTests
            Log::Comment(NoThrowString().Format(
                L"Verify that `adjustFontSize` with a positive delta parses args correctly"));
            KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::AdjustFontSize, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<AdjustFontSizeArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
@@ -309,7 +308,7 @@ namespace TerminalAppLocalTests
            Log::Comment(NoThrowString().Format(
                L"Verify that `adjustFontSize` with a negative delta parses args correctly"));
            KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::AdjustFontSize, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<AdjustFontSizeArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
@@ -330,7 +329,7 @@ namespace TerminalAppLocalTests

        const auto bindings0Json = VerifyParseSucceeded(bindings0String);

-        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        auto keymap = winrt::make_self<implementation::KeyMapping>();
        VERIFY_IS_NOT_NULL(keymap);
        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
        keymap->LayerJson(bindings0Json);
@@ -338,48 +337,48 @@ namespace TerminalAppLocalTests

        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
        }
        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
        }
        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('E') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
        }
        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
        }
        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('H') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
        }
    }

@@ -393,7 +392,7 @@ namespace TerminalAppLocalTests

        const auto bindings0Json = VerifyParseSucceeded(bindings0String);

-        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        auto keymap = winrt::make_self<implementation::KeyMapping>();
        VERIFY_IS_NOT_NULL(keymap);
        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
        keymap->LayerJson(bindings0Json);
@@ -401,7 +400,7 @@ namespace TerminalAppLocalTests

        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
@@ -410,7 +409,7 @@ namespace TerminalAppLocalTests
        }
        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
@@ -421,7 +420,7 @@ namespace TerminalAppLocalTests
        }
        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
            const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
@@ -438,7 +437,7 @@ namespace TerminalAppLocalTests

        const auto bindings0Json = VerifyParseSucceeded(bindings0String);

-        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
+        auto keymap = winrt::make_self<implementation::KeyMapping>();
        VERIFY_IS_NOT_NULL(keymap);
        VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
        keymap->LayerJson(bindings0Json);
@@ -446,7 +445,7 @@ namespace TerminalAppLocalTests

        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
            VERIFY_IS_NOT_NULL(realArgs);
            // Verify the args have the expected value
--- a/src/cascadia/LocalTests_SettingsModel/LocalTests_SettingsModel.def
+++ b/src/cascadia/LocalTests_SettingsModel/LocalTests_SettingsModel.def
@@ -0,0 +1,3 @@
+EXPORTS
+DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
+DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE
--- a/src/cascadia/LocalTests_SettingsModel/ProfileTests.cpp
+++ b/src/cascadia/LocalTests_SettingsModel/ProfileTests.cpp
@@ -3,18 +3,17 @@

 #include "pch.h"

-#include "../TerminalApp/ColorScheme.h"
-#include "../TerminalApp/CascadiaSettings.h"
+#include "../TerminalSettingsModel/ColorScheme.h"
+#include "../TerminalSettingsModel/CascadiaSettings.h"
 #include "JsonTestClass.h"

 using namespace Microsoft::Console;
-using namespace TerminalApp;
-using namespace winrt::TerminalApp;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;

-namespace TerminalAppLocalTests
+namespace SettingsModelLocalTests
 {
    // TODO:microsoft/terminal#3838:
    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
@@ -196,32 +195,32 @@ namespace TerminalAppLocalTests
        const auto profile3Json = VerifyParseSucceeded(profile3String);

        auto profile0 = implementation::Profile::FromJson(profile0Json);
-        VERIFY_IS_FALSE(profile0->IconPath().empty());
-        VERIFY_ARE_EQUAL(L"not-null.png", profile0->IconPath());
+        VERIFY_IS_FALSE(profile0->Icon().empty());
+        VERIFY_ARE_EQUAL(L"not-null.png", profile0->Icon());

        Log::Comment(NoThrowString().Format(
            L"Verify that layering an object the key set to null will clear the key"));
        profile0->LayerJson(profile1Json);
-        VERIFY_IS_TRUE(profile0->IconPath().empty());
+        VERIFY_IS_TRUE(profile0->Icon().empty());

        profile0->LayerJson(profile2Json);
-        VERIFY_IS_TRUE(profile0->IconPath().empty());
+        VERIFY_IS_TRUE(profile0->Icon().empty());

        profile0->LayerJson(profile3Json);
-        VERIFY_IS_FALSE(profile0->IconPath().empty());
-        VERIFY_ARE_EQUAL(L"another-real.png", profile0->IconPath());
+        VERIFY_IS_FALSE(profile0->Icon().empty());
+        VERIFY_ARE_EQUAL(L"another-real.png", profile0->Icon());

        Log::Comment(NoThrowString().Format(
            L"Verify that layering an object _without_ the key will not clear the key"));
        profile0->LayerJson(profile2Json);
-        VERIFY_IS_FALSE(profile0->IconPath().empty());
-        VERIFY_ARE_EQUAL(L"another-real.png", profile0->IconPath());
+        VERIFY_IS_FALSE(profile0->Icon().empty());
+        VERIFY_ARE_EQUAL(L"another-real.png", profile0->Icon());

        auto profile1 = implementation::Profile::FromJson(profile1Json);
-        VERIFY_IS_TRUE(profile1->IconPath().empty());
+        VERIFY_IS_TRUE(profile1->Icon().empty());
        profile1->LayerJson(profile3Json);
-        VERIFY_IS_FALSE(profile1->IconPath().empty());
-        VERIFY_ARE_EQUAL(L"another-real.png", profile1->IconPath());
+        VERIFY_IS_FALSE(profile1->Icon().empty());
+        VERIFY_ARE_EQUAL(L"another-real.png", profile1->Icon());
    }

    void ProfileTests::LayerProfilesOnArray()
@@ -253,7 +252,7 @@ namespace TerminalAppLocalTests
        const auto profile3Json = VerifyParseSucceeded(profile3String);
        const auto profile4Json = VerifyParseSucceeded(profile4String);

-        auto settings = winrt::make_self<winrt::TerminalApp::implementation::CascadiaSettings>();
+        auto settings = winrt::make_self<implementation::CascadiaSettings>();

        VERIFY_ARE_EQUAL(0u, settings->_profiles.Size());
        VERIFY_IS_NULL(settings->_FindMatchingProfile(profile0Json));
--- a/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj
+++ b/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- A note about this project: We're building the test code dll from this
+    project, but it _MUST_ be run in conjunction with the TestHostApp project.
+    TestHostApp actually will build a TestHost executable and packaging bits
+    that we can use to run our tests. We need TestHostApp so that our
+    dependencies, like MUX, can be aggregated correctly, and resources properly
+    combined into a resources.pri file.
+
+    TestHostApp will manually copy the output of this project into it's own
+    OutDir, so we can run the tests from there. -->
+
+  <PropertyGroup>
+    <ProjectGuid>{CA5CAD1A-9B68-456A-B13E-C8218070DC42}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>SettingsModelLocalTests</RootNamespace>
+    <ProjectName>LocalTests_SettingsModel</ProjectName>
+    <TargetName>SettingsModel.LocalTests</TargetName>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <!-- We'll manage our own OutDir/IntDir -->
+    <NoOutputRedirection>true</NoOutputRedirection>
+  </PropertyGroup>
+
+  <PropertyGroup>
+  <!-- Manually change our outdir to be in a subdirectory. We don't really want
+    to put our output in the bin root, because if we do, we'll copy
+    TerminalApp.winmd to the bin root, and then every subsequent mdmerge step
+    (in _any_ cppwinrt project) will automatically try to pick up
+    TerminalApp.winmd as a dependency (which is just wrong). This MUST be done
+    before importing common.build.pre.props -->
+    <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+
+  <Import Project="$(SolutionDir)\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
+  <Import Project="$(OpenConsoleDir)\src\cppwinrt.build.pre.props" />
+
+  <!-- ========================= Headers ======================== -->
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="JsonTestClass.h" />
+  </ItemGroup>
+
+  <!-- ========================= Cpp Files ======================== -->
+  <ItemGroup>
+    <ClCompile Include="ProfileTests.cpp" />
+    <ClCompile Include="ColorSchemeTests.cpp" />
+    <ClCompile Include="KeyBindingsTests.cpp" />
+    <ClCompile Include="CommandTests.cpp" />
+    <ClCompile Include="DeserializationTests.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <!-- You _NEED_ to include this file and the jsoncpp IncludePath (below) if
+    you want to use jsoncpp -->
+    <ClCompile Include="$(OpenConsoleDir)\dep\jsoncpp\jsoncpp.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+
+  <!-- ========================= Project References ======================== -->
+  <ItemGroup>
+    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\Microsoft.Terminal.Settings.ModelLib.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)\src\types\lib\types.vcxproj" />
+
+    <!-- If you don't reference these projects here, the
+    _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />
+  </ItemGroup>
+
+  <!-- ========================= Globals ======================== -->
+
+  <!-- ====================== Compiler & Linker Flags ===================== -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\jsoncpp\json;$(OpenConsoleDir)src\inc;$(OpenConsoleDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\Generated Files";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+
+      <!-- Manually disable unreachable code warning, because jconcpp has a ton of that. -->
+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>onecoreuap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <PropertyGroup>
+    <GenerateManifest>true</GenerateManifest>
+    <EmbedManifest>true</EmbedManifest>
+  </PropertyGroup>
+
+  <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
+  <Import Project="$(OpenConsoleDir)src\common.build.post.props" />
+  <Import Project="$(OpenConsoleDir)src\common.build.tests.props" />
+
+  <PropertyGroup>
+    <_CppWinrtBinRoot>&quot;$(OpenConsoleDir)$(Platform)\$(Configuration)\&quot;</_CppWinrtBinRoot>
+    <!-- From Microsoft.UI.Xaml.targets -->
+    <Native-Platform Condition="'$(Platform)' == 'Win32'">x86</Native-Platform>
+    <Native-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</Native-Platform>
+    <_MUXBinRoot>&quot;$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\runtimes\win10-$(Native-Platform)\native\&quot;</_MUXBinRoot>
+  </PropertyGroup>
+
+<!-- We actually can just straight up reference MUX here, it's fine -->
+  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets')" />
+
+</Project>
--- a/src/cascadia/LocalTests_SettingsModel/TestUtils.h
+++ b/src/cascadia/LocalTests_SettingsModel/TestUtils.h
@@ -12,7 +12,7 @@ Author(s):
    Mike Griese (migrie) December-2019
 --*/

-class TerminalAppLocalTests::TestUtils
+class TestUtils
 {
 public:
    // Function Description:
@@ -23,8 +23,8 @@ public:
    // - kc: The key chord to look up the bound ActionAndArgs for.
    // Return Value:
    // - The ActionAndArgs bound to the given key, or nullptr if nothing is bound to it.
-    static const winrt::TerminalApp::ActionAndArgs GetActionAndArgs(const winrt::TerminalApp::implementation::KeyMapping& keymap,
-                                                                    const winrt::Microsoft::Terminal::TerminalControl::KeyChord& kc)
+    static const winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs GetActionAndArgs(const winrt::Microsoft::Terminal::Settings::Model::KeyMapping& keymap,
+                                                                                             const winrt::Microsoft::Terminal::TerminalControl::KeyChord& kc)
    {
        std::wstring buffer{ L"" };
        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Ctrl))
--- a/src/cascadia/LocalTests_SettingsModel/pch.cpp
+++ b/src/cascadia/LocalTests_SettingsModel/pch.cpp
@@ -0,0 +1,4 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
--- a/src/cascadia/LocalTests_SettingsModel/pch.h
+++ b/src/cascadia/LocalTests_SettingsModel/pch.h
@@ -0,0 +1,65 @@
+/*++
+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).
+
+Author(s):
+- Carlos Zamora (cazamor) April 2019
+--*/
+
+#pragma once
+
+// Manually include til after we include Windows.Foundation to give it winrt superpowers
+#define BLOCK_TIL
+// This includes support libraries from the CRT, STL, WIL, and GSL
+#include "LibraryIncludes.h"
+// This is inexplicable, but for whatever reason, cppwinrt conflicts with the
+//      SDK definition of this function, so the only fix is to undef it.
+// from WinBase.h
+// Windows::UI::Xaml::Media::Animation::IStoryboard::GetCurrentTime
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
+#include <wil/cppwinrt.h>
+#include <unknwn.h>
+#include <hstring.h>
+
+#include <WexTestClass.h>
+#include <json.h>
+#include "consoletaeftemplates.hpp"
+
+#include <winrt/Windows.ApplicationModel.Resources.Core.h>
+#include "winrt/Windows.UI.Xaml.Markup.h"
+#include <winrt/Windows.system.h>
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
+#include <winrt/windows.ui.core.h>
+#include <winrt/Windows.ui.input.h>
+#include <winrt/Windows.UI.Xaml.Controls.h>
+#include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
+#include <winrt/Windows.ui.xaml.media.h>
+#include <winrt/Windows.ui.xaml.input.h>
+#include <winrt/Windows.UI.Xaml.Markup.h>
+#include <winrt/Windows.UI.Xaml.Documents.h>
+
+#include <windows.ui.xaml.media.dxinterop.h>
+
+#include <winrt/windows.applicationmodel.core.h>
+
+#include <winrt/Microsoft.UI.Xaml.Controls.h>
+
+// Manually include til after we include Windows.Foundation to give it winrt superpowers
+#include "til.h"
+
+// Common includes for most tests:
+#include "../../inc/argb.h"
+#include "../../inc/conattrs.hpp"
+#include "../../types/inc/utils.hpp"
+#include "../../inc/DefaultSettings.h"
--- a/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
@@ -6,12 +6,12 @@

 #include "../TerminalApp/TerminalPage.h"
 #include "../TerminalApp/AppCommandlineArgs.h"
-#include "../TerminalApp/ActionArgs.h"

 using namespace WEX::Logging;
 using namespace WEX::Common;
 using namespace WEX::TestExecution;

+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::TerminalApp;
 using namespace ::TerminalApp;

@@ -57,6 +57,7 @@ namespace TerminalAppLocalTests
        TEST_METHOD(TestSimpleExecuteCommandlineAction);
        TEST_METHOD(TestMultipleCommandExecuteCommandlineAction);
        TEST_METHOD(TestInvalidExecuteCommandlineAction);
+        TEST_METHOD(TestLaunchMode);

    private:
        void _buildCommandlinesHelper(AppCommandlineArgs& appArgs,
@@ -1076,9 +1077,8 @@ namespace TerminalAppLocalTests

    void CommandlineTest::TestSimpleExecuteCommandlineAction()
    {
-        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
-        args->Commandline(L"new-tab");
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(*args);
+        ExecuteCommandlineArgs args{ L"new-tab" };
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
        VERIFY_ARE_EQUAL(1u, actions.size());
        auto actionAndArgs = actions.at(0);
        VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
@@ -1095,9 +1095,8 @@ namespace TerminalAppLocalTests

    void CommandlineTest::TestMultipleCommandExecuteCommandlineAction()
    {
-        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
-        args->Commandline(L"new-tab ; split-pane");
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(*args);
+        ExecuteCommandlineArgs args{ L"new-tab ; split-pane" };
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
        VERIFY_ARE_EQUAL(2u, actions.size());
        {
            auto actionAndArgs = actions.at(0);
@@ -1129,10 +1128,100 @@ namespace TerminalAppLocalTests

    void CommandlineTest::TestInvalidExecuteCommandlineAction()
    {
-        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
        // -H and -V cannot be combined.
-        args->Commandline(L"split-pane -H -V");
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(*args);
+        ExecuteCommandlineArgs args{ L"split-pane -H -V" };
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
        VERIFY_ARE_EQUAL(0u, actions.size());
    }
+
+    void CommandlineTest::TestLaunchMode()
+    {
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_IS_FALSE(appArgs.GetLaunchMode().has_value());
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-F" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
+            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FullscreenMode);
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--fullscreen" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
+            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FullscreenMode);
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-M" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
+            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedMode);
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
+            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedMode);
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-f" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
+            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FocusMode);
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--focus" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
+            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FocusMode);
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-fM" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
+            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized", L"--focus" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
+            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized", L"--focus", L"--focus" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
+            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized", L"--focus", L"--maximized" };
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
+            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
+        }
+    }
 }
--- a/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
--- a/src/cascadia/LocalTests_TerminalApp/TabTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/TabTests.cpp
@@ -9,11 +9,11 @@
 #include "../TerminalApp/ShortcutActionDispatch.h"
 #include "../TerminalApp/Tab.h"
 #include "../CppWinrtTailored.h"
-#include "JsonTestClass.h"

 using namespace Microsoft::Console;
 using namespace TerminalApp;
 using namespace winrt::TerminalApp;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
@@ -26,7 +26,7 @@ namespace TerminalAppLocalTests
    // an updated TAEF that will let us install framework packages when the test
    // package is deployed. Until then, these tests won't deploy in CI.

-    class TabTests : public JsonTestClass
+    class TabTests
    {
        // For this set of tests, we need to activate some XAML content. For
        // release builds, the application runs as a centennial application,
@@ -62,13 +62,8 @@ namespace TerminalAppLocalTests
        TEST_METHOD(TryDuplicateBadTab);
        TEST_METHOD(TryDuplicateBadPane);

-        TEST_METHOD(TryZoomPane);
-        TEST_METHOD(MoveFocusFromZoomedPane);
-        TEST_METHOD(CloseZoomedPane);
-
        TEST_CLASS_SETUP(ClassSetup)
        {
-            InitializeJsonReader();
            return true;
        }

@@ -79,8 +74,7 @@ namespace TerminalAppLocalTests

    private:
        void _initializeTerminalPage(winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage>& page,
-                                     winrt::com_ptr<winrt::TerminalApp::implementation::CascadiaSettings>& initialSettings);
-        winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage> _commonSetup();
+                                     CascadiaSettings initialSettings);
    };

    void TabTests::EnsureTestsActivate()
@@ -195,7 +189,7 @@ namespace TerminalAppLocalTests
    // Return Value:
    // - <none>
    void TabTests::_initializeTerminalPage(winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage>& page,
-                                           winrt::com_ptr<winrt::TerminalApp::implementation::CascadiaSettings>& initialSettings)
+                                           CascadiaSettings initialSettings)
    {
        // This is super wacky, but we can't just initialize the
        // com_ptr<impl::TerminalPage> in the lambda and assign it back out of
@@ -211,7 +205,7 @@ namespace TerminalAppLocalTests
        auto result = RunOnUIThread([&projectedPage, &page, initialSettings]() {
            projectedPage = winrt::TerminalApp::TerminalPage();
            page.copy_from(winrt::get_self<winrt::TerminalApp::implementation::TerminalPage>(projectedPage));
-            page->_settings = *initialSettings;
+            page->_settings = initialSettings;
        });
        VERIFY_SUCCEEDED(result);

@@ -281,12 +275,8 @@ namespace TerminalAppLocalTests
            ]
        })" };

-        VerifyParseSucceeded(settingsJson0);
-        auto settings0 = winrt::make_self<implementation::CascadiaSettings>(false);
+        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
        VERIFY_IS_NOT_NULL(settings0);
-        settings0->_ParseJsonString(settingsJson0, false);
-        settings0->LayerJson(settings0->_userSettings);
-        settings0->_ValidateSettings();

        // This is super wacky, but we can't just initialize the
        // com_ptr<impl::TerminalPage> in the lambda and assign it back out of
@@ -343,19 +333,11 @@ namespace TerminalAppLocalTests
            ]
        })" };

-        VerifyParseSucceeded(settingsJson0);
-        auto settings0 = winrt::make_self<implementation::CascadiaSettings>(false);
+        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
        VERIFY_IS_NOT_NULL(settings0);
-        settings0->_ParseJsonString(settingsJson0, false);
-        settings0->LayerJson(settings0->_userSettings);
-        settings0->_ValidateSettings();

-        VerifyParseSucceeded(settingsJson1);
-        auto settings1 = winrt::make_self<implementation::CascadiaSettings>(false);
+        CascadiaSettings settings1{ til::u8u16(settingsJson1) };
        VERIFY_IS_NOT_NULL(settings1);
-        settings1->_ParseJsonString(settingsJson1, false);
-        settings1->LayerJson(settings1->_userSettings);
-        settings1->_ValidateSettings();

        const auto guid1 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
        const auto guid2 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
@@ -388,7 +370,7 @@ namespace TerminalAppLocalTests
            L"Change the settings of the TerminalPage so the first profile is "
            L"no longer in the list of profiles"));
        result = RunOnUIThread([&page, settings1]() {
-            page->_settings = *settings1;
+            page->_settings = settings1;
        });
        VERIFY_SUCCEEDED(result);

@@ -438,19 +420,11 @@ namespace TerminalAppLocalTests
            ]
        })" };

-        VerifyParseSucceeded(settingsJson0);
-        auto settings0 = winrt::make_self<implementation::CascadiaSettings>(false);
+        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
        VERIFY_IS_NOT_NULL(settings0);
-        settings0->_ParseJsonString(settingsJson0, false);
-        settings0->LayerJson(settings0->_userSettings);
-        settings0->_ValidateSettings();

-        VerifyParseSucceeded(settingsJson1);
-        auto settings1 = winrt::make_self<implementation::CascadiaSettings>(false);
+        CascadiaSettings settings1{ til::u8u16(settingsJson1) };
        VERIFY_IS_NOT_NULL(settings1);
-        settings1->_ParseJsonString(settingsJson1, false);
-        settings1->LayerJson(settings1->_userSettings);
-        settings1->_ValidateSettings();

        const auto guid1 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
        const auto guid2 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
@@ -493,7 +467,7 @@ namespace TerminalAppLocalTests
            L"Change the settings of the TerminalPage so the first profile is "
            L"no longer in the list of profiles"));
        result = RunOnUIThread([&page, settings1]() {
-            page->_settings = *settings1;
+            page->_settings = settings1;
        });
        VERIFY_SUCCEEDED(result);

@@ -522,192 +496,4 @@ namespace TerminalAppLocalTests
        });
    }

-    // Method Description:
-    // - This is a helper method for setting up a TerminalPage with some common
-    //   settings, and creating the first tab.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - The initialized TerminalPage, ready to use.
-    winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage> TabTests::_commonSetup()
-    {
-        const std::string settingsJson0{ R"(
-        {
-            "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-            "profiles": [
-                {
-                    "name" : "profile0",
-                    "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1
-                },
-                {
-                    "name" : "profile1",
-                    "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2
-                }
-            ]
-        })" };
-
-        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
-        VERIFY_IS_NOT_NULL(settings0);
-
-        const auto guid1 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
-        const auto guid2 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
-
-        // This is super wacky, but we can't just initialize the
-        // com_ptr<impl::TerminalPage> in the lambda and assign it back out of
-        // the lambda. We'll crash trying to get a weak_ref to the TerminalPage
-        // during TerminalPage::Create() below.
-        //
-        // Instead, create the winrt object, then get a com_ptr to the
-        // implementation _from_ the winrt object. This seems to work, even if
-        // it's weird.
-        winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage> page{ nullptr };
-        _initializeTerminalPage(page, settings0);
-
-        auto result = RunOnUIThread([&page]() {
-            VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
-        });
-        VERIFY_SUCCEEDED(result);
-
-        return page;
-    }
-
-    void TabTests::TryZoomPane()
-    {
-        auto page = _commonSetup();
-
-        Log::Comment(L"Create a second pane");
-        auto result = RunOnUIThread([&page]() {
-            SplitPaneArgs args{ SplitType::Duplicate };
-            ActionEventArgs eventArgs{ args };
-            // eventArgs.Args(args);
-            page->_HandleSplitPane(nullptr, eventArgs);
-            auto firstTab = page->_GetStrongTabImpl(0);
-
-            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
-            VERIFY_IS_FALSE(firstTab->IsZoomed());
-        });
-        VERIFY_SUCCEEDED(result);
-
-        Log::Comment(L"Zoom in on the pane");
-        result = RunOnUIThread([&page]() {
-            ActionEventArgs eventArgs{};
-            page->_HandleTogglePaneZoom(nullptr, eventArgs);
-            auto firstTab = page->_GetStrongTabImpl(0);
-            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
-            VERIFY_IS_TRUE(firstTab->IsZoomed());
-        });
-        VERIFY_SUCCEEDED(result);
-
-        Log::Comment(L"Zoom out of the pane");
-        result = RunOnUIThread([&page]() {
-            ActionEventArgs eventArgs{};
-            page->_HandleTogglePaneZoom(nullptr, eventArgs);
-            auto firstTab = page->_GetStrongTabImpl(0);
-            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
-            VERIFY_IS_FALSE(firstTab->IsZoomed());
-        });
-        VERIFY_SUCCEEDED(result);
-    }
-
-    void TabTests::MoveFocusFromZoomedPane()
-    {
-        auto page = _commonSetup();
-
-        Log::Comment(L"Create a second pane");
-        auto result = RunOnUIThread([&page]() {
-            // Set up action
-            SplitPaneArgs args{ SplitType::Duplicate };
-            ActionEventArgs eventArgs{ args };
-            page->_HandleSplitPane(nullptr, eventArgs);
-            auto firstTab = page->_GetStrongTabImpl(0);
-
-            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
-            VERIFY_IS_FALSE(firstTab->IsZoomed());
-        });
-        VERIFY_SUCCEEDED(result);
-
-        Log::Comment(L"Zoom in on the pane");
-        result = RunOnUIThread([&page]() {
-            // Set up action
-            ActionEventArgs eventArgs{};
-
-            page->_HandleTogglePaneZoom(nullptr, eventArgs);
-
-            auto firstTab = page->_GetStrongTabImpl(0);
-            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
-            VERIFY_IS_TRUE(firstTab->IsZoomed());
-        });
-        VERIFY_SUCCEEDED(result);
-
-        Log::Comment(L"Move focus. This will cause us to un-zoom.");
-        result = RunOnUIThread([&page]() {
-            // Set up action
-            MoveFocusArgs args{ Direction::Left };
-            ActionEventArgs eventArgs{ args };
-
-            page->_HandleMoveFocus(nullptr, eventArgs);
-
-            auto firstTab = page->_GetStrongTabImpl(0);
-            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
-            VERIFY_IS_FALSE(firstTab->IsZoomed());
-        });
-        VERIFY_SUCCEEDED(result);
-    }
-
-    void TabTests::CloseZoomedPane()
-    {
-        auto page = _commonSetup();
-
-        Log::Comment(L"Create a second pane");
-        auto result = RunOnUIThread([&page]() {
-            // Set up action
-            SplitPaneArgs args{ SplitType::Duplicate };
-            ActionEventArgs eventArgs{ args };
-            page->_HandleSplitPane(nullptr, eventArgs);
-            auto firstTab = page->_GetStrongTabImpl(0);
-
-            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
-            VERIFY_IS_FALSE(firstTab->IsZoomed());
-        });
-        VERIFY_SUCCEEDED(result);
-
-        Log::Comment(L"Zoom in on the pane");
-        result = RunOnUIThread([&page]() {
-            // Set up action
-            ActionEventArgs eventArgs{};
-
-            page->_HandleTogglePaneZoom(nullptr, eventArgs);
-
-            auto firstTab = page->_GetStrongTabImpl(0);
-            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
-            VERIFY_IS_TRUE(firstTab->IsZoomed());
-        });
-        VERIFY_SUCCEEDED(result);
-
-        Log::Comment(L"Close Pane. This should cause us to un-zoom, and remove the second pane from the tree");
-        result = RunOnUIThread([&page]() {
-            // Set up action
-            ActionEventArgs eventArgs{};
-
-            page->_HandleClosePane(nullptr, eventArgs);
-
-            auto firstTab = page->_GetStrongTabImpl(0);
-            VERIFY_IS_FALSE(firstTab->IsZoomed());
-        });
-        VERIFY_SUCCEEDED(result);
-
-        // Introduce a slight delay to let the events finish propagating
-        Sleep(250);
-
-        Log::Comment(L"Check to ensure there's only one pane left.");
-
-        result = RunOnUIThread([&page]() {
-            auto firstTab = page->_GetStrongTabImpl(0);
-            VERIFY_ARE_EQUAL(1, firstTab->GetLeafPaneCount());
-            VERIFY_IS_FALSE(firstTab->IsZoomed());
-        });
-        VERIFY_SUCCEEDED(result);
-    }
 }
--- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
+++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
@@ -49,7 +49,6 @@
  <!-- ========================= Headers ======================== -->
  <ItemGroup>
    <ClInclude Include="pch.h" />
-    <ClInclude Include="JsonTestClass.h" />
    <ClInclude Include="CppWinrtTailored.h" />
  </ItemGroup>

@@ -57,19 +56,10 @@
  <ItemGroup>
    <ClCompile Include="CommandlineTest.cpp" />
    <ClCompile Include="SettingsTests.cpp" />
-    <ClCompile Include="ProfileTests.cpp" />
-    <ClCompile Include="ColorSchemeTests.cpp" />
-    <ClCompile Include="KeyBindingsTests.cpp" />
-    <ClCompile Include="CommandTests.cpp" />
    <ClCompile Include="TabTests.cpp" />
    <ClCompile Include="pch.cpp">
      <PrecompiledHeader>Create</PrecompiledHeader>
    </ClCompile>
-    <!-- You _NEED_ to include this file and the jsoncpp IncludePath (below) if
-    you want to use jsoncpp -->
-    <ClCompile Include="$(OpenConsoleDir)\dep\jsoncpp\jsoncpp.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
  </ItemGroup>

  <!-- ========================= Project References ======================== -->
@@ -81,7 +71,8 @@
    _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\dll\TerminalApp.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalApp\dll\TerminalApp.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />
  </ItemGroup>

  <!-- ========================= Globals ======================== -->
--- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
+++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
@@ -100,6 +100,10 @@
      <Project>{ca5cad1a-44bd-4ac7-ac72-f16e576fdd12}</Project>
    </ProjectReference>

+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj">
+      <Project>{CA5CAD1A-082C-4476-9F33-94B339494076}</Project>
+    </ProjectReference>
+
  </ItemGroup>

  <PropertyGroup>
@@ -153,6 +157,10 @@
    <Copy SourceFiles="$(_TestBinRoot)\LocalTests_TerminalApp\TerminalApp.LocalTests.dll"
          DestinationFiles="$(TargetDir)\TerminalApp.LocalTests.dll" />

+    <!-- Copy our test code from LocalTests_TerminalApp into this directory -->
+    <Copy SourceFiles="$(_TestBinRoot)\LocalTests_SettingsModel\SettingsModel.LocalTests.dll"
+          DestinationFiles="$(TargetDir)\SettingsModel.LocalTests.dll" />
+
    <!-- Copy some dlls which TerminalConnection is dependent upon that didn't
      get rolled up into this  directory -->
    <Copy SourceFiles="@(TerminalConnectionDlls)"
--- a/src/cascadia/LocalTests_TerminalApp/pch.h
+++ b/src/cascadia/LocalTests_TerminalApp/pch.h
@@ -54,6 +54,7 @@ Author(s):
 #include <winrt/windows.applicationmodel.core.h>

 #include <winrt/Microsoft.Terminal.TerminalConnection.h>
+#include <winrt/Microsoft.Terminal.Settings.Model.h>

 #include <winrt/Microsoft.UI.Xaml.Controls.h>

--- a/src/cascadia/ShellExtension/OpenTerminalHere.cpp
+++ b/src/cascadia/ShellExtension/OpenTerminalHere.cpp
@@ -185,17 +185,12 @@ HRESULT OpenTerminalHere::GetState(IShellItemArray* /*psiItemArray*/,

 HRESULT OpenTerminalHere::GetIcon(IShellItemArray* /*psiItemArray*/,
                                  LPWSTR* ppszIcon)
-try
 {
-    std::filesystem::path modulePath{ wil::GetModuleFileNameW<std::wstring>(wil::GetModuleInstanceHandle()) };
-    modulePath.replace_filename(WindowsTerminalExe);
-    // WindowsTerminal.exe,-101 will be the first icon group in WT
-    // We're using WindowsTerminal here explicitly, and not wt (from _getExePath), because
-    // WindowsTerminal is the only one built with the right icons.
-    const auto resource{ modulePath.wstring() + L",-101" };
-    return SHStrDupW(resource.c_str(), ppszIcon);
+    // the icon ref ("dll,-<resid>") is provided here, in this case none is provided
+    *ppszIcon = nullptr;
+    // TODO GH#6111: Return the Terminal icon here
+    return E_NOTIMPL;
 }
-CATCH_RETURN();

 HRESULT OpenTerminalHere::GetFlags(EXPCMDFLAGS* pFlags)
 {
--- a/src/cascadia/TerminalApp/AppActionHandlers.cpp
+++ b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -14,6 +14,7 @@ using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::Foundation::Collections;
 using namespace winrt::Windows::System;
 using namespace winrt::Microsoft::Terminal;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
 using namespace ::TerminalApp;
@@ -27,76 +28,76 @@ namespace winrt
 namespace winrt::TerminalApp::implementation
 {
    void TerminalPage::_HandleOpenNewTabDropdown(const IInspectable& /*sender*/,
-                                                 const TerminalApp::ActionEventArgs& args)
+                                                 const ActionEventArgs& args)
    {
        _OpenNewTabDropdown();
        args.Handled(true);
    }

    void TerminalPage::_HandleDuplicateTab(const IInspectable& /*sender*/,
-                                           const TerminalApp::ActionEventArgs& args)
+                                           const ActionEventArgs& args)
    {
        _DuplicateTabViewItem();
        args.Handled(true);
    }

    void TerminalPage::_HandleCloseTab(const IInspectable& /*sender*/,
-                                       const TerminalApp::ActionEventArgs& args)
+                                       const ActionEventArgs& args)
    {
        _CloseFocusedTab();
        args.Handled(true);
    }

    void TerminalPage::_HandleClosePane(const IInspectable& /*sender*/,
-                                        const TerminalApp::ActionEventArgs& args)
+                                        const ActionEventArgs& args)
    {
        _CloseFocusedPane();
        args.Handled(true);
    }

    void TerminalPage::_HandleCloseWindow(const IInspectable& /*sender*/,
-                                          const TerminalApp::ActionEventArgs& args)
+                                          const ActionEventArgs& args)
    {
        CloseWindow();
        args.Handled(true);
    }

    void TerminalPage::_HandleScrollUp(const IInspectable& /*sender*/,
-                                       const TerminalApp::ActionEventArgs& args)
+                                       const ActionEventArgs& args)
    {
        _Scroll(-1);
        args.Handled(true);
    }

    void TerminalPage::_HandleScrollDown(const IInspectable& /*sender*/,
-                                         const TerminalApp::ActionEventArgs& args)
+                                         const ActionEventArgs& args)
    {
        _Scroll(1);
        args.Handled(true);
    }

    void TerminalPage::_HandleNextTab(const IInspectable& /*sender*/,
-                                      const TerminalApp::ActionEventArgs& args)
+                                      const ActionEventArgs& args)
    {
        _SelectNextTab(true);
        args.Handled(true);
    }

    void TerminalPage::_HandlePrevTab(const IInspectable& /*sender*/,
-                                      const TerminalApp::ActionEventArgs& args)
+                                      const ActionEventArgs& args)
    {
        _SelectNextTab(false);
        args.Handled(true);
    }

    void TerminalPage::_HandleSendInput(const IInspectable& /*sender*/,
-                                        const TerminalApp::ActionEventArgs& args)
+                                        const ActionEventArgs& args)
    {
        if (args == nullptr)
        {
            args.Handled(false);
        }
-        else if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::SendInputArgs>())
+        else if (const auto& realArgs = args.ActionArgs().try_as<SendInputArgs>())
        {
            const auto termControl = _GetActiveControl();
            termControl.SendInput(realArgs.Input());
@@ -105,13 +106,13 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleSplitPane(const IInspectable& /*sender*/,
-                                        const TerminalApp::ActionEventArgs& args)
+                                        const ActionEventArgs& args)
    {
        if (args == nullptr)
        {
            args.Handled(false);
        }
-        else if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::SplitPaneArgs>())
+        else if (const auto& realArgs = args.ActionArgs().try_as<SplitPaneArgs>())
        {
            _SplitPane(realArgs.SplitStyle(), realArgs.SplitMode(), realArgs.TerminalArgs());
            args.Handled(true);
@@ -119,7 +120,7 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleTogglePaneZoom(const IInspectable& /*sender*/,
-                                             const TerminalApp::ActionEventArgs& args)
+                                             const ActionEventArgs& args)
    {
        auto activeTab = _GetFocusedTab();

@@ -132,31 +133,32 @@ namespace winrt::TerminalApp::implementation
            // be removed before it's re-added in Pane::Restore
            _tabContent.Children().Clear();

-            // Togging the zoom on the tab will cause the tab to inform us of
-            // the new root Content for this tab.
            activeTab->ToggleZoom();
+
+            // Update the selected tab, to trigger us to re-add the tab's GetRootElement to the UI tree
+            _UpdatedSelectedTab(_tabView.SelectedIndex());
        }
        args.Handled(true);
    }

    void TerminalPage::_HandleScrollUpPage(const IInspectable& /*sender*/,
-                                           const TerminalApp::ActionEventArgs& args)
+                                           const ActionEventArgs& args)
    {
        _ScrollPage(-1);
        args.Handled(true);
    }

    void TerminalPage::_HandleScrollDownPage(const IInspectable& /*sender*/,
-                                             const TerminalApp::ActionEventArgs& args)
+                                             const ActionEventArgs& args)
    {
        _ScrollPage(1);
        args.Handled(true);
    }

    void TerminalPage::_HandleOpenSettings(const IInspectable& /*sender*/,
-                                           const TerminalApp::ActionEventArgs& args)
+                                           const ActionEventArgs& args)
    {
-        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::OpenSettingsArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<OpenSettingsArgs>())
        {
            _LaunchSettings(realArgs.Target());
            args.Handled(true);
@@ -164,21 +166,21 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandlePasteText(const IInspectable& /*sender*/,
-                                        const TerminalApp::ActionEventArgs& args)
+                                        const ActionEventArgs& args)
    {
        _PasteText();
        args.Handled(true);
    }

    void TerminalPage::_HandleNewTab(const IInspectable& /*sender*/,
-                                     const TerminalApp::ActionEventArgs& args)
+                                     const ActionEventArgs& args)
    {
        if (args == nullptr)
        {
            _OpenNewTab(nullptr);
            args.Handled(true);
        }
-        else if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::NewTabArgs>())
+        else if (const auto& realArgs = args.ActionArgs().try_as<NewTabArgs>())
        {
            _OpenNewTab(realArgs.TerminalArgs());
            args.Handled(true);
@@ -186,9 +188,9 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleSwitchToTab(const IInspectable& /*sender*/,
-                                          const TerminalApp::ActionEventArgs& args)
+                                          const ActionEventArgs& args)
    {
-        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::SwitchToTabArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<SwitchToTabArgs>())
        {
            const auto handled = _SelectTab({ realArgs.TabIndex() });
            args.Handled(handled);
@@ -196,11 +198,11 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleResizePane(const IInspectable& /*sender*/,
-                                         const TerminalApp::ActionEventArgs& args)
+                                         const ActionEventArgs& args)
    {
-        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::ResizePaneArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<ResizePaneArgs>())
        {
-            if (realArgs.Direction() == TerminalApp::Direction::None)
+            if (realArgs.Direction() == Direction::None)
            {
                // Do nothing
                args.Handled(false);
@@ -214,11 +216,11 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleMoveFocus(const IInspectable& /*sender*/,
-                                        const TerminalApp::ActionEventArgs& args)
+                                        const ActionEventArgs& args)
    {
-        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::MoveFocusArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<MoveFocusArgs>())
        {
-            if (realArgs.Direction() == TerminalApp::Direction::None)
+            if (realArgs.Direction() == Direction::None)
            {
                // Do nothing
                args.Handled(false);
@@ -232,9 +234,9 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleCopyText(const IInspectable& /*sender*/,
-                                       const TerminalApp::ActionEventArgs& args)
+                                       const ActionEventArgs& args)
    {
-        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::CopyTextArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<CopyTextArgs>())
        {
            const auto handled = _CopyText(realArgs.SingleLine(), realArgs.CopyFormatting());
            args.Handled(handled);
@@ -242,9 +244,9 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleAdjustFontSize(const IInspectable& /*sender*/,
-                                             const TerminalApp::ActionEventArgs& args)
+                                             const ActionEventArgs& args)
    {
-        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::AdjustFontSizeArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<AdjustFontSizeArgs>())
        {
            const auto termControl = _GetActiveControl();
            termControl.AdjustFontSize(realArgs.Delta());
@@ -253,14 +255,14 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleFind(const IInspectable& /*sender*/,
-                                   const TerminalApp::ActionEventArgs& args)
+                                   const ActionEventArgs& args)
    {
        _Find();
        args.Handled(true);
    }

    void TerminalPage::_HandleResetFontSize(const IInspectable& /*sender*/,
-                                            const TerminalApp::ActionEventArgs& args)
+                                            const ActionEventArgs& args)
    {
        const auto termControl = _GetActiveControl();
        termControl.ResetFontSize();
@@ -268,7 +270,7 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleToggleRetroEffect(const IInspectable& /*sender*/,
-                                                const TerminalApp::ActionEventArgs& args)
+                                                const ActionEventArgs& args)
    {
        const auto termControl = _GetActiveControl();
        termControl.ToggleRetroEffect();
@@ -276,28 +278,28 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleToggleFocusMode(const IInspectable& /*sender*/,
-                                              const TerminalApp::ActionEventArgs& args)
+                                              const ActionEventArgs& args)
    {
        ToggleFocusMode();
        args.Handled(true);
    }

    void TerminalPage::_HandleToggleFullscreen(const IInspectable& /*sender*/,
-                                               const TerminalApp::ActionEventArgs& args)
+                                               const ActionEventArgs& args)
    {
        ToggleFullscreen();
        args.Handled(true);
    }

    void TerminalPage::_HandleToggleAlwaysOnTop(const IInspectable& /*sender*/,
-                                                const TerminalApp::ActionEventArgs& args)
+                                                const ActionEventArgs& args)
    {
        ToggleAlwaysOnTop();
        args.Handled(true);
    }

    void TerminalPage::_HandleToggleCommandPalette(const IInspectable& /*sender*/,
-                                                   const TerminalApp::ActionEventArgs& args)
+                                                   const ActionEventArgs& args)
    {
        // TODO GH#6677: When we add support for commandline mode, first set the
        // mode that the command palette should be in, before making it visible.
@@ -309,10 +311,10 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleSetColorScheme(const IInspectable& /*sender*/,
-                                             const TerminalApp::ActionEventArgs& args)
+                                             const ActionEventArgs& args)
    {
        args.Handled(false);
-        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::SetColorSchemeArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<SetColorSchemeArgs>())
        {
            if (auto activeTab = _GetFocusedTab())
            {
@@ -331,11 +333,11 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleSetTabColor(const IInspectable& /*sender*/,
-                                          const TerminalApp::ActionEventArgs& args)
+                                          const ActionEventArgs& args)
    {
        std::optional<til::color> tabColor;

-        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::SetTabColorArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<SetTabColorArgs>())
        {
            if (realArgs.TabColor() != nullptr)
            {
@@ -359,7 +361,7 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleOpenTabColorPicker(const IInspectable& /*sender*/,
-                                                 const TerminalApp::ActionEventArgs& args)
+                                                 const ActionEventArgs& args)
    {
        auto activeTab = _GetFocusedTab();
        if (activeTab)
@@ -370,11 +372,11 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleRenameTab(const IInspectable& /*sender*/,
-                                        const TerminalApp::ActionEventArgs& args)
+                                        const ActionEventArgs& args)
    {
        std::optional<winrt::hstring> title;

-        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::RenameTabArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<RenameTabArgs>())
        {
            title = realArgs.Title();
        }
@@ -395,11 +397,11 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleExecuteCommandline(const IInspectable& /*sender*/,
-                                                 const TerminalApp::ActionEventArgs& actionArgs)
+                                                 const ActionEventArgs& actionArgs)
    {
-        if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::ExecuteCommandlineArgs>())
+        if (const auto& realArgs = actionArgs.ActionArgs().try_as<ExecuteCommandlineArgs>())
        {
-            auto actions = winrt::single_threaded_vector<winrt::TerminalApp::ActionAndArgs>(std::move(
+            auto actions = winrt::single_threaded_vector<ActionAndArgs>(std::move(
                TerminalPage::ConvertExecuteCommandlineToActions(realArgs)));

            if (_startupActions.Size() != 0)
@@ -411,9 +413,9 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleCloseOtherTabs(const IInspectable& /*sender*/,
-                                             const TerminalApp::ActionEventArgs& actionArgs)
+                                             const ActionEventArgs& actionArgs)
    {
-        if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::CloseOtherTabsArgs>())
+        if (const auto& realArgs = actionArgs.ActionArgs().try_as<CloseOtherTabsArgs>())
        {
            uint32_t index;
            if (realArgs.Index())
@@ -448,9 +450,9 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleCloseTabsAfter(const IInspectable& /*sender*/,
-                                             const TerminalApp::ActionEventArgs& actionArgs)
+                                             const ActionEventArgs& actionArgs)
    {
-        if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::CloseTabsAfterArgs>())
+        if (const auto& realArgs = actionArgs.ActionArgs().try_as<CloseTabsAfterArgs>())
        {
            uint32_t index;
            if (realArgs.Index())
@@ -485,16 +487,8 @@ namespace winrt::TerminalApp::implementation
    }

    void TerminalPage::_HandleOpenTabSearch(const IInspectable& /*sender*/,
-                                            const TerminalApp::ActionEventArgs& args)
+                                            const ActionEventArgs& args)
    {
-        // Tab search is always in-order.
-        auto tabCommands = winrt::single_threaded_vector<TerminalApp::Command>();
-        for (const auto& tab : _tabs)
-        {
-            tabCommands.Append(tab.SwitchToTabCommand());
-        }
-        CommandPalette().SetTabActions(tabCommands);
-
        auto opt = _GetFocusedTabIndex();
        uint32_t startIdx = opt.value_or(0);

--- a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
+++ b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
@@ -4,10 +4,10 @@
 #include "pch.h"
 #include "AppLogic.h"
 #include "AppCommandlineArgs.h"
-#include "ActionArgs.h"
 #include <LibraryResources.h>

 using namespace winrt::TerminalApp;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace TerminalApp;

 // Either a ; at the start of a line, or a ; preceded by any non-\ char.
@@ -159,33 +159,42 @@ void AppCommandlineArgs::_buildParser()
 {
    // -v,--version: Displays version info
    auto versionCallback = [this](int64_t /*count*/) {
-        if (const auto appLogic{ winrt::TerminalApp::implementation::AppLogic::Current() })
-        {
-            // Set our message to display the application name and the current version.
-            _exitMessage = fmt::format("{0}\n{1}",
-                                       til::u16u8(appLogic->ApplicationDisplayName()),
-                                       til::u16u8(appLogic->ApplicationVersion()));
-            // Theoretically, we don't need to exit now, since this isn't really
-            // an error case. However, in practice, it feels weird to have `wt
-            // -v` open a new tab, and makes enough sense that `wt -v ;
-            // split-pane` (or whatever) just displays the version and exits.
-            _shouldExitEarly = true;
-        }
+        // Set our message to display the application name and the current version.
+        _exitMessage = fmt::format("{0}\n{1}",
+                                   til::u16u8(CascadiaSettings::ApplicationDisplayName()),
+                                   til::u16u8(CascadiaSettings::ApplicationVersion()));
+        // Theoretically, we don't need to exit now, since this isn't really
+        // an error case. However, in practice, it feels weird to have `wt
+        // -v` open a new tab, and makes enough sense that `wt -v ;
+        // split-pane` (or whatever) just displays the version and exits.
+        _shouldExitEarly = true;
    };
    _app.add_flag_function("-v,--version", versionCallback, RS_A(L"CmdVersionDesc"));

-    // Maximized and Fullscreen flags
+    // Launch mode related flags
    //   -M,--maximized: Maximizes the window on launch
    //   -F,--fullscreen: Fullscreens the window on launch
+    //   -f,--focus: Sets the terminal into the Focus mode
+    // While fullscreen excludes both maximized and focus mode, the user can combine between the maximized and focused (-fM)
    auto maximizedCallback = [this](int64_t /*count*/) {
-        _launchMode = winrt::TerminalApp::LaunchMode::MaximizedMode;
+        _launchMode = (_launchMode.has_value() && _launchMode.value() == LaunchMode::FocusMode) ?
+                          LaunchMode::MaximizedFocusMode :
+                          LaunchMode::MaximizedMode;
    };
    auto fullscreenCallback = [this](int64_t /*count*/) {
-        _launchMode = winrt::TerminalApp::LaunchMode::FullscreenMode;
+        _launchMode = LaunchMode::FullscreenMode;
    };
+    auto focusCallback = [this](int64_t /*count*/) {
+        _launchMode = (_launchMode.has_value() && _launchMode.value() == LaunchMode::MaximizedMode) ?
+                          LaunchMode::MaximizedFocusMode :
+                          LaunchMode::FocusMode;
+    };
+
    auto maximized = _app.add_flag_function("-M,--maximized", maximizedCallback, RS_A(L"CmdMaximizedDesc"));
    auto fullscreen = _app.add_flag_function("-F,--fullscreen", fullscreenCallback, RS_A(L"CmdFullscreenDesc"));
+    auto focus = _app.add_flag_function("-f,--focus", focusCallback, RS_A(L"CmdFocusDesc"));
    maximized->excludes(fullscreen);
+    focus->excludes(fullscreen);

    // Subcommands
    _buildNewTabParser();
@@ -214,14 +223,13 @@ void AppCommandlineArgs::_buildNewTabParser()
        // command was parsed.
        subcommand.subcommand->callback([&, this]() {
            // Build the NewTab action from the values we've parsed on the commandline.
-            auto newTabAction = winrt::make_self<implementation::ActionAndArgs>();
-            newTabAction->Action(ShortcutAction::NewTab);
-            auto args = winrt::make_self<implementation::NewTabArgs>();
+            ActionAndArgs newTabAction{};
+            newTabAction.Action(ShortcutAction::NewTab);
            // _getNewTerminalArgs MUST be called before parsing any other options,
            // as it might clear those options while finding the commandline
-            args->TerminalArgs(_getNewTerminalArgs(subcommand));
-            newTabAction->Args(*args);
-            _startupActions.push_back(*newTabAction);
+            NewTabArgs args{ _getNewTerminalArgs(subcommand) };
+            newTabAction.Args(args);
+            _startupActions.push_back(newTabAction);
        });
    };

@@ -257,29 +265,29 @@ void AppCommandlineArgs::_buildSplitPaneParser()
        // command was parsed.
        subcommand.subcommand->callback([&, this]() {
            // Build the SplitPane action from the values we've parsed on the commandline.
-            auto splitPaneActionAndArgs = winrt::make_self<implementation::ActionAndArgs>();
-            splitPaneActionAndArgs->Action(ShortcutAction::SplitPane);
-            auto args = winrt::make_self<implementation::SplitPaneArgs>();
+            ActionAndArgs splitPaneActionAndArgs{};
+            splitPaneActionAndArgs.Action(ShortcutAction::SplitPane);
+
            // _getNewTerminalArgs MUST be called before parsing any other options,
            // as it might clear those options while finding the commandline
-            args->TerminalArgs(_getNewTerminalArgs(subcommand));
-            args->SplitStyle(SplitState::Automatic);
+            auto terminalArgs{ _getNewTerminalArgs(subcommand) };
+            auto style{ SplitState::Automatic };
            // Make sure to use the `Option`s here to check if they were set -
            // _getNewTerminalArgs might reset them while parsing a commandline
            if ((*subcommand._horizontalOption || *subcommand._verticalOption))
            {
                if (_splitHorizontal)
                {
-                    args->SplitStyle(SplitState::Horizontal);
+                    style = SplitState::Horizontal;
                }
                else if (_splitVertical)
                {
-                    args->SplitStyle(SplitState::Vertical);
+                    style = SplitState::Vertical;
                }
            }
-
-            splitPaneActionAndArgs->Args(*args);
-            _startupActions.push_back(*splitPaneActionAndArgs);
+            SplitPaneArgs args{ style, terminalArgs };
+            splitPaneActionAndArgs.Args(args);
+            _startupActions.push_back(splitPaneActionAndArgs);
        });
    };

@@ -319,20 +327,19 @@ void AppCommandlineArgs::_buildFocusTabParser()
        // command was parsed.
        subcommand->callback([&, this]() {
            // Build the action from the values we've parsed on the commandline.
-            auto focusTabAction = winrt::make_self<implementation::ActionAndArgs>();
+            ActionAndArgs focusTabAction{};

            if (_focusTabIndex >= 0)
            {
-                focusTabAction->Action(ShortcutAction::SwitchToTab);
-                auto args = winrt::make_self<implementation::SwitchToTabArgs>();
-                args->TabIndex(_focusTabIndex);
-                focusTabAction->Args(*args);
-                _startupActions.push_back(*focusTabAction);
+                focusTabAction.Action(ShortcutAction::SwitchToTab);
+                SwitchToTabArgs args{ static_cast<unsigned int>(_focusTabIndex) };
+                focusTabAction.Args(args);
+                _startupActions.push_back(focusTabAction);
            }
            else if (_focusNextTab || _focusPrevTab)
            {
-                focusTabAction->Action(_focusNextTab ? ShortcutAction::NextTab : ShortcutAction::PrevTab);
-                _startupActions.push_back(*focusTabAction);
+                focusTabAction.Action(_focusNextTab ? ShortcutAction::NextTab : ShortcutAction::PrevTab);
+                _startupActions.push_back(std::move(focusTabAction));
            }
        });
    };
@@ -379,7 +386,7 @@ void AppCommandlineArgs::_addNewTerminalArgs(AppCommandlineArgs::NewTerminalSubc
 // - A fully initialized NewTerminalArgs corresponding to values we've currently parsed.
 NewTerminalArgs AppCommandlineArgs::_getNewTerminalArgs(AppCommandlineArgs::NewTerminalSubcommand& subcommand)
 {
-    auto args = winrt::make_self<implementation::NewTerminalArgs>();
+    NewTerminalArgs args{};

    if (!_commandline.empty())
    {
@@ -403,25 +410,25 @@ NewTerminalArgs AppCommandlineArgs::_getNewTerminalArgs(AppCommandlineArgs::NewT
            }
        }

-        args->Commandline(winrt::to_hstring(cmdlineBuffer.str()));
+        args.Commandline(winrt::to_hstring(cmdlineBuffer.str()));
    }

    if (*subcommand.profileNameOption)
    {
-        args->Profile(winrt::to_hstring(_profileName));
+        args.Profile(winrt::to_hstring(_profileName));
    }

    if (*subcommand.startingDirectoryOption)
    {
-        args->StartingDirectory(winrt::to_hstring(_startingDirectory));
+        args.StartingDirectory(winrt::to_hstring(_startingDirectory));
    }

    if (*subcommand.titleOption)
    {
-        args->TabTitle(winrt::to_hstring(_startingTitle));
+        args.TabTitle(winrt::to_hstring(_startingTitle));
    }

-    return *args;
+    return args;
 }

 // Method Description:
@@ -599,7 +606,7 @@ void AppCommandlineArgs::_addCommandsForArg(std::vector<Commandline>& commands,
 // - <none>
 // Return Value:
 // - the deque of actions we've buffered as a result of parsing commands.
-std::vector<winrt::TerminalApp::ActionAndArgs>& AppCommandlineArgs::GetStartupActions()
+std::vector<ActionAndArgs>& AppCommandlineArgs::GetStartupActions()
 {
    return _startupActions;
 }
@@ -652,18 +659,15 @@ void AppCommandlineArgs::ValidateStartupCommands()
        _startupActions.front().Action() != ShortcutAction::NewTab)
    {
        // Build the NewTab action from the values we've parsed on the commandline.
-        auto newTabAction = winrt::make_self<implementation::ActionAndArgs>();
-        newTabAction->Action(ShortcutAction::NewTab);
-        auto args = winrt::make_self<implementation::NewTabArgs>();
-        auto newTerminalArgs = winrt::make_self<implementation::NewTerminalArgs>();
-        args->TerminalArgs(*newTerminalArgs);
-        newTabAction->Args(*args);
+        NewTerminalArgs newTerminalArgs{};
+        NewTabArgs args{ newTerminalArgs };
+        ActionAndArgs newTabAction{ ShortcutAction::NewTab, args };
        // push the arg onto the front
-        _startupActions.insert(_startupActions.begin(), 1, *newTabAction);
+        _startupActions.insert(_startupActions.begin(), 1, newTabAction);
    }
 }

-std::optional<winrt::TerminalApp::LaunchMode> AppCommandlineArgs::GetLaunchMode() const noexcept
+std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> AppCommandlineArgs::GetLaunchMode() const noexcept
 {
    return _launchMode;
 }
--- a/src/cascadia/TerminalApp/AppCommandlineArgs.h
+++ b/src/cascadia/TerminalApp/AppCommandlineArgs.h
@@ -2,8 +2,6 @@
 // Licensed under the MIT license.
 #pragma once

-#include "ActionAndArgs.h"
-
 #include "Commandline.h"

 #ifdef UNIT_TESTING
@@ -36,11 +34,11 @@ public:
    static std::vector<Commandline> BuildCommands(winrt::array_view<const winrt::hstring>& args);

    void ValidateStartupCommands();
-    std::vector<winrt::TerminalApp::ActionAndArgs>& GetStartupActions();
+    std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs>& GetStartupActions();
    const std::string& GetExitMessage();
    bool ShouldExitEarly() const noexcept;

-    std::optional<winrt::TerminalApp::LaunchMode> GetLaunchMode() const noexcept;
+    std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> GetLaunchMode() const noexcept;

 private:
    static const std::wregex _commandDelimiterRegex;
@@ -89,14 +87,14 @@ private:
    bool _focusNextTab{ false };
    bool _focusPrevTab{ false };

-    std::optional<winrt::TerminalApp::LaunchMode> _launchMode{ std::nullopt };
+    std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> _launchMode{ std::nullopt };
    // Are you adding more args here? Make sure to reset them in _resetStateToDefault

-    std::vector<winrt::TerminalApp::ActionAndArgs> _startupActions;
+    std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs> _startupActions;
    std::string _exitMessage;
    bool _shouldExitEarly{ false };

-    winrt::TerminalApp::NewTerminalArgs _getNewTerminalArgs(NewTerminalSubcommand& subcommand);
+    winrt::Microsoft::Terminal::Settings::Model::NewTerminalArgs _getNewTerminalArgs(NewTerminalSubcommand& subcommand);
    void _addNewTerminalArgs(NewTerminalSubcommand& subcommand);
    void _buildParser();
    void _buildNewTabParser();
--- a/src/cascadia/TerminalApp/AppKeyBindings.cpp
+++ b/src/cascadia/TerminalApp/AppKeyBindings.cpp
@@ -27,7 +27,7 @@ namespace winrt::TerminalApp::implementation
        _dispatch = dispatch;
    }

-    void AppKeyBindings::SetKeyMapping(const winrt::TerminalApp::KeyMapping& keymap)
+    void AppKeyBindings::SetKeyMapping(const winrt::Microsoft::Terminal::Settings::Model::KeyMapping& keymap)
    {
        _keymap = keymap;
    }
--- a/src/cascadia/TerminalApp/AppKeyBindings.h
+++ b/src/cascadia/TerminalApp/AppKeyBindings.h
@@ -4,7 +4,6 @@
 #pragma once

 #include "AppKeyBindings.g.h"
-#include "ActionArgs.h"
 #include "ShortcutActionDispatch.h"
 #include "..\inc\cppwinrt_utils.h"

@@ -12,8 +11,6 @@
 namespace TerminalAppLocalTests
 {
    class SettingsTests;
-    class KeyBindingsTests;
-    class TestUtils;
 }

 namespace winrt::TerminalApp::implementation
@@ -25,16 +22,14 @@ namespace winrt::TerminalApp::implementation
        bool TryKeyChord(winrt::Microsoft::Terminal::TerminalControl::KeyChord const& kc);

        void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);
-        void SetKeyMapping(const winrt::TerminalApp::KeyMapping& keymap);
+        void SetKeyMapping(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap);

    private:
-        winrt::TerminalApp::KeyMapping _keymap{ nullptr };
+        winrt::Microsoft::Terminal::Settings::Model::KeyMapping _keymap{ nullptr };

        winrt::TerminalApp::ShortcutActionDispatch _dispatch{ nullptr };

        friend class TerminalAppLocalTests::SettingsTests;
-        friend class TerminalAppLocalTests::KeyBindingsTests;
-        friend class TerminalAppLocalTests::TestUtils;
    };
 }

--- a/src/cascadia/TerminalApp/AppKeyBindings.idl
+++ b/src/cascadia/TerminalApp/AppKeyBindings.idl
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 import "ShortcutActionDispatch.idl";
-import "KeyMapping.idl";

 namespace TerminalApp
 {
@@ -10,6 +9,6 @@ namespace TerminalApp
        AppKeyBindings();

        void SetDispatch(ShortcutActionDispatch dispatch);
-        void SetKeyMapping(KeyMapping keymap);
+        void SetKeyMapping(Microsoft.Terminal.Settings.Model.KeyMapping keymap);
    }
 }
--- a/src/cascadia/TerminalApp/AppLogic.cpp
+++ b/src/cascadia/TerminalApp/AppLogic.cpp
@@ -16,6 +16,7 @@ using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::System;
 using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace ::TerminalApp;

 namespace winrt
@@ -29,7 +30,7 @@ static const winrt::hstring StartupTaskName = L"StartTerminalOnLoginTask";
 // !!! IMPORTANT !!!
 // Make sure that these keys are in the same order as the
 // SettingsLoadWarnings/Errors enum is!
-static const std::array<std::wstring_view, static_cast<uint32_t>(winrt::TerminalApp::SettingsLoadWarnings::WARNINGS_SIZE)> settingsLoadWarningsLabels {
+static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadWarnings::WARNINGS_SIZE)> settingsLoadWarningsLabels {
    USES_RESOURCE(L"MissingDefaultProfileText"),
    USES_RESOURCE(L"DuplicateProfileText"),
    USES_RESOURCE(L"UnknownColorSchemeText"),
@@ -39,10 +40,9 @@ static const std::array<std::wstring_view, static_cast<uint32_t>(winrt::Terminal
    USES_RESOURCE(L"TooManyKeysForChord"),
    USES_RESOURCE(L"MissingRequiredParameter"),
    USES_RESOURCE(L"LegacyGlobalsProperty"),
-    USES_RESOURCE(L"FailedToParseCommandJson"),
-    USES_RESOURCE(L"FailedToWriteToSettings")
+    USES_RESOURCE(L"FailedToParseCommandJson")
 };
-static const std::array<std::wstring_view, static_cast<uint32_t>(winrt::TerminalApp::SettingsLoadErrors::ERRORS_SIZE)> settingsLoadErrorsLabels {
+static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadErrors::ERRORS_SIZE)> settingsLoadErrorsLabels {
    USES_RESOURCE(L"NoProfilesText"),
    USES_RESOURCE(L"AllProfilesHiddenText")
 };
@@ -77,7 +77,7 @@ static winrt::hstring _GetMessageText(uint32_t index, std::array<std::wstring_vi
 // - warning: the SettingsLoadWarnings value to get the localized text for.
 // Return Value:
 // - localized text for the given warning
-static winrt::hstring _GetWarningText(winrt::TerminalApp::SettingsLoadWarnings warning)
+static winrt::hstring _GetWarningText(SettingsLoadWarnings warning)
 {
    return _GetMessageText(static_cast<uint32_t>(warning), settingsLoadWarningsLabels);
 }
@@ -90,7 +90,7 @@ static winrt::hstring _GetWarningText(winrt::TerminalApp::SettingsLoadWarnings w
 // - error: the SettingsLoadErrors value to get the localized text for.
 // Return Value:
 // - localized text for the given error
-static winrt::hstring _GetErrorText(winrt::TerminalApp::SettingsLoadErrors error)
+static winrt::hstring _GetErrorText(SettingsLoadErrors error)
 {
    return _GetMessageText(static_cast<uint32_t>(error), settingsLoadErrorsLabels);
 }
@@ -170,7 +170,7 @@ namespace winrt::TerminalApp::implementation
    // - Returns the settings currently in use by the entire Terminal application.
    // Throws:
    // - HR E_INVALIDARG if the app isn't up and running.
-    const TerminalApp::CascadiaSettings AppLogic::CurrentAppSettings()
+    const CascadiaSettings AppLogic::CurrentAppSettings()
    {
        auto appLogic{ ::winrt::TerminalApp::implementation::AppLogic::Current() };
        THROW_HR_IF_NULL(E_INVALIDARG, appLogic);
@@ -265,6 +265,10 @@ namespace winrt::TerminalApp::implementation
            {
                _root->ToggleFullscreen();
            }
+            else if (launchMode == LaunchMode::FocusMode || launchMode == LaunchMode::MaximizedFocusMode)
+            {
+                _root->ToggleFocusMode();
+            }
        });
        _root->Create();

@@ -465,11 +469,6 @@ namespace winrt::TerminalApp::implementation
    void AppLogic::_OnLoaded(const IInspectable& /*sender*/,
                             const RoutedEventArgs& /*eventArgs*/)
    {
-        const auto keyboardServiceIsDisabled = !_IsKeyboardServiceEnabled();
-        if (keyboardServiceIsDisabled)
-        {
-            _root->ShowKeyboardServiceWarning();
-        }
        if (FAILED(_settingsLoadedResult))
        {
            const winrt::hstring titleKey = USES_RESOURCE(L"InitialJsonParseErrorTitle");
@@ -482,51 +481,6 @@ namespace winrt::TerminalApp::implementation
        }
    }

-    // Method Description:
-    // - Helper for determining if the "Touch Keyboard and Handwriting Panel
-    //   Service" is enabled. If it isn't, we want to be able to display a
-    //   warning to the user, because they won't be able to type in the
-    //   Terminal.
-    // Return Value:
-    // - true if the service is enabled, or if we fail to query the service. We
-    //   return true in that case, to be less noisy (though, that is unexpected)
-    bool AppLogic::_IsKeyboardServiceEnabled()
-    {
-        if (IsUwp())
-        {
-            return true;
-        }
-
-        // If at any point we fail to open the service manager, the service,
-        // etc, then just quick return true to disable the dialog. We'd rather
-        // not be noisy with this dialog if we failed for some reason.
-
-        // Open the service manager. This will return 0 if it failed.
-        wil::unique_schandle hManager{ OpenSCManager(nullptr, nullptr, 0) };
-
-        if (LOG_LAST_ERROR_IF(!hManager.is_valid()))
-        {
-            return true;
-        }
-
-        // Get a handle to the keyboard service
-        wil::unique_schandle hService{ OpenService(hManager.get(), TabletInputServiceKey.data(), SERVICE_QUERY_STATUS) };
-        if (LOG_LAST_ERROR_IF(!hService.is_valid()))
-        {
-            return true;
-        }
-
-        // Get the current state of the service
-        SERVICE_STATUS status{ 0 };
-        if (!LOG_IF_WIN32_BOOL_FALSE(QueryServiceStatus(hService.get(), &status)))
-        {
-            return true;
-        }
-
-        const auto state = status.dwCurrentState;
-        return (state == SERVICE_RUNNING || state == SERVICE_START_PENDING);
-    }
-
    // Method Description:
    // - Get the size in pixels of the client area we'll need to launch this
    //   terminal app. This method will use the default profile's settings to do
@@ -660,17 +614,6 @@ namespace winrt::TerminalApp::implementation
        return _settings.GlobalSettings().ShowTabsInTitlebar();
    }

-    bool AppLogic::GetInitialAlwaysOnTop()
-    {
-        if (!_loadedInitialSettings)
-        {
-            // Load settings if we haven't already
-            LoadSettings();
-        }
-
-        return _settings.GlobalSettings().AlwaysOnTop();
-    }
-
    // Method Description:
    // - See Pane::CalcSnappedDimension
    float AppLogic::CalcSnappedDimension(const bool widthOrHeight, const float dimension) const
@@ -780,7 +723,7 @@ namespace winrt::TerminalApp::implementation
    void AppLogic::_RegisterSettingsChange()
    {
        // Get the containing folder.
-        const auto settingsPath{ CascadiaSettings::GetSettingsPath() };
+        const std::filesystem::path settingsPath{ std::wstring_view{ CascadiaSettings::SettingsPath() } };
        const auto folder = settingsPath.parent_path();

        _reader.create(folder.c_str(),
@@ -932,7 +875,7 @@ namespace winrt::TerminalApp::implementation

    // Method Description:
    // - Returns a pointer to the global shared settings.
-    [[nodiscard]] TerminalApp::CascadiaSettings AppLogic::GetSettings() const noexcept
+    [[nodiscard]] CascadiaSettings AppLogic::GetSettings() const noexcept
    {
        return _settings;
    }
@@ -1103,65 +1046,6 @@ namespace winrt::TerminalApp::implementation
        return _appArgs.ShouldExitEarly();
    }

-    winrt::hstring AppLogic::ApplicationDisplayName() const
-    {
-        try
-        {
-            const auto package{ winrt::Windows::ApplicationModel::Package::Current() };
-            return package.DisplayName();
-        }
-        CATCH_LOG();
-
-        return RS_(L"ApplicationDisplayNameUnpackaged");
-    }
-
-    winrt::hstring AppLogic::ApplicationVersion() const
-    {
-        try
-        {
-            const auto package{ winrt::Windows::ApplicationModel::Package::Current() };
-            const auto version{ package.Id().Version() };
-            winrt::hstring formatted{ wil::str_printf<std::wstring>(L"%u.%u.%u.%u", version.Major, version.Minor, version.Build, version.Revision) };
-            return formatted;
-        }
-        CATCH_LOG();
-
-        // Try to get the version the old-fashioned way
-        try
-        {
-            struct LocalizationInfo
-            {
-                WORD language, codepage;
-            };
-            // Use the current module instance handle for TerminalApp.dll, nullptr for WindowsTerminal.exe
-            auto filename{ wil::GetModuleFileNameW<std::wstring>(wil::GetModuleInstanceHandle()) };
-            auto size{ GetFileVersionInfoSizeExW(0, filename.c_str(), nullptr) };
-            THROW_LAST_ERROR_IF(size == 0);
-            auto versionBuffer{ std::make_unique<std::byte[]>(size) };
-            THROW_IF_WIN32_BOOL_FALSE(GetFileVersionInfoExW(0, filename.c_str(), 0, size, versionBuffer.get()));
-
-            // Get the list of Version localizations
-            LocalizationInfo* pVarLocalization{ nullptr };
-            UINT varLen{ 0 };
-            THROW_IF_WIN32_BOOL_FALSE(VerQueryValueW(versionBuffer.get(), L"\\VarFileInfo\\Translation", reinterpret_cast<void**>(&pVarLocalization), &varLen));
-            THROW_HR_IF(E_UNEXPECTED, varLen < sizeof(*pVarLocalization)); // there must be at least one translation
-
-            // Get the product version from the localized version compartment
-            // We're using String/ProductVersion here because our build pipeline puts more rich information in it (like the branch name)
-            // than in the unlocalized numeric version fields.
-            WCHAR* pProductVersion{ nullptr };
-            UINT versionLen{ 0 };
-            const auto localizedVersionName{ wil::str_printf<std::wstring>(L"\\StringFileInfo\\%04x%04x\\ProductVersion",
-                                                                           pVarLocalization->language ? pVarLocalization->language : 0x0409, // well-known en-US LCID
-                                                                           pVarLocalization->codepage) };
-            THROW_IF_WIN32_BOOL_FALSE(VerQueryValueW(versionBuffer.get(), localizedVersionName.c_str(), reinterpret_cast<void**>(&pProductVersion), &versionLen));
-            return { pProductVersion };
-        }
-        CATCH_LOG();
-
-        return RS_(L"ApplicationVersionUnknown");
-    }
-
    bool AppLogic::FocusMode() const
    {
        return _root ? _root->FocusMode() : false;
--- a/src/cascadia/TerminalApp/AppLogic.h
+++ b/src/cascadia/TerminalApp/AppLogic.h
@@ -6,7 +6,6 @@
 #include "AppLogic.g.h"

 #include "Tab.h"
-#include "CascadiaSettings.h"
 #include "TerminalPage.h"
 #include "Jumplist.h"
 #include "../../cascadia/inc/cppwinrt_utils.h"
@@ -17,7 +16,7 @@ namespace winrt::TerminalApp::implementation
    {
    public:
        static AppLogic* Current() noexcept;
-        static const TerminalApp::CascadiaSettings CurrentAppSettings();
+        static const Microsoft::Terminal::Settings::Model::CascadiaSettings CurrentAppSettings();

        AppLogic();
        ~AppLogic() = default;
@@ -27,14 +26,12 @@ namespace winrt::TerminalApp::implementation
        void RunAsUwp();
        bool IsElevated() const noexcept;
        void LoadSettings();
-        [[nodiscard]] TerminalApp::CascadiaSettings GetSettings() const noexcept;
+        [[nodiscard]] Microsoft::Terminal::Settings::Model::CascadiaSettings GetSettings() const noexcept;

        int32_t SetStartupCommandline(array_view<const winrt::hstring> actions);
        winrt::hstring ParseCommandlineMessage();
        bool ShouldExitEarly();

-        winrt::hstring ApplicationDisplayName() const;
-        winrt::hstring ApplicationVersion() const;
        bool FocusMode() const;
        bool Fullscreen() const;
        bool AlwaysOnTop() const;
@@ -42,9 +39,8 @@ namespace winrt::TerminalApp::implementation
        Windows::Foundation::Size GetLaunchDimensions(uint32_t dpi);
        TerminalApp::InitialPosition GetInitialPosition(int64_t defaultInitialX, int64_t defaultInitialY);
        winrt::Windows::UI::Xaml::ElementTheme GetRequestedTheme();
-        LaunchMode GetLaunchMode();
+        Microsoft::Terminal::Settings::Model::LaunchMode GetLaunchMode();
        bool GetShowTabsInTitlebar();
-        bool GetInitialAlwaysOnTop();
        float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;

        Windows::UI::Xaml::UIElement GetRoot() noexcept;
@@ -71,7 +67,7 @@ namespace winrt::TerminalApp::implementation
        // updated in _ApplyTheme. The root currently is _root.
        winrt::com_ptr<TerminalPage> _root{ nullptr };

-        TerminalApp::CascadiaSettings _settings{ nullptr };
+        Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };

        HRESULT _settingsLoadedResult;
        winrt::hstring _settingsLoadExceptionText{};
@@ -89,8 +85,6 @@ namespace winrt::TerminalApp::implementation

        void _ShowLoadErrorsDialog(const winrt::hstring& titleKey, const winrt::hstring& contentKey, HRESULT settingsLoadedResult);
        void _ShowLoadWarningsDialog();
-        bool _IsKeyboardServiceEnabled();
-        void _ShowKeyboardServiceDisabledDialog();

        fire_and_forget _LoadErrorsDialogRoutine();
        fire_and_forget _ShowLoadWarningsDialogRoutine();
--- a/src/cascadia/TerminalApp/AppLogic.idl
+++ b/src/cascadia/TerminalApp/AppLogic.idl
@@ -13,13 +13,6 @@ namespace TerminalApp
        Int64 Y;
    };

-    enum LaunchMode
-    {
-        DefaultMode,
-        MaximizedMode,
-        FullscreenMode,
-    };
-
    [default_interface] runtimeclass AppLogic : IDirectKeyListener, IDialogPresenter
    {
        AppLogic();
@@ -44,9 +37,6 @@ namespace TerminalApp

        String Title { get; };

-        String ApplicationDisplayName { get; };
-        String ApplicationVersion { get; };
-
        Boolean FocusMode { get; };
        Boolean Fullscreen { get; };
        Boolean AlwaysOnTop { get; };
@@ -55,9 +45,8 @@ namespace TerminalApp

        InitialPosition GetInitialPosition(Int64 defaultInitialX, Int64 defaultInitialY);
        Windows.UI.Xaml.ElementTheme GetRequestedTheme();
-        LaunchMode GetLaunchMode();
+        Microsoft.Terminal.Settings.Model.LaunchMode GetLaunchMode();
        Boolean GetShowTabsInTitlebar();
-        Boolean GetInitialAlwaysOnTop();
        Single CalcSnappedDimension(Boolean widthOrHeight, Single dimension);
        void TitlebarClicked();
        void WindowCloseButtonClicked();
--- a/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
+++ b/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
@@ -129,7 +129,7 @@
            </Grid.RowDefinitions>
            <ColorPicker x:Name="customColorPicker"
                     IsMoreButtonVisible="True"
-                     IsColorSliderVisible="True"
+                     IsColorSliderVisible="False"
                     IsColorChannelTextInputVisible="True"
                     IsHexInputVisible="True"
                     IsAlphaEnabled="False"
--- a/src/cascadia/TerminalApp/ColorScheme.idl
+++ b/src/cascadia/TerminalApp/ColorScheme.idl
@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace TerminalApp
-{
-    [default_interface] runtimeclass ColorScheme {
-        ColorScheme();
-        ColorScheme(String name, Windows.UI.Color defaultFg, Windows.UI.Color defaultBg, Windows.UI.Color cursorColor);
-
-        String Name { get; };
-
-        Windows.UI.Color Foreground { get; };
-        Windows.UI.Color Background { get; };
-        Windows.UI.Color SelectionBackground { get; };
-        Windows.UI.Color CursorColor { get; };
-
-        Windows.UI.Color[] Table { get; };
-    }
-}
--- a/src/cascadia/TerminalApp/Command.h
+++ b/src/cascadia/TerminalApp/Command.h
@@ -1,83 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
- Command.h
-
-Abstract:
- A command represents a single entry in the Command Palette. This is an object
-  that has a user facing "name" to display to the user, and an associated action
-  which can be dispatched.
-
- For more information, see GH#2046, #5400, #5674, and #6635
-
-Author(s):
- Mike Griese - June 2020
-
--*/
-#pragma once
-
-#include "Command.g.h"
-#include "TerminalWarnings.h"
-#include "Profile.h"
-#include "..\inc\cppwinrt_utils.h"
-#include "SettingsTypes.h"
-
-// fwdecl unittest classes
-namespace TerminalAppLocalTests
-{
-    class SettingsTests;
-    class CommandTests;
-};
-
-namespace winrt::TerminalApp::implementation
-{
-    struct Command : CommandT<Command>
-    {
-        Command();
-
-        static winrt::com_ptr<Command> FromJson(const Json::Value& json,
-                                                std::vector<TerminalApp::SettingsLoadWarnings>& warnings);
-
-        static void ExpandCommands(Windows::Foundation::Collections::IMap<winrt::hstring, winrt::TerminalApp::Command>& commands,
-                                   Windows::Foundation::Collections::IVectorView<winrt::TerminalApp::Profile> profiles,
-                                   gsl::span<winrt::TerminalApp::ColorScheme> schemes,
-                                   std::vector<TerminalApp::SettingsLoadWarnings>& warnings);
-
-        static std::vector<TerminalApp::SettingsLoadWarnings> LayerJson(Windows::Foundation::Collections::IMap<winrt::hstring, winrt::TerminalApp::Command>& commands,
-                                                                        const Json::Value& json);
-        bool HasNestedCommands();
-        Windows::Foundation::Collections::IMapView<winrt::hstring, TerminalApp::Command> NestedCommands();
-
-        void RefreshIcon();
-
-        winrt::Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker propertyChangedRevoker;
-
-        WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, Name, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(winrt::TerminalApp::ActionAndArgs, Action, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, KeyChordText, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(winrt::Windows::UI::Xaml::Controls::IconSource, IconSource, _PropertyChangedHandlers, nullptr);
-
-        GETSET_PROPERTY(ExpandCommandType, IterateOn, ExpandCommandType::None);
-
-    private:
-        Json::Value _originalJson;
-        Windows::Foundation::Collections::IMap<winrt::hstring, winrt::TerminalApp::Command> _subcommands{ nullptr };
-
-        winrt::hstring _lastIconPath{};
-
-        static std::vector<winrt::TerminalApp::Command> _expandCommand(Command* const expandable,
-                                                                       Windows::Foundation::Collections::IVectorView<winrt::TerminalApp::Profile> profiles,
-                                                                       gsl::span<winrt::TerminalApp::ColorScheme> schemes,
-                                                                       std::vector<TerminalApp::SettingsLoadWarnings>& warnings);
-        friend class TerminalAppLocalTests::SettingsTests;
-        friend class TerminalAppLocalTests::CommandTests;
-    };
-}
-
-namespace winrt::TerminalApp::factory_implementation
-{
-    BASIC_FACTORY(Command);
-}
--- a/src/cascadia/TerminalApp/Command.idl
+++ b/src/cascadia/TerminalApp/Command.idl
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import "ShortcutActionDispatch.idl";
-
-namespace TerminalApp
-{
-    [default_interface] runtimeclass Command : Windows.UI.Xaml.Data.INotifyPropertyChanged
-    {
-        Command();
-
-        String Name;
-        ActionAndArgs Action;
-        String KeyChordText;
-
-        Windows.UI.Xaml.Controls.IconSource IconSource;
-        void RefreshIcon();
-
-        Boolean HasNestedCommands { get; };
-        Windows.Foundation.Collections.IMapView<String, Command> NestedCommands { get; };
-    }
-}
--- a/src/cascadia/TerminalApp/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -3,9 +3,6 @@

 #include "pch.h"
 #include "CommandPalette.h"
-#include "ActionAndArgs.h"
-#include "ActionArgs.h"
-#include "Command.h"

 #include <LibraryResources.h>

@@ -18,6 +15,7 @@ using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::System;
 using namespace winrt::Windows::Foundation;
 using namespace winrt::Windows::Foundation::Collections;
+using namespace winrt::Microsoft::Terminal::Settings::Model;

 namespace winrt::TerminalApp::implementation
 {
@@ -26,11 +24,11 @@ namespace winrt::TerminalApp::implementation
    {
        InitializeComponent();

-        _filteredActions = winrt::single_threaded_observable_vector<winrt::TerminalApp::Command>();
-        _nestedActionStack = winrt::single_threaded_vector<winrt::TerminalApp::Command>();
-        _currentNestedCommands = winrt::single_threaded_vector<winrt::TerminalApp::Command>();
-        _allCommands = winrt::single_threaded_vector<winrt::TerminalApp::Command>();
-        _allTabActions = winrt::single_threaded_vector<winrt::TerminalApp::Command>();
+        _filteredActions = winrt::single_threaded_observable_vector<Command>();
+        _nestedActionStack = winrt::single_threaded_vector<Command>();
+        _currentNestedCommands = winrt::single_threaded_vector<Command>();
+        _allCommands = winrt::single_threaded_vector<Command>();
+        _allTabActions = winrt::single_threaded_vector<Command>();

        _switchToMode(CommandPaletteMode::ActionMode);

@@ -119,90 +117,6 @@ namespace winrt::TerminalApp::implementation
        _filteredActionsView().ScrollIntoView(_filteredActionsView().SelectedItem());
    }

-    // Method Description:
-    // - Scroll the command palette to the specified index
-    // Arguments:
-    // - index within a list view of commands
-    // Return Value:
-    // - <none>
-    void CommandPalette::_scrollToIndex(uint32_t index)
-    {
-        auto numItems = _filteredActionsView().Items().Size();
-
-        if (numItems == 0)
-        {
-            // if the list is empty no need to scroll
-            return;
-        }
-
-        auto clampedIndex = std::clamp<int32_t>(index, 0, numItems - 1);
-        _filteredActionsView().SelectedIndex(clampedIndex);
-        _filteredActionsView().ScrollIntoView(_filteredActionsView().SelectedItem());
-    }
-
-    // Method Description:
-    // - Computes the number of visible commands
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - the approximate number of items visible in the list (in other words the size of the page)
-    uint32_t CommandPalette::_getNumVisibleItems()
-    {
-        const auto container = _filteredActionsView().ContainerFromIndex(0);
-        const auto item = container.try_as<winrt::Windows::UI::Xaml::Controls::ListViewItem>();
-        const auto itemHeight = ::base::saturated_cast<int>(item.ActualHeight());
-        const auto listHeight = ::base::saturated_cast<int>(_filteredActionsView().ActualHeight());
-        return listHeight / itemHeight;
-    }
-
-    // Method Description:
-    // - Scrolls the focus one page up the list of commands.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void CommandPalette::ScrollPageUp()
-    {
-        auto selected = _filteredActionsView().SelectedIndex();
-        auto numVisibleItems = _getNumVisibleItems();
-        _scrollToIndex(selected - numVisibleItems);
-    }
-
-    // Method Description:
-    // - Scrolls the focus one page down the list of commands.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void CommandPalette::ScrollPageDown()
-    {
-        auto selected = _filteredActionsView().SelectedIndex();
-        auto numVisibleItems = _getNumVisibleItems();
-        _scrollToIndex(selected + numVisibleItems);
-    }
-
-    // Method Description:
-    // - Moves the focus to the top item in the list of commands.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void CommandPalette::ScrollToTop()
-    {
-        _scrollToIndex(0);
-    }
-
-    // Method Description:
-    // - Moves the focus to the bottom item in the list of commands.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void CommandPalette::ScrollToBottom()
-    {
-        _scrollToIndex(_filteredActionsView().Items().Size() - 1);
-    }
-
    // Method Description:
    // - Called when the command selection changes. We'll use this in the tab
    //   switcher to "preview" tabs as the user navigates the list of tabs. To
@@ -218,7 +132,7 @@ namespace winrt::TerminalApp::implementation
        if (_currentMode == CommandPaletteMode::TabSwitchMode)
        {
            const auto& selectedCommand = _filteredActionsView().SelectedItem();
-            if (const auto& command = selectedCommand.try_as<TerminalApp::Command>())
+            if (const auto& command = selectedCommand.try_as<Command>())
            {
                const auto& actionAndArgs = command.Action();
                _dispatch.DoAction(actionAndArgs);
@@ -279,30 +193,6 @@ namespace winrt::TerminalApp::implementation
            SelectNextItem(true);
            e.Handled(true);
        }
-        else if (key == VirtualKey::PageUp)
-        {
-            // Action Mode: Move focus to the first visible item in the list.
-            ScrollPageUp();
-            e.Handled(true);
-        }
-        else if (key == VirtualKey::PageDown)
-        {
-            // Action Mode: Move focus to the last visible item in the list.
-            ScrollPageDown();
-            e.Handled(true);
-        }
-        else if (key == VirtualKey::Home)
-        {
-            // Action Mode: Move focus to the first item in the list.
-            ScrollToTop();
-            e.Handled(true);
-        }
-        else if (key == VirtualKey::End)
-        {
-            // Action Mode: Move focus to the last item in the list.
-            ScrollToBottom();
-            e.Handled(true);
-        }
        else if (key == VirtualKey::Enter)
        {
            // Action, TabSwitch or TabSearchMode Mode: Dispatch the action of the selected command.
@@ -310,7 +200,7 @@ namespace winrt::TerminalApp::implementation
            {
                if (const auto selectedItem = _filteredActionsView().SelectedItem())
                {
-                    _dispatchCommand(selectedItem.try_as<TerminalApp::Command>());
+                    _dispatchCommand(selectedItem.try_as<Command>());
                }
            }
            // Commandline Mode: Use the input to synthesize an ExecuteCommandline action
@@ -323,41 +213,27 @@ namespace winrt::TerminalApp::implementation
        }
        else if (key == VirtualKey::Escape)
        {
-            // Action, TabSearch, TabSwitch Mode: Dismiss the palette if the
-            // text is empty, otherwise clear the search string.
-            if (_currentMode != CommandPaletteMode::CommandlineMode)
+            // Dismiss the palette if the text is empty, otherwise clear the
+            // search string.
+            if (_searchBox().Text().empty())
            {
-                if (_searchBox().Text().empty())
-                {
-                    _dismissPalette();
-                }
-                else
-                {
-                    _searchBox().Text(L"");
-                }
+                _dismissPalette();
            }
-            else if (_currentMode == CommandPaletteMode::CommandlineMode)
+            else
            {
-                const auto currentInput = _getPostPrefixInput();
-                if (currentInput.empty())
-                {
-                    // The user's only input "> " so far. We should just dismiss
-                    // the palette. This is like dismissing the Action mode with
-                    // empty input.
-                    _dismissPalette();
-                }
-                else
-                {
-                    // Clear out the current input. We'll leave a ">" in the
-                    // input (to stay in commandline mode), and a leading space
-                    // (if they currently had one).
-                    const bool hasLeadingSpace = (_searchBox().Text().size()) - (currentInput.size()) > 1;
-                    _searchBox().Text(hasLeadingSpace ? L"> " : L">");
+                _searchBox().Text(L"");
+            }

-                    // This will conveniently move the cursor to the end of the
-                    // text input for us.
-                    _searchBox().Select(_searchBox().Text().size(), 0);
-                }
+            e.Handled(true);
+        }
+        else if (key == VirtualKey::Back)
+        {
+            // If the last filter text was empty, and we're backspacing from
+            // that state, then the user "backspaced" the virtual '>' we're
+            // using as the action mode indicator. Switch into commandline mode.
+            if (_searchBox().Text().empty() && _lastFilterTextWasEmpty && _currentMode == CommandPaletteMode::ActionMode)
+            {
+                _switchToMode(CommandPaletteMode::CommandlineMode);
            }

            e.Handled(true);
@@ -433,7 +309,7 @@ namespace winrt::TerminalApp::implementation
        {
            if (const auto selectedItem = _filteredActionsView().SelectedItem())
            {
-                if (const auto data = selectedItem.try_as<TerminalApp::Command>())
+                if (const auto data = selectedItem.try_as<Command>())
                {
                    _dispatchCommand(data);
                }
@@ -480,7 +356,7 @@ namespace winrt::TerminalApp::implementation
    void CommandPalette::_listItemClicked(Windows::Foundation::IInspectable const& /*sender*/,
                                          Windows::UI::Xaml::Controls::ItemClickEventArgs const& e)
    {
-        _dispatchCommand(e.ClickedItem().try_as<TerminalApp::Command>());
+        _dispatchCommand(e.ClickedItem().try_as<Command>());
    }

    // Method Description:
@@ -515,7 +391,7 @@ namespace winrt::TerminalApp::implementation
    // - <none>
    // Return Value:
    // - A list of Commands to filter.
-    Collections::IVector<TerminalApp::Command> CommandPalette::_commandsToFilter()
+    Collections::IVector<Command> CommandPalette::_commandsToFilter()
    {
        switch (_currentMode)
        {
@@ -530,7 +406,7 @@ namespace winrt::TerminalApp::implementation
        case CommandPaletteMode::TabSwitchMode:
            return _allTabActions;
        case CommandPaletteMode::CommandlineMode:
-            return winrt::single_threaded_vector<TerminalApp::Command>();
+            return winrt::single_threaded_vector<Command>();
        default:
            return _allCommands;
        }
@@ -545,7 +421,7 @@ namespace winrt::TerminalApp::implementation
    // - command: the Command to dispatch. This might be null.
    // Return Value:
    // - <none>
-    void CommandPalette::_dispatchCommand(const TerminalApp::Command& command)
+    void CommandPalette::_dispatchCommand(const Command& command)
    {
        if (command)
        {
@@ -590,18 +466,13 @@ namespace winrt::TerminalApp::implementation
            }
        }
    }
-
    // Method Description:
-    // - Get all the input text in _searchBox that follows the prefix character
-    //   and any whitespace following that prefix character. This can be used in
-    //   commandline mode to get all the useful input that the user input after
-    //   the leading ">" prefix.
-    // - Note that this will behave unexpectedly in Action Mode.
+    // - Get all the input text in _searchBox that follows any leading spaces.
    // Arguments:
    // - <none>
    // Return Value:
-    // - the string of input following the prefix character.
-    std::wstring CommandPalette::_getPostPrefixInput()
+    // - the string of input following any number of leading spaces
+    std::wstring CommandPalette::_getTrimmedInput()
    {
        const std::wstring input{ _searchBox().Text() };
        if (input.empty())
@@ -609,17 +480,15 @@ namespace winrt::TerminalApp::implementation
            return input;
        }

-        const auto rawCmdline{ input.substr(1) };
-
        // Trim leading whitespace
-        const auto firstNonSpace = rawCmdline.find_first_not_of(L" ");
+        const auto firstNonSpace = input.find_first_not_of(L" ");
        if (firstNonSpace == std::wstring::npos)
        {
            // All the following characters are whitespace.
            return L"";
        }

-        return rawCmdline.substr(firstNonSpace);
+        return input.substr(firstNonSpace);
    }

    // Method Description:
@@ -630,19 +499,15 @@ namespace winrt::TerminalApp::implementation
    // - <none>
    void CommandPalette::_dispatchCommandline()
    {
-        const auto input = _getPostPrefixInput();
-        if (input.empty())
+        auto cmdline{ _getTrimmedInput() };
+        if (cmdline.empty())
        {
            return;
        }
-        winrt::hstring cmdline{ input };

        // Build the ExecuteCommandline action from the values we've parsed on the commandline.
-        auto executeActionAndArgs = winrt::make_self<implementation::ActionAndArgs>();
-        executeActionAndArgs->Action(ShortcutAction::ExecuteCommandline);
-        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
-        args->Commandline(cmdline);
-        executeActionAndArgs->Args(*args);
+        ExecuteCommandlineArgs args{ cmdline };
+        ActionAndArgs executeActionAndArgs{ ShortcutAction::ExecuteCommandline, args };

        TraceLoggingWrite(
            g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
@@ -651,7 +516,7 @@ namespace winrt::TerminalApp::implementation
            TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
            TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));

-        if (_dispatch.DoAction(*executeActionAndArgs))
+        if (_dispatch.DoAction(executeActionAndArgs))
        {
            _close();
        }
@@ -687,37 +552,54 @@ namespace winrt::TerminalApp::implementation
    void CommandPalette::_filterTextChanged(IInspectable const& /*sender*/,
                                            Windows::UI::Xaml::RoutedEventArgs const& /*args*/)
    {
-        if (_currentMode == CommandPaletteMode::CommandlineMode || _currentMode == CommandPaletteMode::ActionMode)
+        if (_currentMode == CommandPaletteMode::CommandlineMode)
        {
            _evaluatePrefix();
        }

+        // We're setting _lastFilterTextWasEmpty here, because if the user tries
+        // to backspace the last character in the input, the Backspace KeyDown
+        // event will fire _before_ _filterTextChanged does. Updating the value
+        // here will ensure that we can check this case appropriately.
+        _lastFilterTextWasEmpty = _searchBox().Text().empty();
+
        _updateFilteredActions();
        _filteredActionsView().SelectedIndex(0);

-        _noMatchesText().Visibility(_filteredActions.Size() > 0 ? Visibility::Collapsed : Visibility::Visible);
+        if (_currentMode == CommandPaletteMode::TabSearchMode || _currentMode == CommandPaletteMode::ActionMode)
+        {
+            _noMatchesText().Visibility(_filteredActions.Size() > 0 ? Visibility::Collapsed : Visibility::Visible);
+        }
+        else
+        {
+            _noMatchesText().Visibility(Visibility::Collapsed);
+        }
    }

    void CommandPalette::_evaluatePrefix()
    {
-        auto newMode = CommandPaletteMode::ActionMode;
+        // This will take you from commandline mode, into action mode. The
+        // backspace handler in _keyDownHandler will handle taking us from
+        // action mode to commandline mode.
+        auto newMode = CommandPaletteMode::CommandlineMode;

-        auto inputText = _searchBox().Text();
+        auto inputText = _getTrimmedInput();
        if (inputText.size() > 0)
        {
            if (inputText[0] == L'>')
            {
-                newMode = CommandPaletteMode::CommandlineMode;
+                newMode = CommandPaletteMode::ActionMode;
            }
        }

        if (newMode != _currentMode)
        {
+            //_switchToMode will remove the '>' character from the input.
            _switchToMode(newMode);
        }
    }

-    Collections::IObservableVector<TerminalApp::Command> CommandPalette::FilteredActions()
+    Collections::IObservableVector<Command> CommandPalette::FilteredActions()
    {
        return _filteredActions;
    }
@@ -727,18 +609,12 @@ namespace winrt::TerminalApp::implementation
        _bindings = bindings;
    }

-    void CommandPalette::SetCommands(Collections::IVector<TerminalApp::Command> const& actions)
+    void CommandPalette::SetCommands(Collections::IVector<Command> const& actions)
    {
        _allCommands = actions;
        _updateFilteredActions();
    }

-    void CommandPalette::SetTabActions(Collections::IVector<TerminalApp::Command> const& tabs)
-    {
-        _allTabActions = tabs;
-        _updateFilteredActions();
-    }
-
    void CommandPalette::EnableCommandPaletteMode()
    {
        _switchToMode(CommandPaletteMode::ActionMode);
@@ -763,6 +639,8 @@ namespace winrt::TerminalApp::implementation
            }
        }

+        _searchBox().Text(L"");
+        _searchBox().Select(_searchBox().Text().size(), 0);
        // Leaving this block of code outside the above if-statement
        // guarantees that the correct text is shown for the mode
        // whenever _switchToMode is called.
@@ -771,26 +649,30 @@ namespace winrt::TerminalApp::implementation
        case CommandPaletteMode::TabSearchMode:
        case CommandPaletteMode::TabSwitchMode:
        {
-            SearchBoxText(RS_(L"TabSwitcher_SearchBoxText"));
+            SearchBoxPlaceholderText(RS_(L"TabSwitcher_SearchBoxText"));
            NoMatchesText(RS_(L"TabSwitcher_NoMatchesText"));
            ControlName(RS_(L"TabSwitcherControlName"));
+            PrefixCharacter(L"");
            break;
        }
        case CommandPaletteMode::CommandlineMode:
-            NoMatchesText(RS_(L"CmdPalCommandlinePrompt"));
+            SearchBoxPlaceholderText(RS_(L"CmdPalCommandlinePrompt"));
+            NoMatchesText(L"");
            ControlName(RS_(L"CommandPaletteControlName"));
+            PrefixCharacter(L"");
            break;
        case CommandPaletteMode::ActionMode:
        default:
-            SearchBoxText(RS_(L"CommandPalette_SearchBox/PlaceholderText"));
+            SearchBoxPlaceholderText(RS_(L"CommandPalette_SearchBox/PlaceholderText"));
            NoMatchesText(RS_(L"CommandPalette_NoMatchesText/Text"));
            ControlName(RS_(L"CommandPaletteControlName"));
+            PrefixCharacter(L">");
            break;
        }
    }

    // This is a helper to aid in sorting commands by their `Name`s, alphabetically.
-    static bool _compareCommandNames(const TerminalApp::Command& lhs, const TerminalApp::Command& rhs)
+    static bool _compareCommandNames(const Command& lhs, const Command& rhs)
    {
        std::wstring_view leftName{ lhs.Name() };
        std::wstring_view rightName{ rhs.Name() };
@@ -800,7 +682,7 @@ namespace winrt::TerminalApp::implementation
    // This is a helper struct to aid in sorting Commands by a given weighting.
    struct WeightedCommand
    {
-        TerminalApp::Command command;
+        Command command;
        int weight;
        int inOrderCounter;

@@ -832,11 +714,11 @@ namespace winrt::TerminalApp::implementation
    // - A collection that will receive the filtered actions
    // Return Value:
    // - <none>
-    std::vector<winrt::TerminalApp::Command> CommandPalette::_collectFilteredActions()
+    std::vector<Command> CommandPalette::_collectFilteredActions()
    {
-        std::vector<winrt::TerminalApp::Command> actions;
+        std::vector<Command> actions;

-        auto searchText = _searchBox().Text();
+        winrt::hstring searchText{ _getTrimmedInput() };
        const bool addAll = searchText.empty();

        auto commandsToFilter = _commandsToFilter();
@@ -859,7 +741,7 @@ namespace winrt::TerminalApp::implementation
            }

            // Add all the commands, but make sure they're sorted alphabetically.
-            std::vector<TerminalApp::Command> sortedCommands;
+            std::vector<Command> sortedCommands;
            sortedCommands.reserve(commandsToFilter.Size());

            for (auto action : commandsToFilter)
@@ -1094,6 +976,45 @@ namespace winrt::TerminalApp::implementation
        _currentNestedCommands.Clear();
    }

+    // Method Description:
+    // - Listens for changes to TerminalPage's _tabs vector. Updates our vector of
+    //   tab switching commands accordingly.
+    // Arguments:
+    // - s: The vector being listened to.
+    // - e: The vector changed args that tells us whether a change, insert, or removal was performed
+    //      on the listened-to vector.
+    // Return Value:
+    // - <none>
+    void CommandPalette::OnTabsChanged(const IInspectable& s, const IVectorChangedEventArgs& e)
+    {
+        if (auto tabList = s.try_as<IObservableVector<TerminalApp::Tab>>())
+        {
+            auto idx = e.Index();
+            auto changedEvent = e.CollectionChange();
+
+            switch (changedEvent)
+            {
+            case CollectionChange::ItemChanged:
+            {
+                break;
+            }
+            case CollectionChange::ItemInserted:
+            {
+                auto tab = tabList.GetAt(idx);
+                _allTabActions.InsertAt(idx, tab.SwitchToTabCommand());
+                break;
+            }
+            case CollectionChange::ItemRemoved:
+            {
+                _allTabActions.RemoveAt(idx);
+                break;
+            }
+            }
+
+            _updateFilteredActions();
+        }
+    }
+
    void CommandPalette::EnableTabSwitcherMode(const bool searchMode, const uint32_t startIdx)
    {
        _switcherStartIdx = startIdx;
--- a/src/cascadia/TerminalApp/CommandPalette.h
+++ b/src/cascadia/TerminalApp/CommandPalette.h
@@ -20,10 +20,9 @@ namespace winrt::TerminalApp::implementation
    {
        CommandPalette();

-        Windows::Foundation::Collections::IObservableVector<TerminalApp::Command> FilteredActions();
+        Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Model::Command> FilteredActions();

-        void SetCommands(Windows::Foundation::Collections::IVector<TerminalApp::Command> const& actions);
-        void SetTabActions(Windows::Foundation::Collections::IVector<TerminalApp::Command> const& tabs);
+        void SetCommands(Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::Command> const& actions);
        void SetKeyBindings(Microsoft::Terminal::TerminalControl::IKeyBindings bindings);

        void EnableCommandPaletteMode();
@@ -34,31 +33,30 @@ namespace winrt::TerminalApp::implementation

        void SelectNextItem(const bool moveDown);

-        void ScrollPageUp();
-        void ScrollPageDown();
-        void ScrollToTop();
-        void ScrollToBottom();
-
        // Tab Switcher
        void EnableTabSwitcherMode(const bool searchMode, const uint32_t startIdx);
+        void OnTabsChanged(const Windows::Foundation::IInspectable& s, const Windows::Foundation::Collections::IVectorChangedEventArgs& e);

        WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, NoMatchesText, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, SearchBoxText, _PropertyChangedHandlers);
+        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, SearchBoxPlaceholderText, _PropertyChangedHandlers);
+        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, PrefixCharacter, _PropertyChangedHandlers);
        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, ControlName, _PropertyChangedHandlers);
        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, ParentCommandName, _PropertyChangedHandlers);

    private:
        friend struct CommandPaletteT<CommandPalette>; // for Xaml to bind events

-        Windows::Foundation::Collections::IVector<TerminalApp::Command> _allCommands{ nullptr };
-        Windows::Foundation::Collections::IVector<TerminalApp::Command> _currentNestedCommands{ nullptr };
-        Windows::Foundation::Collections::IObservableVector<TerminalApp::Command> _filteredActions{ nullptr };
-        Windows::Foundation::Collections::IVector<TerminalApp::Command> _nestedActionStack{ nullptr };
+        Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::Command> _allCommands{ nullptr };
+        Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::Command> _currentNestedCommands{ nullptr };
+        Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Model::Command> _filteredActions{ nullptr };
+        Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::Command> _nestedActionStack{ nullptr };

        winrt::TerminalApp::ShortcutActionDispatch _dispatch;

-        Windows::Foundation::Collections::IVector<TerminalApp::Command> _commandsToFilter();
+        Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::Command> _commandsToFilter();
+
+        bool _lastFilterTextWasEmpty{ true };

        void _filterTextChanged(Windows::Foundation::IInspectable const& sender,
                                Windows::UI::Xaml::RoutedEventArgs const& args);
@@ -81,7 +79,7 @@ namespace winrt::TerminalApp::implementation

        void _updateFilteredActions();

-        std::vector<winrt::TerminalApp::Command> _collectFilteredActions();
+        std::vector<Microsoft::Terminal::Settings::Model::Command> _collectFilteredActions();

        static int _getWeight(const winrt::hstring& searchText, const winrt::hstring& name);
        void _close();
@@ -89,24 +87,21 @@ namespace winrt::TerminalApp::implementation
        CommandPaletteMode _currentMode;
        void _switchToMode(CommandPaletteMode mode);

+        std::wstring _getTrimmedInput();
        void _evaluatePrefix();
-        std::wstring _getPostPrefixInput();

        Microsoft::Terminal::TerminalControl::IKeyBindings _bindings;

        // Tab Switcher
-        Windows::Foundation::Collections::IVector<TerminalApp::Command> _allTabActions{ nullptr };
+        Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::Command> _allTabActions{ nullptr };
        uint32_t _switcherStartIdx;
        void _anchorKeyUpHandler();

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

-        void _dispatchCommand(const TerminalApp::Command& command);
+        void _dispatchCommand(const Microsoft::Terminal::Settings::Model::Command& command);
        void _dispatchCommandline();
        void _dismissPalette();
-
-        void _scrollToIndex(uint32_t index);
-        uint32_t _getNumVisibleItems();
    };
 }

--- a/src/cascadia/TerminalApp/CommandPalette.idl
+++ b/src/cascadia/TerminalApp/CommandPalette.idl
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

-import "Command.idl";
 import "IDirectKeyListener.idl";
+import "ShortcutActionDispatch.idl";

 namespace TerminalApp
 {
@@ -11,14 +11,14 @@ namespace TerminalApp
        CommandPalette();

        String NoMatchesText { get; };
-        String SearchBoxText { get; };
+        String SearchBoxPlaceholderText { get; };
+        String PrefixCharacter { get; };
        String ControlName { get; };
        String ParentCommandName { get; };

-        Windows.Foundation.Collections.IObservableVector<Command> FilteredActions { get; };
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Model.Command> FilteredActions { get; };

-        void SetCommands(Windows.Foundation.Collections.IVector<Command> actions);
-        void SetTabActions(Windows.Foundation.Collections.IVector<Command> tabs);
+        void SetCommands(Windows.Foundation.Collections.IVector<Microsoft.Terminal.Settings.Model.Command> actions);
        void SetKeyBindings(Microsoft.Terminal.TerminalControl.IKeyBindings bindings);
        void EnableCommandPaletteMode();

@@ -27,5 +27,6 @@ namespace TerminalApp
        void SetDispatch(ShortcutActionDispatch dispatch);

        void EnableTabSwitcherMode(Boolean searchMode, UInt32 startIdx);
+        void OnTabsChanged(IInspectable s, Windows.Foundation.Collections.IVectorChangedEventArgs e);
    }
 }
--- a/src/cascadia/TerminalApp/CommandPalette.xaml
+++ b/src/cascadia/TerminalApp/CommandPalette.xaml
@@ -9,6 +9,7 @@ the MIT License. See LICENSE in the project root for license information. -->
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)"
+    xmlns:SettingsModel="using:Microsoft.Terminal.Settings.Model"
    TabNavigation="Cycle"
    IsTabStop="True"
    AllowFocusOnInteraction="True"
@@ -30,6 +31,7 @@ the MIT License. See LICENSE in the project root for license information. -->
            <local:EmptyStringVisibilityConverter x:Key="CommandKeyChordVisibilityConverter"/>
            <local:EmptyStringVisibilityConverter x:Key="ParentCommandVisibilityConverter"/>
            <local:HasNestedCommandsVisibilityConverter x:Key="HasNestedCommandsVisibilityConverter"/>
+            <local:IconPathConverter x:Key="IconSourceConverter"/>

            <ResourceDictionary.ThemeDictionaries>
                <ResourceDictionary x:Key="Dark">
@@ -133,27 +135,27 @@ the MIT License. See LICENSE in the project root for license information. -->
        to receive clicks _anywhere_ in its bounds. -->

        <Grid
-        x:Name="_shadowBackdrop"
-        Background="Transparent"
-        Grid.Column="0"
-        Grid.Row="0"
-        Grid.ColumnSpan="3"
-        Grid.RowSpan="2"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch">
+            x:Name="_shadowBackdrop"
+            Background="Transparent"
+            Grid.Column="0"
+            Grid.Row="0"
+            Grid.ColumnSpan="3"
+            Grid.RowSpan="2"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch">
        </Grid>

        <Grid
-        x:Name="_backdrop"
-        Style="{ThemeResource CommandPaletteBackground}"
-        CornerRadius="{ThemeResource ControlCornerRadius}"
-        PointerPressed="_backdropPointerPressed"
-        Margin="8"
-        Grid.Column="1"
-        Grid.Row="0"
-        Windows10version1903:Shadow="{StaticResource CommandPaletteShadow}"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Top">
+            x:Name="_backdrop"
+            Style="{ThemeResource CommandPaletteBackground}"
+            CornerRadius="{ThemeResource ControlCornerRadius}"
+            PointerPressed="_backdropPointerPressed"
+            Margin="8"
+            Grid.Column="1"
+            Grid.Row="0"
+            Windows10version1903:Shadow="{StaticResource CommandPaletteShadow}"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top">

            <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -162,15 +164,28 @@ the MIT License. See LICENSE in the project root for license information. -->
            </Grid.RowDefinitions>

            <TextBox
-            Grid.Row="0"
-            x:Name="_searchBox"
-            Margin="8"
-            IsSpellCheckEnabled="False"
-            TextChanged="_filterTextChanged"
-            PlaceholderText="{x:Bind SearchBoxText, Mode=OneWay}"
-            Text="">
+                Grid.Row="0"
+                x:Name="_searchBox"
+                Margin="8"
+                Padding="18,8,8,8"
+                IsSpellCheckEnabled="False"
+                TextChanged="_filterTextChanged"
+                PlaceholderText="{x:Bind SearchBoxPlaceholderText, Mode=OneWay}"
+                Text="">
            </TextBox>

+            <TextBlock
+                Grid.Row="0"
+                x:Name="_prefixCharacter"
+                Margin="16,16,0,-8"
+                FontSize="14"
+                Visibility="{x:Bind PrefixCharacter,
+                             Mode=OneWay,
+                             Converter={StaticResource ParentCommandVisibilityConverter}}"
+                Text="{x:Bind PrefixCharacter, Mode=OneWay}"
+                >
+            </TextBlock>
+
            <TextBlock
                Padding="16, 0, 16, 4"
                x:Name="_parentCommandText"
@@ -192,20 +207,20 @@ the MIT License. See LICENSE in the project root for license information. -->
            </TextBlock>

            <ListView
-            Grid.Row="2"
-            x:Name="_filteredActionsView"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch"
-            SelectionMode="Single"
-            CanReorderItems="False"
-            AllowDrop="False"
-            IsItemClickEnabled="True"
-            ItemClick="_listItemClicked"
-            PreviewKeyDown="_keyDownHandler"
-            ItemsSource="{x:Bind FilteredActions}">
+                Grid.Row="2"
+                x:Name="_filteredActionsView"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                SelectionMode="Single"
+                CanReorderItems="False"
+                AllowDrop="False"
+                IsItemClickEnabled="True"
+                ItemClick="_listItemClicked"
+                PreviewKeyDown="_keyDownHandler"
+                ItemsSource="{x:Bind FilteredActions}">

                <ItemsControl.ItemTemplate >
-                    <DataTemplate x:DataType="local:Command">
+                    <DataTemplate x:DataType="SettingsModel:Command">

                        <!-- This HorizontalContentAlignment="Stretch" is important
                        to make sure it takes the entire width of the line -->
@@ -226,7 +241,9 @@ the MIT License. See LICENSE in the project root for license information. -->
                                    Grid.Column="0"
                                    Width="16"
                                    Height="16"
-                                    IconSource="{x:Bind IconSource, Mode=OneWay}"/>
+                                    IconSource="{x:Bind Icon,
+                                                        Mode=OneWay,
+                                                        Converter={StaticResource IconSourceConverter}}"/>

                                <TextBlock Grid.Column="1"
                                       HorizontalAlignment="Left"
--- a/src/cascadia/TerminalApp/DebugTapConnection.cpp
+++ b/src/cascadia/TerminalApp/DebugTapConnection.cpp
@@ -3,7 +3,6 @@

 #include "pch.h"
 #include "DebugTapConnection.h"
-#include "Utils.h"

 using namespace ::winrt::Microsoft::Terminal::TerminalConnection;
 using namespace ::winrt::Windows::Foundation;
@@ -94,13 +93,13 @@ namespace winrt::Microsoft::TerminalApp::implementation

    void DebugTapConnection::_OutputHandler(const hstring str)
    {
-        _TerminalOutputHandlers(VisualizeControlCodes(str));
+        _TerminalOutputHandlers(til::visualize_control_codes(str));
    }

    // Called by the DebugInputTapConnection to print user input
    void DebugTapConnection::_PrintInput(const hstring& str)
    {
-        auto clean{ VisualizeControlCodes(str) };
+        auto clean{ til::visualize_control_codes(str) };
        auto formatted{ wil::str_printf<std::wstring>(L"\x1b[91m%ls\x1b[m", clean.data()) };
        _TerminalOutputHandlers(formatted);
    }
--- a/src/cascadia/TerminalApp/IconPathConverter.cpp
+++ b/src/cascadia/TerminalApp/IconPathConverter.cpp
@@ -0,0 +1,207 @@
+#include "pch.h"
+#include "IconPathConverter.h"
+#include "IconPathConverter.g.cpp"
+
+#include "Utils.h"
+
+using namespace winrt::Windows;
+using namespace winrt::Windows::UI::Xaml;
+
+namespace winrt::TerminalApp::implementation
+{
+// These are templates that help us figure out which BitmapIconSource/FontIconSource to use for a given IconSource.
+// We have to do this because some of our code still wants to use WUX/MUX IconSources.
+#pragma region BitmapIconSource
+    template<typename TIconSource>
+    struct BitmapIconSource
+    {
+    };
+
+    template<>
+    struct BitmapIconSource<winrt::Microsoft::UI::Xaml::Controls::IconSource>
+    {
+        using type = winrt::Microsoft::UI::Xaml::Controls::BitmapIconSource;
+    };
+
+    template<>
+    struct BitmapIconSource<winrt::Windows::UI::Xaml::Controls::IconSource>
+    {
+        using type = winrt::Windows::UI::Xaml::Controls::BitmapIconSource;
+    };
+#pragma endregion
+
+#pragma region FontIconSource
+    template<typename TIconSource>
+    struct FontIconSource
+    {
+    };
+
+    template<>
+    struct FontIconSource<winrt::Microsoft::UI::Xaml::Controls::IconSource>
+    {
+        using type = winrt::Microsoft::UI::Xaml::Controls::FontIconSource;
+    };
+
+    template<>
+    struct FontIconSource<winrt::Windows::UI::Xaml::Controls::IconSource>
+    {
+        using type = winrt::Windows::UI::Xaml::Controls::FontIconSource;
+    };
+#pragma endregion
+
+    // Method Description:
+    // - Creates an IconSource for the given path. The icon returned is a colored
+    //   icon. If we couldn't create the icon for any reason, we return an empty
+    //   IconElement.
+    // Template Types:
+    // - <TIconSource>: The type of IconSource (MUX, WUX) to generate.
+    // Arguments:
+    // - path: the full, expanded path to the icon.
+    // Return Value:
+    // - An IconElement with its IconSource set, if possible.
+    template<typename TIconSource>
+    TIconSource _getColoredBitmapIcon(const winrt::hstring& path)
+    {
+        if (!path.empty())
+        {
+            try
+            {
+                winrt::Windows::Foundation::Uri iconUri{ path };
+                BitmapIconSource<TIconSource>::type iconSource;
+                // Make sure to set this to false, so we keep the RGB data of the
+                // image. Otherwise, the icon will be white for all the
+                // non-transparent pixels in the image.
+                iconSource.ShowAsMonochrome(false);
+                iconSource.UriSource(iconUri);
+                return iconSource;
+            }
+            CATCH_LOG();
+        }
+
+        return nullptr;
+    }
+
+    // Method Description:
+    // - Creates an IconSource for the given path.
+    //    * If the icon is a path to an image, we'll use that.
+    //    * If it isn't, then we'll try and use the text as a FontIcon. If the
+    //      character is in the range of symbols reserved for the Segoe MDL2
+    //      Asserts, well treat it as such. Otherwise, we'll default to a Sego
+    //      UI icon, so things like emoji will work.
+    //    * If we couldn't create the icon for any reason, we return an empty
+    //      IconElement.
+    // Template Types:
+    // - <TIconSource>: The type of IconSource (MUX, WUX) to generate.
+    // Arguments:
+    // - path: the unprocessed path to the icon.
+    // Return Value:
+    // - An IconElement with its IconSource set, if possible.
+    template<typename TIconSource>
+    TIconSource _getIconSource(const winrt::hstring& iconPath)
+    {
+        TIconSource iconSource{ nullptr };
+
+        if (iconPath.size() != 0)
+        {
+            const auto expandedIconPath{ _expandIconPath(iconPath) };
+            iconSource = _getColoredBitmapIcon<TIconSource>(expandedIconPath);
+
+            // If we fail to set the icon source using the "icon" as a path,
+            // let's try it as a symbol/emoji.
+            //
+            // Anything longer than 2 wchar_t's _isn't_ an emoji or symbol, so
+            // don't do this if it's just an invalid path.
+            if (!iconSource && iconPath.size() <= 2)
+            {
+                try
+                {
+                    FontIconSource<TIconSource>::type icon;
+                    const wchar_t ch = iconPath[0];
+
+                    // The range of MDL2 Icons isn't explicitly defined, but
+                    // we're using this based off the table on:
+                    // https://docs.microsoft.com/en-us/windows/uwp/design/style/segoe-ui-symbol-font
+                    const bool isMDL2Icon = ch >= L'\uE700' && ch <= L'\uF8FF';
+                    if (isMDL2Icon)
+                    {
+                        icon.FontFamily(winrt::Windows::UI::Xaml::Media::FontFamily{ L"Segoe MDL2 Assets" });
+                    }
+                    else
+                    {
+                        // Note: you _do_ need to manually set the font here.
+                        icon.FontFamily(winrt::Windows::UI::Xaml::Media::FontFamily{ L"Segoe UI" });
+                    }
+                    icon.FontSize(12);
+                    icon.Glyph(iconPath);
+                    iconSource = icon;
+                }
+                CATCH_LOG();
+            }
+        }
+        if (!iconSource)
+        {
+            // Set the default IconSource to a BitmapIconSource with a null source
+            // (instead of just nullptr) because there's a really weird crash when swapping
+            // data bound IconSourceElements in a ListViewTemplate (i.e. CommandPalette).
+            // Swapping between nullptr IconSources and non-null IconSources causes a crash
+            // to occur, but swapping between IconSources with a null source and non-null IconSources
+            // work perfectly fine :shrug:.
+            BitmapIconSource<TIconSource>::type icon;
+            icon.UriSource(nullptr);
+            iconSource = icon;
+        }
+
+        return iconSource;
+    }
+
+    static winrt::hstring _expandIconPath(hstring iconPath)
+    {
+        if (iconPath.empty())
+        {
+            return iconPath;
+        }
+        winrt::hstring envExpandedPath{ wil::ExpandEnvironmentStringsW<std::wstring>(iconPath.c_str()) };
+        return envExpandedPath;
+    }
+
+    // Method Description:
+    // - Attempt to convert something into another type. For the
+    //   IconPathConverter, we support a variety of icons:
+    //    * If the icon is a path to an image, we'll use that.
+    //    * If it isn't, then we'll try and use the text as a FontIcon. If the
+    //      character is in the range of symbols reserved for the Segoe MDL2
+    //      Asserts, well treat it as such. Otherwise, we'll default to a Sego
+    //      UI icon, so things like emoji will work.
+    // - MUST BE CALLED ON THE UI THREAD.
+    // Arguments:
+    // - value: the input object to attempt to convert into an IconSource.
+    // Return Value:
+    // - Visible if the object was a string and wasn't the empty string.
+    Foundation::IInspectable IconPathConverter::Convert(Foundation::IInspectable const& value,
+                                                        Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
+                                                        Foundation::IInspectable const& /* parameter */,
+                                                        hstring const& /* language */)
+    {
+        const auto& iconPath = winrt::unbox_value_or<winrt::hstring>(value, L"");
+        return _getIconSource<Controls::IconSource>(iconPath);
+    }
+
+    // unused for one-way bindings
+    Foundation::IInspectable IconPathConverter::ConvertBack(Foundation::IInspectable const& /* value */,
+                                                            Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
+                                                            Foundation::IInspectable const& /* parameter */,
+                                                            hstring const& /* language */)
+    {
+        throw hresult_not_implemented();
+    }
+
+    Windows::UI::Xaml::Controls::IconSource IconPathConverter::IconSourceWUX(hstring path)
+    {
+        return _getIconSource<Windows::UI::Xaml::Controls::IconSource>(path);
+    }
+
+    Microsoft::UI::Xaml::Controls::IconSource IconPathConverter::IconSourceMUX(hstring path)
+    {
+        return _getIconSource<Microsoft::UI::Xaml::Controls::IconSource>(path);
+    }
+}
--- a/src/cascadia/TerminalApp/IconPathConverter.h
+++ b/src/cascadia/TerminalApp/IconPathConverter.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "IconPathConverter.g.h"
+#include "..\inc\cppwinrt_utils.h"
+
+namespace winrt::TerminalApp::implementation
+{
+    struct IconPathConverter : IconPathConverterT<IconPathConverter>
+    {
+        IconPathConverter() = default;
+
+        Windows::Foundation::IInspectable Convert(Windows::Foundation::IInspectable const& value,
+                                                  Windows::UI::Xaml::Interop::TypeName const& targetType,
+                                                  Windows::Foundation::IInspectable const& parameter,
+                                                  hstring const& language);
+
+        Windows::Foundation::IInspectable ConvertBack(Windows::Foundation::IInspectable const& value,
+                                                      Windows::UI::Xaml::Interop::TypeName const& targetType,
+                                                      Windows::Foundation::IInspectable const& parameter,
+                                                      hstring const& language);
+
+        static Windows::UI::Xaml::Controls::IconSource IconSourceWUX(hstring path);
+        static Microsoft::UI::Xaml::Controls::IconSource IconSourceMUX(hstring path);
+    };
+}
+
+namespace winrt::TerminalApp::factory_implementation
+{
+    BASIC_FACTORY(IconPathConverter);
+}
--- a/src/cascadia/TerminalApp/IconPathConverter.idl
+++ b/src/cascadia/TerminalApp/IconPathConverter.idl
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace TerminalApp
+{
+    // See https://docs.microsoft.com/en-us/windows/uwp/data-binding/data-binding-quickstart
+
+    // We use the default attribute to declare IValueConverter as the default
+    // interface. In the listing, IconPathConverter has only a
+    // constructor, and no methods, so no default interface is generated for it.
+    // The default attribute is optimal if you won't be adding instance members
+    // to IconPathConverter, because no QueryInterface will be
+    // required to call the IValueConverter methods
+    runtimeclass IconPathConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        IconPathConverter();
+
+        static Windows.UI.Xaml.Controls.IconSource IconSourceWUX(String path);
+        static Microsoft.UI.Xaml.Controls.IconSource IconSourceMUX(String path);
+    };
+
+}
--- a/src/cascadia/TerminalApp/Jumplist.cpp
+++ b/src/cascadia/TerminalApp/Jumplist.cpp
@@ -7,7 +7,7 @@
 #include <ShObjIdl.h>
 #include <Propkey.h>

-using namespace winrt::TerminalApp;
+using namespace winrt::Microsoft::Terminal::Settings::Model;

 //  This property key isn't already defined in propkey.h, but is used by UWP Jumplist to determine the icon of the jumplist item.
 //  IShellLink's SetIconLocation isn't going to read "ms-appx://" icon paths, so we'll need to use this to set the icon.
@@ -43,12 +43,13 @@ static constexpr bool _isProbableFilePath(std::wstring_view path)
 //   paths to have the "correct" slash direction.
 static std::wstring _normalizeIconPath(std::wstring_view path)
 {
-    if (_isProbableFilePath(path))
+    const auto fullPath{ wil::ExpandEnvironmentStringsW<std::wstring>(path.data()) };
+    if (_isProbableFilePath(fullPath))
    {
-        std::filesystem::path asPath{ path };
+        std::filesystem::path asPath{ fullPath };
        return asPath.make_preferred().wstring();
    }
-    return std::wstring{ path };
+    return std::wstring{ fullPath };
 }

 // Function Description:
@@ -117,13 +118,8 @@ static std::wstring_view _getExePath()
 // - settings - The settings object to update the jumplist with.
 // Return Value:
 // - <none>
-winrt::fire_and_forget Jumplist::UpdateJumplist(const CascadiaSettings& settings) noexcept
+HRESULT Jumplist::UpdateJumplist(const CascadiaSettings& settings) noexcept
 {
-    // make sure to capture the settings _before_ the co_await
-    const auto strongSettings = settings;
-
-    co_await winrt::resume_background();
-
    try
    {
        auto jumplistInstance = winrt::create_instance<ICustomDestinationList>(CLSID_DestinationList, CLSCTX_ALL);
@@ -135,10 +131,10 @@ winrt::fire_and_forget Jumplist::UpdateJumplist(const CascadiaSettings& settings

        // It's easier to clear the list and re-add everything. The settings aren't
        // updated often, and there likely isn't a huge amount of items to add.
-        THROW_IF_FAILED(jumplistItems->Clear());
+        RETURN_IF_FAILED(jumplistItems->Clear());

        // Update the list of profiles.
-        THROW_IF_FAILED(_updateProfiles(jumplistItems.get(), strongSettings.Profiles().GetView()));
+        RETURN_IF_FAILED(_updateProfiles(jumplistItems.get(), settings.Profiles().GetView()));

        // TODO GH#1571: Add items from the future customizable new tab dropdown as well.
        // This could either replace the default profiles, or be added alongside them.
@@ -146,11 +142,13 @@ winrt::fire_and_forget Jumplist::UpdateJumplist(const CascadiaSettings& settings
        // Add the items to the jumplist Task section.
        // The Tasks section is immutable by the user, unlike the destinations
        // section that can have its items pinned and removed.
-        THROW_IF_FAILED(jumplistInstance->AddUserTasks(jumplistItems.get()));
+        RETURN_IF_FAILED(jumplistInstance->AddUserTasks(jumplistItems.get()));

-        THROW_IF_FAILED(jumplistInstance->CommitList());
+        RETURN_IF_FAILED(jumplistInstance->CommitList());
+
+        return S_OK;
    }
-    CATCH_LOG();
+    CATCH_RETURN();
 }

 // Method Description:
@@ -160,7 +158,7 @@ winrt::fire_and_forget Jumplist::UpdateJumplist(const CascadiaSettings& settings
 // - profiles - The profiles to add to the jumplist
 // Return Value:
 // - S_OK or HRESULT failure code.
-[[nodiscard]] HRESULT Jumplist::_updateProfiles(IObjectCollection* jumplistItems, winrt::Windows::Foundation::Collections::IVectorView<winrt::TerminalApp::Profile> profiles) noexcept
+[[nodiscard]] HRESULT Jumplist::_updateProfiles(IObjectCollection* jumplistItems, winrt::Windows::Foundation::Collections::IVectorView<Profile> profiles) noexcept
 {
    try
    {
@@ -171,7 +169,7 @@ winrt::fire_and_forget Jumplist::UpdateJumplist(const CascadiaSettings& settings

            // Create the shell link object for the profile
            winrt::com_ptr<IShellLinkW> shLink;
-            const auto normalizedIconPath{ _normalizeIconPath(profile.ExpandedIconPath()) };
+            const auto normalizedIconPath{ _normalizeIconPath(profile.Icon()) };
            RETURN_IF_FAILED(_createShellLink(profile.Name(), normalizedIconPath, args, shLink.put()));

            RETURN_IF_FAILED(jumplistItems->AddObject(shLink.get()));
--- a/src/cascadia/TerminalApp/Jumplist.h
+++ b/src/cascadia/TerminalApp/Jumplist.h
@@ -12,17 +12,15 @@

 #pragma once

-#include "CascadiaSettings.h"
-
 struct IObjectCollection;
 struct IShellLinkW;

 class Jumplist
 {
 public:
-    static winrt::fire_and_forget UpdateJumplist(const winrt::TerminalApp::CascadiaSettings& settings) noexcept;
+    static HRESULT UpdateJumplist(const winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings& settings) noexcept;

 private:
-    [[nodiscard]] static HRESULT _updateProfiles(IObjectCollection* jumplistItems, winrt::Windows::Foundation::Collections::IVectorView<winrt::TerminalApp::Profile> profiles) noexcept;
+    [[nodiscard]] static HRESULT _updateProfiles(IObjectCollection* jumplistItems, winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Terminal::Settings::Model::Profile> profiles) noexcept;
    [[nodiscard]] static HRESULT _createShellLink(const std::wstring_view name, const std::wstring_view path, const std::wstring_view args, IShellLinkW** shLink) noexcept;
 };
--- a/src/cascadia/TerminalApp/KeyChordSerialization.h
+++ b/src/cascadia/TerminalApp/KeyChordSerialization.h
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-#include <winrt/Microsoft.Terminal.TerminalControl.h>
-
-class KeyChordSerialization final
-{
-public:
-    static winrt::Microsoft::Terminal::TerminalControl::KeyChord FromString(const winrt::hstring& str);
-    static winrt::hstring ToString(const winrt::Microsoft::Terminal::TerminalControl::KeyChord& chord);
-};
--- a/src/cascadia/TerminalApp/KeyMapping.h
+++ b/src/cascadia/TerminalApp/KeyMapping.h
@@ -1,77 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
- KeyMapping.h
-
-Abstract:
- A mapping of key chords to actions. Includes (de)serialization logic.
-
-Author(s):
- Carlos Zamora - September 2020
-
--*/
-
-#pragma once
-
-#include "KeyMapping.g.h"
-#include "ActionArgs.h"
-#include "..\inc\cppwinrt_utils.h"
-
-// fwdecl unittest classes
-namespace TerminalAppLocalTests
-{
-    class SettingsTests;
-    class KeyBindingsTests;
-    class TestUtils;
-}
-
-namespace winrt::TerminalApp::implementation
-{
-    struct KeyChordHash
-    {
-        std::size_t operator()(const winrt::Microsoft::Terminal::TerminalControl::KeyChord& key) const
-        {
-            std::hash<int32_t> keyHash;
-            std::hash<winrt::Microsoft::Terminal::TerminalControl::KeyModifiers> modifiersHash;
-            std::size_t hashedKey = keyHash(key.Vkey());
-            std::size_t hashedMods = modifiersHash(key.Modifiers());
-            return hashedKey ^ hashedMods;
-        }
-    };
-
-    struct KeyChordEquality
-    {
-        bool operator()(const winrt::Microsoft::Terminal::TerminalControl::KeyChord& lhs, const winrt::Microsoft::Terminal::TerminalControl::KeyChord& rhs) const
-        {
-            return lhs.Modifiers() == rhs.Modifiers() && lhs.Vkey() == rhs.Vkey();
-        }
-    };
-
-    struct KeyMapping : KeyMappingT<KeyMapping>
-    {
-        KeyMapping() = default;
-
-        TerminalApp::ActionAndArgs TryLookup(winrt::Microsoft::Terminal::TerminalControl::KeyChord const& chord) const;
-
-        void SetKeyBinding(TerminalApp::ActionAndArgs const& actionAndArgs,
-                           winrt::Microsoft::Terminal::TerminalControl::KeyChord const& chord);
-        void ClearKeyBinding(winrt::Microsoft::Terminal::TerminalControl::KeyChord const& chord);
-        Microsoft::Terminal::TerminalControl::KeyChord GetKeyBindingForAction(TerminalApp::ShortcutAction const& action);
-        Microsoft::Terminal::TerminalControl::KeyChord GetKeyBindingForActionWithArgs(TerminalApp::ActionAndArgs const& actionAndArgs);
-
-        static Windows::System::VirtualKeyModifiers ConvertVKModifiers(winrt::Microsoft::Terminal::TerminalControl::KeyModifiers modifiers);
-
-        // Defined in KeyMappingSerialization.cpp
-        std::vector<TerminalApp::SettingsLoadWarnings> LayerJson(const Json::Value& json);
-        Json::Value ToJson();
-
-    private:
-        std::unordered_map<winrt::Microsoft::Terminal::TerminalControl::KeyChord, TerminalApp::ActionAndArgs, KeyChordHash, KeyChordEquality> _keyShortcuts;
-
-        friend class TerminalAppLocalTests::SettingsTests;
-        friend class TerminalAppLocalTests::KeyBindingsTests;
-        friend class TerminalAppLocalTests::TestUtils;
-    };
-}
--- a/src/cascadia/TerminalApp/Pane.cpp
+++ b/src/cascadia/TerminalApp/Pane.cpp
@@ -3,15 +3,17 @@

 #include "pch.h"
 #include "Pane.h"
-#include "Profile.h"
 #include "AppLogic.h"

+#include <Mmsystem.h>
+
 using namespace winrt::Windows::Foundation;
 using namespace winrt::Windows::Graphics::Display;
 using namespace winrt::Windows::UI;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::UI::Xaml::Media;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
 using namespace winrt::TerminalApp;
@@ -21,6 +23,15 @@ static const int PaneBorderSize = 2;
 static const int CombinedPaneBorderSize = 2 * PaneBorderSize;
 static const float Half = 0.50f;

+// WARNING: Don't do this! This won't work
+//   Duration duration{ std::chrono::milliseconds{ 200 } };
+// Instead, make a duration from a TimeSpan from the time in millis
+//
+// 200ms was chosen because it's quick enough that it doesn't break your
+// flow, but not too quick to see
+static const int AnimationDurationInMilliseconds = 200;
+static const Duration AnimationDuration = DurationHelper::FromTimeSpan(winrt::Windows::Foundation::TimeSpan(std::chrono::milliseconds(AnimationDurationInMilliseconds)));
+
 winrt::Windows::UI::Xaml::Media::SolidColorBrush Pane::s_focusedBorderBrush = { nullptr };
 winrt::Windows::UI::Xaml::Media::SolidColorBrush Pane::s_unfocusedBorderBrush = { nullptr };

@@ -33,6 +44,7 @@ Pane::Pane(const GUID& profile, const TermControl& control, const bool lastFocus
    _border.Child(_control);

    _connectionStateChangedToken = _control.ConnectionStateChanged({ this, &Pane::_ControlConnectionStateChangedHandler });
+    _warningBellToken = _control.WarningBell({ this, &Pane::_ControlWarningBellHandler });

    // On the first Pane's creation, lookup resources we'll use to theme the
    // Pane, including the brushed to use for the focused/unfocused border
@@ -42,6 +54,10 @@ Pane::Pane(const GUID& profile, const TermControl& control, const bool lastFocus
        _SetupResources();
    }

+    // Use the unfocused border color as the pane background, so an actual color
+    // appears behind panes as we animate them sliding in.
+    _root.Background(s_unfocusedBorderBrush);
+
    // Register an event with the control to have it inform us when it gains focus.
    _gotFocusRevoker = control.GotFocus(winrt::auto_revoke, { this, &Pane::_ControlGotFocusHandler });

@@ -296,7 +312,8 @@ bool Pane::NavigateFocus(const Direction& direction)
 // - <none>
 // Return Value:
 // - <none>
-void Pane::_ControlConnectionStateChangedHandler(const TermControl& /*sender*/, const winrt::Windows::Foundation::IInspectable& /*args*/)
+void Pane::_ControlConnectionStateChangedHandler(const TermControl& /*sender*/,
+                                                 const winrt::Windows::Foundation::IInspectable& /*args*/)
 {
    std::unique_lock lock{ _createCloseLock };
    // It's possible that this event handler started being executed, then before
@@ -324,10 +341,35 @@ void Pane::_ControlConnectionStateChangedHandler(const TermControl& /*sender*/,
    if (paneProfile)
    {
        auto mode = paneProfile.CloseOnExit();
-        if ((mode == winrt::TerminalApp::CloseOnExitMode::Always) ||
-            (mode == winrt::TerminalApp::CloseOnExitMode::Graceful && newConnectionState == ConnectionState::Closed))
+        if ((mode == CloseOnExitMode::Always) ||
+            (mode == CloseOnExitMode::Graceful && newConnectionState == ConnectionState::Closed))
        {
-            _ClosedHandlers(nullptr, nullptr);
+            Close();
+        }
+    }
+}
+
+// Method Description:
+// - Plays a warning note when triggered by the BEL control character,
+//   using the sound configured for the "Critical Stop" system event.`
+//   This matches the behavior of the Windows Console host.
+// Arguments:
+// - <unused>
+void Pane::_ControlWarningBellHandler(const winrt::Windows::Foundation::IInspectable& /*sender*/,
+                                      const winrt::Windows::Foundation::IInspectable& /*eventArgs*/)
+{
+    if (!_IsLeaf())
+    {
+        return;
+    }
+    const auto settings{ winrt::TerminalApp::implementation::AppLogic::CurrentAppSettings() };
+    auto paneProfile = settings.FindProfile(_profile.value());
+    if (paneProfile)
+    {
+        if (paneProfile.BellStyle() == winrt::Microsoft::Terminal::Settings::Model::BellStyle::Audible)
+        {
+            const auto soundAlias = reinterpret_cast<LPCTSTR>(SND_ALIAS_SYSTEMHAND);
+            PlaySound(soundAlias, NULL, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
        }
    }
 }
@@ -612,6 +654,7 @@ void Pane::_CloseChild(const bool closeFirst)

        // Add our new event handler before revoking the old one.
        _connectionStateChangedToken = _control.ConnectionStateChanged({ this, &Pane::_ControlConnectionStateChangedHandler });
+        _warningBellToken = _control.WarningBell({ this, &Pane::_ControlWarningBellHandler });

        // Revoke the old event handlers. Remove both the handlers for the panes
        // themselves closing, and remove their handlers for their controls
@@ -621,6 +664,8 @@ void Pane::_CloseChild(const bool closeFirst)
        _secondChild->Closed(_secondClosedToken);
        closedChild->_control.ConnectionStateChanged(closedChild->_connectionStateChangedToken);
        remainingChild->_control.ConnectionStateChanged(remainingChild->_connectionStateChangedToken);
+        closedChild->_control.WarningBell(closedChild->_warningBellToken);
+        remainingChild->_control.WarningBell(remainingChild->_warningBellToken);

        // If either of our children was focused, we want to take that focus from
        // them.
@@ -657,16 +702,6 @@ void Pane::_CloseChild(const bool closeFirst)
        if (_lastActive)
        {
            _control.Focus(FocusState::Programmatic);
-
-            // See GH#7252
-            // Manually fire off the GotFocus event. Typically, this is done
-            // automatically when the control gets focused. However, if we're
-            // `exit`ing a zoomed pane, then the other sibling isn't in the UI
-            // tree currently. So the above call to Focus won't actually focus
-            // the control. Because Tab is relying on GotFocus to know who the
-            // active pane in the tree is, without this call, _no one_ will be
-            // the active pane any longer.
-            _GotFocusHandlers(shared_from_this());
        }

        _UpdateBorders();
@@ -711,6 +746,7 @@ void Pane::_CloseChild(const bool closeFirst)
        oldFirst->Closed(oldFirstToken);
        oldSecond->Closed(oldSecondToken);
        closedChild->_control.ConnectionStateChanged(closedChild->_connectionStateChangedToken);
+        closedChild->_control.WarningBell(closedChild->_warningBellToken);

        // Reset our UI:
        _root.Children().Clear();
@@ -771,7 +807,129 @@ winrt::fire_and_forget Pane::_CloseChildRoutine(const bool closeFirst)

    if (auto pane{ weakThis.get() })
    {
-        _CloseChild(closeFirst);
+        // This will query if animations are enabled via the "Show animations in
+        // Windows" setting in the OS
+        winrt::Windows::UI::ViewManagement::UISettings uiSettings;
+        const auto animationsEnabledInOS = uiSettings.AnimationsEnabled();
+        const auto animationsEnabledInApp = Media::Animation::Timeline::AllowDependentAnimations();
+
+        // If animations are disabled, just skip this and go straight to
+        // _CloseChild. Curiously, the pane opening animation doesn't need this,
+        // and will skip straight to Completed when animations are disabled, but
+        // this one doesn't seem to.
+        if (!animationsEnabledInOS || !animationsEnabledInApp)
+        {
+            pane->_CloseChild(closeFirst);
+            co_return;
+        }
+
+        // Setup the animation
+
+        auto removedChild = closeFirst ? _firstChild : _secondChild;
+        auto remainingChild = closeFirst ? _secondChild : _firstChild;
+        const bool splitWidth = _splitState == SplitState::Vertical;
+        const auto totalSize = splitWidth ? _root.ActualWidth() : _root.ActualHeight();
+
+        Size removedOriginalSize{
+            ::base::saturated_cast<float>(removedChild->_root.ActualWidth()),
+            ::base::saturated_cast<float>(removedChild->_root.ActualHeight())
+        };
+        Size remainingOriginalSize{
+            ::base::saturated_cast<float>(remainingChild->_root.ActualWidth()),
+            ::base::saturated_cast<float>(remainingChild->_root.ActualHeight())
+        };
+
+        // Remove both children from the grid
+        _root.Children().Clear();
+        // Add the remaining child back to the grid, in the right place.
+        _root.Children().Append(remainingChild->GetRootElement());
+        if (_splitState == SplitState::Vertical)
+        {
+            Controls::Grid::SetColumn(remainingChild->GetRootElement(), closeFirst ? 1 : 0);
+        }
+        else if (_splitState == SplitState::Horizontal)
+        {
+            Controls::Grid::SetRow(remainingChild->GetRootElement(), closeFirst ? 1 : 0);
+        }
+
+        // Create the dummy grid. This grid will be the one we actually animate,
+        // in the place of the closed pane.
+        Controls::Grid dummyGrid;
+        dummyGrid.Background(s_unfocusedBorderBrush);
+        // It should be the size of the closed pane.
+        dummyGrid.Width(removedOriginalSize.Width);
+        dummyGrid.Height(removedOriginalSize.Height);
+        // Put it where the removed child is
+        if (_splitState == SplitState::Vertical)
+        {
+            Controls::Grid::SetColumn(dummyGrid, closeFirst ? 0 : 1);
+        }
+        else if (_splitState == SplitState::Horizontal)
+        {
+            Controls::Grid::SetRow(dummyGrid, closeFirst ? 0 : 1);
+        }
+        // Add it to the tree
+        _root.Children().Append(dummyGrid);
+
+        // Set up the rows/cols as auto/auto, so they'll only use the size of
+        // the elements in the grid.
+        //
+        // * For the closed pane, we want to make that row/col "auto" sized, so
+        //   it takes up as much space as is available.
+        // * For the remaining pane, we'll make that row/col "*" sized, so it
+        //   takes all the remaining space. As the dummy grid is resized down,
+        //   the remaining pane will expand to take the rest of the space.
+        _root.ColumnDefinitions().Clear();
+        _root.RowDefinitions().Clear();
+        if (_splitState == SplitState::Vertical)
+        {
+            auto firstColDef = Controls::ColumnDefinition();
+            auto secondColDef = Controls::ColumnDefinition();
+            firstColDef.Width(!closeFirst ? GridLengthHelper::FromValueAndType(1, GridUnitType::Star) : GridLengthHelper::Auto());
+            secondColDef.Width(closeFirst ? GridLengthHelper::FromValueAndType(1, GridUnitType::Star) : GridLengthHelper::Auto());
+            _root.ColumnDefinitions().Append(firstColDef);
+            _root.ColumnDefinitions().Append(secondColDef);
+        }
+        else if (_splitState == SplitState::Horizontal)
+        {
+            auto firstRowDef = Controls::RowDefinition();
+            auto secondRowDef = Controls::RowDefinition();
+            firstRowDef.Height(!closeFirst ? GridLengthHelper::FromValueAndType(1, GridUnitType::Star) : GridLengthHelper::Auto());
+            secondRowDef.Height(closeFirst ? GridLengthHelper::FromValueAndType(1, GridUnitType::Star) : GridLengthHelper::Auto());
+            _root.RowDefinitions().Append(firstRowDef);
+            _root.RowDefinitions().Append(secondRowDef);
+        }
+
+        // Animate the dummy grid from its current size down to 0
+        Media::Animation::DoubleAnimation animation{};
+        animation.Duration(AnimationDuration);
+        animation.From(splitWidth ? removedOriginalSize.Width : removedOriginalSize.Height);
+        animation.To(0.0);
+        // This easing is the same as the entrance animation.
+        animation.EasingFunction(Media::Animation::QuadraticEase{});
+        animation.EnableDependentAnimation(true);
+
+        Media::Animation::Storyboard s;
+        s.Duration(AnimationDuration);
+        s.Children().Append(animation);
+        s.SetTarget(animation, dummyGrid);
+        s.SetTargetProperty(animation, splitWidth ? L"Width" : L"Height");
+
+        // Start the animation.
+        s.Begin();
+
+        std::weak_ptr<Pane> weakThis{ shared_from_this() };
+
+        // When the animation is completed, reparent the child's content up to
+        // us, and remove the child nodes from the tree.
+        animation.Completed([weakThis, closeFirst](auto&&, auto&&) {
+            if (auto pane{ weakThis.lock() })
+            {
+                // We don't need to manually undo any of the above trickiness.
+                // We're going to re-parent the child's content into us anyways
+                pane->_CloseChild(closeFirst);
+            }
+        });
    }
 }

@@ -913,6 +1071,140 @@ void Pane::_ApplySplitDefinitions()
    }
 }

+// Method Description:
+// - Create a pair of animations when a new control enters this pane. This
+//   should _ONLY_ be called in _Split, AFTER the first and second child panes
+//   have been set up.
+void Pane::_SetupEntranceAnimation()
+{
+    // This will query if animations are enabled via the "Show animations in
+    // Windows" setting in the OS
+    winrt::Windows::UI::ViewManagement::UISettings uiSettings;
+    const auto animationsEnabledInOS = uiSettings.AnimationsEnabled();
+
+    const bool splitWidth = _splitState == SplitState::Vertical;
+    const auto totalSize = splitWidth ? _root.ActualWidth() : _root.ActualHeight();
+    // If we don't have a size yet, it's likely that we're in startup, or we're
+    // being executed as a sequence of actions. In that case, just skip the
+    // animation.
+    if (totalSize <= 0 || !animationsEnabledInOS)
+    {
+        return;
+    }
+
+    const auto [firstSize, secondSize] = _CalcChildrenSizes(::base::saturated_cast<float>(totalSize));
+
+    // This is safe to capture this, because it's only being called in the
+    // context of this method (not on another thread)
+    auto setupAnimation = [&](const auto& size, const bool isFirstChild) {
+        auto child = isFirstChild ? _firstChild : _secondChild;
+        auto childGrid = child->_root;
+        auto control = child->_control;
+        // Build up our animation:
+        // * it'll take as long as our duration (200ms)
+        // * it'll change the value of our property from 0 to secondSize
+        // * it'll animate that value using a quadratic function (like f(t) = t^2)
+        // * IMPORTANT! We'll manually tell the animation that "yes we know what
+        //   we're doing, we want an animation here."
+        Media::Animation::DoubleAnimation animation{};
+        animation.Duration(AnimationDuration);
+        if (isFirstChild)
+        {
+            // If we're animating the first pane, the size should decrease, from
+            // the full size down to the given size.
+            animation.From(totalSize);
+            animation.To(size);
+        }
+        else
+        {
+            // Otherwise, we want to show the pane getting larger, so animate
+            // from 0 to the requested size.
+            animation.From(0.0);
+            animation.To(size);
+        }
+        animation.EasingFunction(Media::Animation::QuadraticEase{});
+        animation.EnableDependentAnimation(true);
+
+        // Now we're going to set up the Storyboard. This is a unit that uses the
+        // Animation from above, and actually applies it to a property.
+        // * we'll set it up for the same duration as the animation we have
+        // * Apply the animation to the grid of the new pane we're adding to the tree.
+        // * apply the animation to the Width or Height property.
+        Media::Animation::Storyboard s;
+        s.Duration(AnimationDuration);
+        s.Children().Append(animation);
+        s.SetTarget(animation, childGrid);
+        s.SetTargetProperty(animation, splitWidth ? L"Width" : L"Height");
+
+        // BE TRICKY:
+        // We're animating the width or height of our child pane's grid.
+        //
+        // We DON'T want to change the size of the control itself, because the
+        // terminal has to reflow the buffer every time the control changes size. So
+        // what we're going to do there is manually set the control's size to how
+        // big we _actually know_ the control will be.
+        //
+        // We're also going to be changing alignment of our child pane and the
+        // control. This way, we'll be able to have the control stick to the inside
+        // of the child pane's grid (the side that's moving), while we also have the
+        // pane's grid stick to "outside" of the grid (the side that's not moving)
+        if (splitWidth)
+        {
+            // If we're animating the first child, then stick to the top/left of
+            // the parent pane, otherwise use the bottom/right. This is always
+            // the "outside" of the parent pane.
+            childGrid.HorizontalAlignment(isFirstChild ? HorizontalAlignment::Left : HorizontalAlignment::Right);
+            control.HorizontalAlignment(HorizontalAlignment::Left);
+            control.Width(isFirstChild ? totalSize : size);
+        }
+        else
+        {
+            // If we're animating the first child, then stick to the top/left of
+            // the parent pane, otherwise use the bottom/right. This is always
+            // the "outside" of the parent pane.
+            childGrid.VerticalAlignment(isFirstChild ? VerticalAlignment::Top : VerticalAlignment::Bottom);
+            control.VerticalAlignment(VerticalAlignment::Top);
+            control.Height(isFirstChild ? totalSize : size);
+        }
+
+        // Start the animation.
+        s.Begin();
+
+        std::weak_ptr<Pane> weakThis{ shared_from_this() };
+        // When the animation is completed, undo the trickiness from before, to
+        // restore the controls to the behavior they'd usually have.
+        animation.Completed([weakThis, isFirstChild, splitWidth](auto&&, auto&&) {
+            if (auto pane{ weakThis.lock() })
+            {
+                auto child = isFirstChild ? pane->_firstChild : pane->_secondChild;
+                auto childGrid = child->_root;
+                if (auto control = child->_control)
+                {
+                    if (splitWidth)
+                    {
+                        control.Width(NAN);
+                        childGrid.Width(NAN);
+                        childGrid.HorizontalAlignment(HorizontalAlignment::Stretch);
+                        control.HorizontalAlignment(HorizontalAlignment::Stretch);
+                    }
+                    else
+                    {
+                        control.Height(NAN);
+                        childGrid.Height(NAN);
+                        childGrid.VerticalAlignment(VerticalAlignment::Stretch);
+                        control.VerticalAlignment(VerticalAlignment::Stretch);
+                    }
+                }
+            }
+        });
+    };
+
+    // TODO: GH#7365 - animating the first child right now doesn't _really_ do
+    // anything. We could do better though.
+    setupAnimation(firstSize, true);
+    setupAnimation(secondSize, false);
+}
+
 // Method Description:
 // - Determines whether the pane can be split
 // Arguments:
@@ -1153,6 +1445,8 @@ std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Pane::_Split(SplitState
    // revoke our handler - the child will take care of the control now.
    _control.ConnectionStateChanged(_connectionStateChangedToken);
    _connectionStateChangedToken.value = 0;
+    _control.WarningBell(_warningBellToken);
+    _warningBellToken.value = 0;

    // Remove our old GotFocus handler from the control. We don't what the
    // control telling us that it's now focused, we want it telling its new
@@ -1187,6 +1481,8 @@ std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Pane::_Split(SplitState

    _lastActive = false;

+    _SetupEntranceAnimation();
+
    return { _firstChild, _secondChild };
 }

@@ -1722,8 +2018,8 @@ int Pane::GetLeafPaneCount() const noexcept
 // - nullopt if `target` is not this pane or a child of this pane, otherwise the
 //   SplitState that `target` would use for an `Automatic` split given
 //   `availableSpace`
-std::optional<winrt::TerminalApp::SplitState> Pane::PreCalculateAutoSplit(const std::shared_ptr<Pane> target,
-                                                                          const winrt::Windows::Foundation::Size availableSpace) const
+std::optional<SplitState> Pane::PreCalculateAutoSplit(const std::shared_ptr<Pane> target,
+                                                      const winrt::Windows::Foundation::Size availableSpace) const
 {
    if (_IsLeaf())
    {
--- a/src/cascadia/TerminalApp/Pane.h
+++ b/src/cascadia/TerminalApp/Pane.h
@@ -55,17 +55,17 @@ public:
                        const GUID& profile);
    void ResizeContent(const winrt::Windows::Foundation::Size& newSize);
    void Relayout();
-    bool ResizePane(const winrt::TerminalApp::Direction& direction);
-    bool NavigateFocus(const winrt::TerminalApp::Direction& direction);
+    bool ResizePane(const winrt::Microsoft::Terminal::Settings::Model::Direction& direction);
+    bool NavigateFocus(const winrt::Microsoft::Terminal::Settings::Model::Direction& direction);

-    bool CanSplit(winrt::TerminalApp::SplitState splitType);
-    std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Split(winrt::TerminalApp::SplitState splitType,
+    bool CanSplit(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType);
+    std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Split(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType,
                                                                  const GUID& profile,
                                                                  const winrt::Microsoft::Terminal::TerminalControl::TermControl& control);
    float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;
-    std::optional<winrt::TerminalApp::SplitState> PreCalculateAutoSplit(const std::shared_ptr<Pane> target, const winrt::Windows::Foundation::Size parentSize) const;
+    std::optional<winrt::Microsoft::Terminal::Settings::Model::SplitState> PreCalculateAutoSplit(const std::shared_ptr<Pane> target, const winrt::Windows::Foundation::Size parentSize) const;
    std::optional<bool> PreCalculateCanSplit(const std::shared_ptr<Pane> target,
-                                             winrt::TerminalApp::SplitState splitType,
+                                             winrt::Microsoft::Terminal::Settings::Model::SplitState splitType,
                                             const winrt::Windows::Foundation::Size availableSpace) const;
    void Shutdown();
    void Close();
@@ -91,7 +91,7 @@ private:

    std::shared_ptr<Pane> _firstChild{ nullptr };
    std::shared_ptr<Pane> _secondChild{ nullptr };
-    winrt::TerminalApp::SplitState _splitState{ winrt::TerminalApp::SplitState::None };
+    winrt::Microsoft::Terminal::Settings::Model::SplitState _splitState{ winrt::Microsoft::Terminal::Settings::Model::SplitState::None };
    float _desiredSplitPosition;

    bool _lastActive{ false };
@@ -99,6 +99,7 @@ private:
    winrt::event_token _connectionStateChangedToken{ 0 };
    winrt::event_token _firstClosedToken{ 0 };
    winrt::event_token _secondClosedToken{ 0 };
+    winrt::event_token _warningBellToken{ 0 };

    winrt::Windows::UI::Xaml::UIElement::GotFocus_revoker _gotFocusRevoker;

@@ -112,23 +113,26 @@ private:
    bool _HasFocusedChild() const noexcept;
    void _SetupChildCloseHandlers();

-    bool _CanSplit(winrt::TerminalApp::SplitState splitType);
-    std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> _Split(winrt::TerminalApp::SplitState splitType,
+    bool _CanSplit(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType);
+    std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> _Split(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType,
                                                                   const GUID& profile,
                                                                   const winrt::Microsoft::Terminal::TerminalControl::TermControl& control);

    void _CreateRowColDefinitions();
    void _ApplySplitDefinitions();
+    void _SetupEntranceAnimation();
    void _UpdateBorders();

-    bool _Resize(const winrt::TerminalApp::Direction& direction);
-    bool _NavigateFocus(const winrt::TerminalApp::Direction& direction);
+    bool _Resize(const winrt::Microsoft::Terminal::Settings::Model::Direction& direction);
+    bool _NavigateFocus(const winrt::Microsoft::Terminal::Settings::Model::Direction& direction);

    void _CloseChild(const bool closeFirst);
    winrt::fire_and_forget _CloseChildRoutine(const bool closeFirst);

    void _FocusFirstChild();
    void _ControlConnectionStateChangedHandler(const winrt::Microsoft::Terminal::TerminalControl::TermControl& sender, const winrt::Windows::Foundation::IInspectable& /*args*/);
+    void _ControlWarningBellHandler(winrt::Windows::Foundation::IInspectable const& sender,
+                                    winrt::Windows::Foundation::IInspectable const& e);
    void _ControlGotFocusHandler(winrt::Windows::Foundation::IInspectable const& sender,
                                 winrt::Windows::UI::Xaml::RoutedEventArgs const& e);

@@ -141,9 +145,9 @@ private:
    LayoutSizeNode _CreateMinSizeTree(const bool widthOrHeight) const;
    float _ClampSplitPosition(const bool widthOrHeight, const float requestedValue, const float totalSize) const;

-    winrt::TerminalApp::SplitState _convertAutomaticSplitState(const winrt::TerminalApp::SplitState& splitType) const;
+    winrt::Microsoft::Terminal::Settings::Model::SplitState _convertAutomaticSplitState(const winrt::Microsoft::Terminal::Settings::Model::SplitState& splitType) const;

-    std::optional<winrt::TerminalApp::SplitState> _preCalculateAutoSplit(const std::shared_ptr<Pane> target, const winrt::Windows::Foundation::Size parentSize) const;
+    std::optional<winrt::Microsoft::Terminal::Settings::Model::SplitState> _preCalculateAutoSplit(const std::shared_ptr<Pane> target, const winrt::Windows::Foundation::Size parentSize) const;

    // Function Description:
    // - Returns true if the given direction can be used with the given split
@@ -159,22 +163,22 @@ private:
    // Return Value:
    // - true iff the direction is perpendicular to the splitType. False for
    //   winrt::TerminalApp::SplitState::None.
-    static constexpr bool DirectionMatchesSplit(const winrt::TerminalApp::Direction& direction,
-                                                const winrt::TerminalApp::SplitState& splitType)
+    static constexpr bool DirectionMatchesSplit(const winrt::Microsoft::Terminal::Settings::Model::Direction& direction,
+                                                const winrt::Microsoft::Terminal::Settings::Model::SplitState& splitType)
    {
-        if (splitType == winrt::TerminalApp::SplitState::None)
+        if (splitType == winrt::Microsoft::Terminal::Settings::Model::SplitState::None)
        {
            return false;
        }
-        else if (splitType == winrt::TerminalApp::SplitState::Horizontal)
+        else if (splitType == winrt::Microsoft::Terminal::Settings::Model::SplitState::Horizontal)
        {
-            return direction == winrt::TerminalApp::Direction::Up ||
-                   direction == winrt::TerminalApp::Direction::Down;
+            return direction == winrt::Microsoft::Terminal::Settings::Model::Direction::Up ||
+                   direction == winrt::Microsoft::Terminal::Settings::Model::Direction::Down;
        }
-        else if (splitType == winrt::TerminalApp::SplitState::Vertical)
+        else if (splitType == winrt::Microsoft::Terminal::Settings::Model::SplitState::Vertical)
        {
-            return direction == winrt::TerminalApp::Direction::Left ||
-                   direction == winrt::TerminalApp::Direction::Right;
+            return direction == winrt::Microsoft::Terminal::Settings::Model::Direction::Left ||
+                   direction == winrt::Microsoft::Terminal::Settings::Model::Direction::Right;
        }
        return false;
    }
--- a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
    associated with the data types.
-
+    
    Example:
-
+    
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
    read any of the formats listed below.
-
+    
    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
-
+    
    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
@@ -149,16 +149,6 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>Encountered errors while loading user settings</value>
  </data>
-  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
-    <value>Warning:</value>
-  </data>
-  <data name="KeyboardServiceWarningText" xml:space="preserve">
-    <value>The "{0}" isn't running on your machine. This can prevent the Terminal from receiving keyboard input.</value>
-    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
-  </data>
  <data name="Ok" xml:space="preserve">
    <value>OK</value>
  </data>
@@ -187,8 +177,17 @@
  <data name="CloseWindowWarningTitle" xml:space="preserve">
    <value>Do you want to close all tabs?</value>
  </data>
+  <data name="TabCloseSubMenu" xml:space="preserve">
+    <value>Close...</value>
+  </data>
+  <data name="TabCloseAfter" xml:space="preserve">
+    <value>Close Tabs to the Right</value>
+  </data>
+  <data name="TabCloseOther" xml:space="preserve">
+    <value>Close Other Tabs</value>
+  </data>
  <data name="TabClose" xml:space="preserve">
-    <value>Close</value>
+    <value>Close Tab</value>
  </data>
  <data name="TabColorChoose" xml:space="preserve">
    <value>Color...</value>
@@ -295,6 +294,9 @@
  <data name="CmdFullscreenDesc" xml:space="preserve">
    <value>Launch the window in fullscreen mode</value>
  </data>
+  <data name="CmdFocusDesc" xml:space="preserve">
+    <value>Launch the window in focus mode</value>
+  </data>
  <data name="NewTabSplitButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.HelpText" xml:space="preserve">
    <value>Press the button to open a new terminal tab with your default profile. Open the flyout to select which profile you want to open.</value>
  </data>
@@ -355,14 +357,6 @@
    <value>Third-Party Notices</value>
    <comment>A hyperlink name for the Terminal's third-party notices</comment>
  </data>
-  <data name="ApplicationDisplayNameUnpackaged" xml:space="preserve">
-    <value>Windows Terminal (Unpackaged)</value>
-    <comment>This display name is used when the application's name cannot be determined</comment>
-  </data>
-  <data name="ApplicationVersionUnknown" xml:space="preserve">
-    <value>Unknown</value>
-    <comment>This is displayed when the version of the application cannot be determined</comment>
-  </data>
  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
    <value>Cancel</value>
  </data>
@@ -372,10 +366,6 @@
  <data name="CloseAllDialog.Title" xml:space="preserve">
    <value>Do you want to close all tabs?</value>
  </data>
-  <data name="CommandPromptDisplayName" xml:space="preserve">
-    <value>Command Prompt</value>
-    <comment>This is the name of "Command Prompt", as localized in Windows. The localization here should match the one in the Windows product for "Command Prompt"</comment>
-  </data>
  <data name="LargePasteDialog.CloseButtonText" xml:space="preserve">
    <value>Cancel</value>
  </data>
@@ -406,198 +396,9 @@
  <data name="CommandPalette_NoMatchesText.Text" xml:space="preserve">
    <value>No matching commands</value>
  </data>
-  <data name="CloseWindowCommandKey" xml:space="preserve">
-    <value>Close window</value>
-  </data>
-  <data name="ToggleFocusModeCommandKey" xml:space="preserve">
-    <value>Toggle focus mode</value>
-    <comment>"Focus mode" is a mode with minimal UI elements, for a distraction-free experience</comment>
-  </data>
-  <data name="ToggleFullscreenCommandKey" xml:space="preserve">
-    <value>Toggle fullscreen</value>
-  </data>
-  <data name="ToggleAlwaysOnTopCommandKey" xml:space="preserve">
-    <value>Toggle always on top mode</value>
-  </data>
-  <data name="OpenNewTabDropdownCommandKey" xml:space="preserve">
-    <value>Open new tab dropdown</value>
-  </data>
-  <data name="OpenSettingsCommandKey" xml:space="preserve">
-    <value>Open settings file</value>
-  </data>
-  <data name="OpenDefaultSettingsCommandKey" xml:space="preserve">
-    <value>Open default settings file</value>
-  </data>
-  <data name="OpenBothSettingsFilesCommandKey" xml:space="preserve">
-    <value>Open both settings and default settings files</value>
-  </data>
-  <data name="FindCommandKey" xml:space="preserve">
-    <value>Find</value>
-  </data>
-  <data name="ResizePaneCommandKey" xml:space="preserve">
-    <value>Resize pane</value>
-  </data>
-  <data name="MoveFocusCommandKey" xml:space="preserve">
-    <value>Move focus</value>
-  </data>
-  <data name="MoveFocusWithArgCommandKey" xml:space="preserve">
-    <value>Move focus {0}</value>
-    <comment>{0} will be replaced with one of the four directions "DirectionLeft", "DirectionRight", "DirectionUp", or "DirectionDown"</comment>
-  </data>
-  <data name="ResizePaneWithArgCommandKey" xml:space="preserve">
-    <value>Resize pane {0}</value>
-    <comment>{0} will be replaced with one of the four directions "DirectionLeft", "DirectionRight", "DirectionUp", or "DirectionDown"</comment>
-  </data>
-  <data name="DirectionLeft" xml:space="preserve">
-    <value>left</value>
-  </data>
-  <data name="DirectionRight" xml:space="preserve">
-    <value>right</value>
-  </data>
-  <data name="DirectionUp" xml:space="preserve">
-    <value>up</value>
-  </data>
-  <data name="DirectionDown" xml:space="preserve">
-    <value>down</value>
-  </data>
-  <data name="SwitchToTabCommandKey" xml:space="preserve">
-    <value>Switch to tab</value>
-  </data>
-  <data name="NewTabCommandKey" xml:space="preserve">
-    <value>New tab</value>
-  </data>
-  <data name="SendInputCommandKey" xml:space="preserve">
-    <value>Send Input: "{0}"</value>
-    <comment>{0} will be replaced with a string of input as defined by the user</comment>
-  </data>
-  <data name="SplitPaneCommandKey" xml:space="preserve">
-    <value>Split pane</value>
-  </data>
-  <data name="TogglePaneZoomCommandKey" xml:space="preserve">
-    <value>Toggle pane zoom</value>
-  </data>
-  <data name="NewWindowCommandKey" xml:space="preserve">
-    <value>New window</value>
-  </data>
-  <data name="DuplicateTabCommandKey" xml:space="preserve">
-    <value>Duplicate tab</value>
-  </data>
-  <data name="DuplicatePaneCommandKey" xml:space="preserve">
-    <value>Duplicate pane</value>
-  </data>
-  <data name="NextTabCommandKey" xml:space="preserve">
-    <value>Next tab</value>
-  </data>
-  <data name="PrevTabCommandKey" xml:space="preserve">
-    <value>Previous tab</value>
-  </data>
-  <data name="ClosePaneCommandKey" xml:space="preserve">
-    <value>Close pane</value>
-  </data>
-  <data name="CloseTabCommandKey" xml:space="preserve">
-    <value>Close tab</value>
-  </data>
-  <data name="SplitHorizontalCommandKey" xml:space="preserve">
-    <value>Split pane horizontally</value>
-  </data>
-  <data name="SplitVerticalCommandKey" xml:space="preserve">
-    <value>Split pane vertically</value>
-  </data>
-  <data name="CopyTextCommandKey" xml:space="preserve">
-    <value>Copy text</value>
-  </data>
-  <data name="CopyTextAsSingleLineCommandKey" xml:space="preserve">
-    <value>Copy text as a single line</value>
-  </data>
-  <data name="PasteTextCommandKey" xml:space="preserve">
-    <value>Paste</value>
-  </data>
-  <data name="ScrollDownCommandKey" xml:space="preserve">
-    <value>Scroll down one line</value>
-  </data>
-  <data name="ScrollDownPageCommandKey" xml:space="preserve">
-    <value>Scroll down one page</value>
-  </data>
-  <data name="ScrollUpCommandKey" xml:space="preserve">
-    <value>Scroll up one line</value>
-  </data>
-  <data name="ScrollUpPageCommandKey" xml:space="preserve">
-    <value>Scroll up one page</value>
-  </data>
-  <data name="AdjustFontSizeCommandKey" xml:space="preserve">
-    <value>Adjust font size</value>
-  </data>
-  <data name="IncreaseFontSizeCommandKey" xml:space="preserve">
-    <value>Increase font size</value>
-  </data>
-  <data name="DecreaseFontSizeCommandKey" xml:space="preserve">
-    <value>Decrease font size</value>
-  </data>
-  <data name="IncreaseFontSizeWithAmountCommandKey" xml:space="preserve">
-    <value>Increase font size, amount: {0}</value>
-    <comment>{0} will be replaced with a positive number</comment>
-  </data>
-  <data name="DecreaseFontSizeWithAmountCommandKey" xml:space="preserve">
-    <value>Decrease font size, amount: {0}</value>
-    <comment>{0} will be replaced with a positive number</comment>
-  </data>
-  <data name="ResetFontSizeCommandKey" xml:space="preserve">
-    <value>Reset font size</value>
-  </data>
-  <data name="ToggleRetroEffectCommandKey" xml:space="preserve">
-    <value>Toggle retro terminal effect</value>
-  </data>
-  <data name="ToggleCommandPaletteCommandKey" xml:space="preserve">
-    <value>Toggle command palette</value>
-  </data>
  <data name="CommandPaletteControlName" xml:space="preserve">
    <value>Command Palette</value>
  </data>
-  <data name="SetColorSchemeCommandKey" xml:space="preserve">
-    <value>Set color scheme to {0}</value>
-    <comment>{0} will be replaced with the name of a color scheme as defined by the user.</comment>
-  </data>
-  <data name="SetTabColorCommandKey" xml:space="preserve">
-    <value>Set tab color to {0}</value>
-    <comment>{0} will be replaced with a color, displayed in hexadecimal (#RRGGBB) notation.</comment>
-  </data>
-  <data name="ResetTabColorCommandKey" xml:space="preserve">
-    <value>Reset tab color</value>
-  </data>
-  <data name="OpenTabColorPickerCommandKey" xml:space="preserve">
-    <value>Set the tab color...</value>
-  </data>
-  <data name="RenameTabCommandKey" xml:space="preserve">
-    <value>Rename tab to "{0}"</value>
-    <comment>{0} will be replaced with a user-defined string</comment>
-  </data>
-  <data name="ResetTabNameCommandKey" xml:space="preserve">
-    <value>Reset tab title</value>
-  </data>
-  <data name="ExecuteCommandlineCommandKey" xml:space="preserve">
-    <value>Run commandline "{0}" in this window</value>
-    <comment>{0} will be replaced with a user-defined commandline</comment>
-  </data>
-  <data name="CloseOtherTabsCommandKey" xml:space="preserve">
-    <value>Close tabs other than index {0}</value>
-    <comment>{0} will be replaced with a number</comment>
-  </data>
-  <data name="CloseTabsAfterCommandKey" xml:space="preserve">
-    <value>Close tabs after index {0}</value>
-    <comment>{0} will be replaced with a number</comment>
-  </data>
-  <data name="SetColorSchemeParentCommandName" xml:space="preserve">
-    <value>Select color scheme...</value>
-  </data>
-  <data name="TabSearchCommandKey" xml:space="preserve">
-    <value>Search for tab...</value>
-  </data>
-  <data name="NewTabParentCommandName" xml:space="preserve">
-    <value>New Tab...</value>
-  </data>
-  <data name="SplitPaneParentCommandName" xml:space="preserve">
-    <value>Split Pane...</value>
-  </data>
  <data name="TabSwitcherControlName" xml:space="preserve">
    <value>Tab Switcher</value>
  </data>
@@ -659,12 +460,6 @@
  <data name="DarkGrayColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Dark Gray</value>
  </data>
-  <data name="CloseOtherTabsDefaultCommandKey" xml:space="preserve">
-    <value>Close all other tabs</value>
-  </data>
-  <data name="CloseTabsAfterDefaultCommandKey" xml:space="preserve">
-    <value>Close all tabs after the current tab</value>
-  </data>
  <data name="InvalidUriText" xml:space="preserve">
    <value>This link is invalid:</value>
  </data>
@@ -674,7 +469,4 @@
  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
    <value>Cancel</value>
  </data>
-  <data name="FailedToWriteToSettings" xml:space="preserve">
-    <value>We could not write to your settings file. Check the permissions on that file to ensure that the read-only flag is not set and that write access is granted.</value>
-  </data>
 </root>
--- a/src/cascadia/TerminalApp/ShortcutActionDispatch.cpp
+++ b/src/cascadia/TerminalApp/ShortcutActionDispatch.cpp
@@ -7,6 +7,7 @@
 #include "ShortcutActionDispatch.g.cpp"

 using namespace winrt::Microsoft::Terminal;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::TerminalApp;

 namespace winrt::TerminalApp::implementation
@@ -23,99 +24,99 @@ namespace winrt::TerminalApp::implementation
    {
        const auto& action = actionAndArgs.Action();
        const auto& args = actionAndArgs.Args();
-        auto eventArgs = args ? winrt::make_self<ActionEventArgs>(args) :
-                                winrt::make_self<ActionEventArgs>();
+        auto eventArgs = args ? ActionEventArgs{ args } :
+                                ActionEventArgs{};

        switch (action)
        {
        case ShortcutAction::CopyText:
        {
-            _CopyTextHandlers(*this, *eventArgs);
+            _CopyTextHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::PasteText:
        {
-            _PasteTextHandlers(*this, *eventArgs);
+            _PasteTextHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::OpenNewTabDropdown:
        {
-            _OpenNewTabDropdownHandlers(*this, *eventArgs);
+            _OpenNewTabDropdownHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::DuplicateTab:
        {
-            _DuplicateTabHandlers(*this, *eventArgs);
+            _DuplicateTabHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::OpenSettings:
        {
-            _OpenSettingsHandlers(*this, *eventArgs);
+            _OpenSettingsHandlers(*this, eventArgs);
            break;
        }

        case ShortcutAction::NewTab:
        {
-            _NewTabHandlers(*this, *eventArgs);
+            _NewTabHandlers(*this, eventArgs);
            break;
        }

        case ShortcutAction::NewWindow:
        {
-            _NewWindowHandlers(*this, *eventArgs);
+            _NewWindowHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::CloseWindow:
        {
-            _CloseWindowHandlers(*this, *eventArgs);
+            _CloseWindowHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::CloseTab:
        {
-            _CloseTabHandlers(*this, *eventArgs);
+            _CloseTabHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::ClosePane:
        {
-            _ClosePaneHandlers(*this, *eventArgs);
+            _ClosePaneHandlers(*this, eventArgs);
            break;
        }

        case ShortcutAction::ScrollUp:
        {
-            _ScrollUpHandlers(*this, *eventArgs);
+            _ScrollUpHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::ScrollDown:
        {
-            _ScrollDownHandlers(*this, *eventArgs);
+            _ScrollDownHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::ScrollUpPage:
        {
-            _ScrollUpPageHandlers(*this, *eventArgs);
+            _ScrollUpPageHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::ScrollDownPage:
        {
-            _ScrollDownPageHandlers(*this, *eventArgs);
+            _ScrollDownPageHandlers(*this, eventArgs);
            break;
        }

        case ShortcutAction::NextTab:
        {
-            _NextTabHandlers(*this, *eventArgs);
+            _NextTabHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::PrevTab:
        {
-            _PrevTabHandlers(*this, *eventArgs);
+            _PrevTabHandlers(*this, eventArgs);
            break;
        }

        case ShortcutAction::SendInput:
        {
-            _SendInputHandlers(*this, *eventArgs);
+            _SendInputHandlers(*this, eventArgs);
            break;
        }

@@ -123,118 +124,118 @@ namespace winrt::TerminalApp::implementation
        case ShortcutAction::SplitHorizontal:
        case ShortcutAction::SplitPane:
        {
-            _SplitPaneHandlers(*this, *eventArgs);
+            _SplitPaneHandlers(*this, eventArgs);
            break;
        }

        case ShortcutAction::TogglePaneZoom:
        {
-            _TogglePaneZoomHandlers(*this, *eventArgs);
+            _TogglePaneZoomHandlers(*this, eventArgs);
            break;
        }

        case ShortcutAction::SwitchToTab:
        {
-            _SwitchToTabHandlers(*this, *eventArgs);
+            _SwitchToTabHandlers(*this, eventArgs);
            break;
        }

        case ShortcutAction::ResizePane:
        {
-            _ResizePaneHandlers(*this, *eventArgs);
+            _ResizePaneHandlers(*this, eventArgs);
            break;
        }

        case ShortcutAction::MoveFocus:
        {
-            _MoveFocusHandlers(*this, *eventArgs);
+            _MoveFocusHandlers(*this, eventArgs);
            break;
        }

        case ShortcutAction::AdjustFontSize:
        {
-            _AdjustFontSizeHandlers(*this, *eventArgs);
+            _AdjustFontSizeHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::Find:
        {
-            _FindHandlers(*this, *eventArgs);
+            _FindHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::ResetFontSize:
        {
-            _ResetFontSizeHandlers(*this, *eventArgs);
+            _ResetFontSizeHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::ToggleRetroEffect:
        {
-            _ToggleRetroEffectHandlers(*this, *eventArgs);
+            _ToggleRetroEffectHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::ToggleFocusMode:
        {
-            _ToggleFocusModeHandlers(*this, *eventArgs);
+            _ToggleFocusModeHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::ToggleFullscreen:
        {
-            _ToggleFullscreenHandlers(*this, *eventArgs);
+            _ToggleFullscreenHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::ToggleAlwaysOnTop:
        {
-            _ToggleAlwaysOnTopHandlers(*this, *eventArgs);
+            _ToggleAlwaysOnTopHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::ToggleCommandPalette:
        {
-            _ToggleCommandPaletteHandlers(*this, *eventArgs);
+            _ToggleCommandPaletteHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::SetColorScheme:
        {
-            _SetColorSchemeHandlers(*this, *eventArgs);
+            _SetColorSchemeHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::SetTabColor:
        {
-            _SetTabColorHandlers(*this, *eventArgs);
+            _SetTabColorHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::OpenTabColorPicker:
        {
-            _OpenTabColorPickerHandlers(*this, *eventArgs);
+            _OpenTabColorPickerHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::RenameTab:
        {
-            _RenameTabHandlers(*this, *eventArgs);
+            _RenameTabHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::ExecuteCommandline:
        {
-            _ExecuteCommandlineHandlers(*this, *eventArgs);
+            _ExecuteCommandlineHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::CloseOtherTabs:
        {
-            _CloseOtherTabsHandlers(*this, *eventArgs);
+            _CloseOtherTabsHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::CloseTabsAfter:
        {
-            _CloseTabsAfterHandlers(*this, *eventArgs);
+            _CloseTabsAfterHandlers(*this, eventArgs);
            break;
        }
        case ShortcutAction::TabSearch:
        {
-            _TabSearchHandlers(*this, *eventArgs);
+            _TabSearchHandlers(*this, eventArgs);
            break;
        }
        default:
            return false;
        }
-        return eventArgs->Handled();
+        return eventArgs.Handled();
    }

 }
--- a/src/cascadia/TerminalApp/ShortcutActionDispatch.h
+++ b/src/cascadia/TerminalApp/ShortcutActionDispatch.h
@@ -4,7 +4,6 @@
 #pragma once

 #include "ShortcutActionDispatch.g.h"
-#include "ActionArgs.h"
 #include "..\inc\cppwinrt_utils.h"

 // fwdecl unittest classes
@@ -20,47 +19,47 @@ namespace winrt::TerminalApp::implementation
    {
        ShortcutActionDispatch() = default;

-        bool DoAction(const ActionAndArgs& actionAndArgs);
+        bool DoAction(const Microsoft::Terminal::Settings::Model::ActionAndArgs& actionAndArgs);

        // clang-format off
-        TYPED_EVENT(CopyText,             TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(PasteText,            TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(OpenNewTabDropdown,   TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(DuplicateTab,         TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(NewTab,               TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(NewWindow,            TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(CloseWindow,          TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(CloseTab,             TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ClosePane,            TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(SwitchToTab,          TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(NextTab,              TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(PrevTab,              TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(SendInput,            TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(SplitPane,            TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(TogglePaneZoom,       TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(AdjustFontSize,       TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ResetFontSize,        TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ScrollUp,             TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ScrollDown,           TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ScrollUpPage,         TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ScrollDownPage,       TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(OpenSettings,         TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ResizePane,           TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(Find,                 TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(MoveFocus,            TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ToggleRetroEffect,    TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ToggleFocusMode,      TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ToggleFullscreen,     TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ToggleAlwaysOnTop,    TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ToggleCommandPalette, TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(SetColorScheme,       TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(SetTabColor,          TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(OpenTabColorPicker,   TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(RenameTab,            TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(ExecuteCommandline,   TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(CloseOtherTabs,       TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(CloseTabsAfter,       TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
-        TYPED_EVENT(TabSearch,            TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
+        TYPED_EVENT(CopyText,             TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(PasteText,            TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(OpenNewTabDropdown,   TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(DuplicateTab,         TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(NewTab,               TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(NewWindow,            TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(CloseWindow,          TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(CloseTab,             TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ClosePane,            TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(SwitchToTab,          TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(NextTab,              TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(PrevTab,              TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(SendInput,            TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(SplitPane,            TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(TogglePaneZoom,       TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(AdjustFontSize,       TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ResetFontSize,        TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ScrollUp,             TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ScrollDown,           TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ScrollUpPage,         TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ScrollDownPage,       TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(OpenSettings,         TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ResizePane,           TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(Find,                 TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(MoveFocus,            TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ToggleRetroEffect,    TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ToggleFocusMode,      TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ToggleFullscreen,     TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ToggleAlwaysOnTop,    TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ToggleCommandPalette, TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(SetColorScheme,       TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(SetTabColor,          TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(OpenTabColorPicker,   TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(RenameTab,            TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(ExecuteCommandline,   TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(CloseOtherTabs,       TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(CloseTabsAfter,       TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
+        TYPED_EVENT(TabSearch,            TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
        // clang-format on

    private:
--- a/src/cascadia/TerminalApp/ShortcutActionDispatch.idl
+++ b/src/cascadia/TerminalApp/ShortcutActionDispatch.idl
@@ -1,51 +1,50 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-import "KeyMapping.idl";

 namespace TerminalApp
 {
    [default_interface] runtimeclass ShortcutActionDispatch {
        ShortcutActionDispatch();

-        Boolean DoAction(ActionAndArgs actionAndArgs);
+        Boolean DoAction(Microsoft.Terminal.Settings.Model.ActionAndArgs actionAndArgs);

-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> CopyText;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> PasteText;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> NewTab;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> OpenNewTabDropdown;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> DuplicateTab;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> NewWindow;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> CloseWindow;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> CloseTab;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ClosePane;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> SwitchToTab;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> NextTab;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> PrevTab;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> SendInput;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> SplitPane;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> TogglePaneZoom;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> AdjustFontSize;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ResetFontSize;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ScrollUp;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ScrollDown;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ScrollUpPage;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ScrollDownPage;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> OpenSettings;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ResizePane;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> Find;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> MoveFocus;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ToggleRetroEffect;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ToggleFocusMode;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ToggleFullscreen;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ToggleAlwaysOnTop;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ToggleCommandPalette;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> SetColorScheme;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> SetTabColor;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> OpenTabColorPicker;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> RenameTab;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ExecuteCommandline;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> CloseOtherTabs;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> CloseTabsAfter;
-        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> TabSearch;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> CopyText;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> PasteText;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> NewTab;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> OpenNewTabDropdown;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> DuplicateTab;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> NewWindow;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> CloseWindow;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> CloseTab;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ClosePane;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> SwitchToTab;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> NextTab;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> PrevTab;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> SendInput;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> SplitPane;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> TogglePaneZoom;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> AdjustFontSize;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ResetFontSize;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ScrollUp;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ScrollDown;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ScrollUpPage;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ScrollDownPage;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> OpenSettings;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ResizePane;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> Find;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> MoveFocus;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ToggleRetroEffect;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ToggleFocusMode;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ToggleFullscreen;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ToggleAlwaysOnTop;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ToggleCommandPalette;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> SetColorScheme;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> SetTabColor;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> OpenTabColorPicker;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> RenameTab;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> ExecuteCommandline;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> CloseOtherTabs;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> CloseTabsAfter;
+        event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> TabSearch;
    }
 }
--- a/src/cascadia/TerminalApp/Tab.cpp
+++ b/src/cascadia/TerminalApp/Tab.cpp
@@ -8,13 +8,12 @@
 #include "Tab.g.cpp"
 #include "Utils.h"
 #include "ColorHelper.h"
-#include "ActionAndArgs.h"
-#include "ActionArgs.h"

 using namespace winrt;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Windows::System;

 namespace winrt
@@ -34,7 +33,6 @@ namespace winrt::TerminalApp::implementation
        });

        _activePane = _rootPane;
-        Content(_rootPane->GetRootElement());

        _MakeTabViewItem();
        _MakeSwitchToTabCommand();
@@ -62,6 +60,24 @@ namespace winrt::TerminalApp::implementation
        _RecalculateAndApplyTabColor();
    }

+    // Method Description:
+    // - Get the root UIElement of this Tab's root pane.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - The UIElement acting as root of the Tab's root pane.
+    UIElement Tab::GetRootElement()
+    {
+        if (_zoomedPane)
+        {
+            return _zoomedPane->GetRootElement();
+        }
+        else
+        {
+            return _rootPane->GetRootElement();
+        }
+    }
+
    // Method Description:
    // - Returns nullptr if no children of this tab were the last control to be
    //   focused, or the TermControl that _was_ the last control to be focused (if
@@ -213,11 +229,11 @@ namespace winrt::TerminalApp::implementation
        if (auto tab{ weakThis.get() })
        {
            // The TabViewItem Icon needs MUX while the IconSourceElement in the CommandPalette needs WUX...
-            IconSource(GetColoredIcon<winrt::WUX::Controls::IconSource>(_lastIconPath));
-            _tabViewItem.IconSource(GetColoredIcon<winrt::MUX::Controls::IconSource>(_lastIconPath));
+            IconSource(IconPathConverter::IconSourceWUX(_lastIconPath));
+            _tabViewItem.IconSource(IconPathConverter::IconSourceMUX(_lastIconPath));

            // Update SwitchToTab command's icon
-            SwitchToTabCommand().IconSource(IconSource());
+            SwitchToTabCommand().Icon(_lastIconPath);
        }
    }

@@ -287,7 +303,7 @@ namespace winrt::TerminalApp::implementation
    // - splitType: The type of split we want to create.
    // Return Value:
    // - True if the focused pane can be split. False otherwise.
-    bool Tab::CanSplitPane(winrt::TerminalApp::SplitState splitType)
+    bool Tab::CanSplitPane(SplitState splitType)
    {
        return _activePane->CanSplit(splitType);
    }
@@ -301,7 +317,7 @@ namespace winrt::TerminalApp::implementation
    // - control: A TermControl to use in the new pane.
    // Return Value:
    // - <none>
-    void Tab::SplitPane(winrt::TerminalApp::SplitState splitType, const GUID& profile, TermControl& control)
+    void Tab::SplitPane(SplitState splitType, const GUID& profile, TermControl& control)
    {
        auto [first, second] = _activePane->Split(splitType, profile, control);
        _activePane = first;
@@ -347,7 +363,7 @@ namespace winrt::TerminalApp::implementation
    // - direction: The direction to move the separator in.
    // Return Value:
    // - <none>
-    void Tab::ResizePane(const winrt::TerminalApp::Direction& direction)
+    void Tab::ResizePane(const Direction& direction)
    {
        // NOTE: This _must_ be called on the root pane, so that it can propagate
        // throughout the entire tree.
@@ -361,7 +377,7 @@ namespace winrt::TerminalApp::implementation
    // - direction: The direction to move the focus in.
    // Return Value:
    // - <none>
-    void Tab::NavigateFocus(const winrt::TerminalApp::Direction& direction)
+    void Tab::NavigateFocus(const Direction& direction)
    {
        // NOTE: This _must_ be called on the root pane, so that it can propagate
        // throughout the entire tree.
@@ -494,22 +510,6 @@ namespace winrt::TerminalApp::implementation
                tab->_RecalculateAndApplyTabColor();
            }
        });
-
-        // Add a Closed event handler to the Pane. If the pane closes out from
-        // underneath us, and it's zoomed, we want to be able to make sure to
-        // update our state accordingly to un-zoom that pane. See GH#7252.
-        pane->Closed([weakThis](auto&& /*s*/, auto && /*e*/) -> winrt::fire_and_forget {
-            if (auto tab{ weakThis.get() })
-            {
-                if (tab->_zoomedPane)
-                {
-                    co_await winrt::resume_foreground(tab->Content().Dispatcher());
-
-                    tab->Content(tab->_rootPane->GetRootElement());
-                    tab->ExitZoom();
-                }
-            }
-        });
    }

    // Method Description:
@@ -593,10 +593,61 @@ namespace winrt::TerminalApp::implementation
        newTabFlyout.Items().Append(chooseColorMenuItem);
        newTabFlyout.Items().Append(renameTabMenuItem);
        newTabFlyout.Items().Append(menuSeparator);
+        newTabFlyout.Items().Append(_CreateCloseSubMenu());
        newTabFlyout.Items().Append(closeTabMenuItem);
        _tabViewItem.ContextFlyout(newTabFlyout);
    }

+    // Method Description:
+    // - Creates a sub-menu containing menu items to close multiple tabs
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - the created MenuFlyoutSubItem
+    Controls::MenuFlyoutSubItem Tab::_CreateCloseSubMenu()
+    {
+        auto weakThis{ get_weak() };
+
+        // Close tabs after
+        _closeTabsAfterMenuItem.Click([weakThis](auto&&, auto&&) {
+            if (auto tab{ weakThis.get() })
+            {
+                tab->_CloseTabsAfter();
+            }
+        });
+        _closeTabsAfterMenuItem.Text(RS_(L"TabCloseAfter"));
+
+        // Close other tabs
+        _closeOtherTabsMenuItem.Click([weakThis](auto&&, auto&&) {
+            if (auto tab{ weakThis.get() })
+            {
+                tab->_CloseOtherTabs();
+            }
+        });
+        _closeOtherTabsMenuItem.Text(RS_(L"TabCloseOther"));
+
+        Controls::MenuFlyoutSubItem closeSubMenu;
+        closeSubMenu.Text(RS_(L"TabCloseSubMenu"));
+        closeSubMenu.Items().Append(_closeTabsAfterMenuItem);
+        closeSubMenu.Items().Append(_closeOtherTabsMenuItem);
+
+        return closeSubMenu;
+    }
+
+    // Method Description:
+    // - Enable the Close menu items based on tab index and total number of tabs
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void Tab::_EnableCloseMenuItems()
+    {
+        // close other tabs is enabled only if there are other tabs
+        _closeOtherTabsMenuItem.IsEnabled(TabViewNumTabs() > 1);
+        // close tabs after is enabled only if there are other tabs on the right
+        _closeTabsAfterMenuItem.IsEnabled(TabViewIndex() < TabViewNumTabs() - 1);
+    }
+
    // Method Description:
    // - This will update the contents of our TabViewItem for our current state.
    //   - If we're not in a rename, we'll set the Header of the TabViewItem to
@@ -1020,7 +1071,6 @@ namespace winrt::TerminalApp::implementation
        _rootPane->Maximize(_zoomedPane);
        // Update the tab header to show the magnifying glass
        _UpdateTabHeader();
-        Content(_zoomedPane->GetRootElement());
    }
    void Tab::ExitZoom()
    {
@@ -1028,7 +1078,6 @@ namespace winrt::TerminalApp::implementation
        _zoomedPane = nullptr;
        // Update the tab header to hide the magnifying glass
        _UpdateTabHeader();
-        Content(_rootPane->GetRootElement());
    }

    bool Tab::IsZoomed()
@@ -1044,25 +1093,44 @@ namespace winrt::TerminalApp::implementation
    // - <none>
    void Tab::_MakeSwitchToTabCommand()
    {
-        auto focusTabAction = winrt::make_self<implementation::ActionAndArgs>();
-        auto args = winrt::make_self<implementation::SwitchToTabArgs>();
-        args->TabIndex(_TabViewIndex);
+        SwitchToTabArgs args{ _TabViewIndex };
+        ActionAndArgs focusTabAction{ ShortcutAction::SwitchToTab, args };

-        focusTabAction->Action(ShortcutAction::SwitchToTab);
-        focusTabAction->Args(*args);
-
-        winrt::TerminalApp::Command command;
-        command.Action(*focusTabAction);
+        Command command;
+        command.Action(focusTabAction);
        command.Name(Title());
-        command.IconSource(IconSource());
+        command.Icon(_lastIconPath);

        SwitchToTabCommand(command);
    }

-    void Tab::UpdateTabViewIndex(const uint32_t idx)
+    void Tab::_CloseTabsAfter()
+    {
+        CloseTabsAfterArgs args{ _TabViewIndex };
+        ActionAndArgs closeTabsAfter{ ShortcutAction::CloseTabsAfter, args };
+
+        _dispatch.DoAction(closeTabsAfter);
+    }
+
+    void Tab::_CloseOtherTabs()
+    {
+        CloseOtherTabsArgs args{ _TabViewIndex };
+        ActionAndArgs closeOtherTabs{ ShortcutAction::CloseOtherTabs, args };
+
+        _dispatch.DoAction(closeOtherTabs);
+    }
+
+    void Tab::UpdateTabViewIndex(const uint32_t idx, const uint32_t numTabs)
    {
        TabViewIndex(idx);
-        SwitchToTabCommand().Action().Args().as<implementation::SwitchToTabArgs>()->TabIndex(idx);
+        TabViewNumTabs(numTabs);
+        _EnableCloseMenuItems();
+        SwitchToTabCommand().Action().Args().as<SwitchToTabArgs>().TabIndex(idx);
+    }
+
+    void Tab::SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch)
+    {
+        _dispatch = dispatch;
    }

    DEFINE_EVENT(Tab, ActivePaneChanged, _ActivePaneChangedHandlers, winrt::delegate<>);
--- a/src/cascadia/TerminalApp/Tab.h
+++ b/src/cascadia/TerminalApp/Tab.h
@@ -24,6 +24,7 @@ namespace winrt::TerminalApp::implementation
        void Initialize(const winrt::Microsoft::Terminal::TerminalControl::TermControl& control);

        winrt::Microsoft::UI::Xaml::Controls::TabViewItem GetTabViewItem();
+        winrt::Windows::UI::Xaml::UIElement GetRootElement();
        winrt::Microsoft::Terminal::TerminalControl::TermControl GetActiveTerminalControl() const;
        std::optional<GUID> GetFocusedProfile() const noexcept;

@@ -32,18 +33,18 @@ namespace winrt::TerminalApp::implementation

        winrt::fire_and_forget Scroll(const int delta);

-        bool CanSplitPane(winrt::TerminalApp::SplitState splitType);
-        void SplitPane(winrt::TerminalApp::SplitState splitType, const GUID& profile, winrt::Microsoft::Terminal::TerminalControl::TermControl& control);
+        bool CanSplitPane(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType);
+        void SplitPane(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType, const GUID& profile, winrt::Microsoft::Terminal::TerminalControl::TermControl& control);

        winrt::fire_and_forget UpdateIcon(const winrt::hstring iconPath);

        float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;
-        SplitState PreCalculateAutoSplit(winrt::Windows::Foundation::Size rootSize) const;
-        bool PreCalculateCanSplit(SplitState splitType, winrt::Windows::Foundation::Size availableSpace) const;
+        winrt::Microsoft::Terminal::Settings::Model::SplitState PreCalculateAutoSplit(winrt::Windows::Foundation::Size rootSize) const;
+        bool PreCalculateCanSplit(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType, winrt::Windows::Foundation::Size availableSpace) const;

        void ResizeContent(const winrt::Windows::Foundation::Size& newSize);
-        void ResizePane(const winrt::TerminalApp::Direction& direction);
-        void NavigateFocus(const winrt::TerminalApp::Direction& direction);
+        void ResizePane(const winrt::Microsoft::Terminal::Settings::Model::Direction& direction);
+        void NavigateFocus(const winrt::Microsoft::Terminal::Settings::Model::Direction& direction);

        void UpdateSettings(const winrt::TerminalApp::TerminalSettings& settings, const GUID& profile);
        winrt::hstring GetActiveTitle() const;
@@ -67,7 +68,9 @@ namespace winrt::TerminalApp::implementation

        int GetLeafPaneCount() const noexcept;

-        void UpdateTabViewIndex(const uint32_t idx);
+        void UpdateTabViewIndex(const uint32_t idx, const uint32_t numTabs);
+
+        void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);

        WINRT_CALLBACK(Closed, winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable>);
        WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
@@ -77,13 +80,13 @@ namespace winrt::TerminalApp::implementation

        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, Title, _PropertyChangedHandlers);
        OBSERVABLE_GETSET_PROPERTY(winrt::Windows::UI::Xaml::Controls::IconSource, IconSource, _PropertyChangedHandlers, nullptr);
-        OBSERVABLE_GETSET_PROPERTY(winrt::TerminalApp::Command, SwitchToTabCommand, _PropertyChangedHandlers, nullptr);
+        OBSERVABLE_GETSET_PROPERTY(winrt::Microsoft::Terminal::Settings::Model::Command, SwitchToTabCommand, _PropertyChangedHandlers, nullptr);

        // The TabViewIndex is the index this Tab object resides in TerminalPage's _tabs vector.
        // This is needed since Tab is going to be managing its own SwitchToTab command.
        OBSERVABLE_GETSET_PROPERTY(uint32_t, TabViewIndex, _PropertyChangedHandlers, 0);
-
-        OBSERVABLE_GETSET_PROPERTY(winrt::Windows::UI::Xaml::UIElement, Content, _PropertyChangedHandlers, nullptr);
+        // The TabViewNumTabs is the number of Tab objects in TerminalPage's _tabs vector.
+        OBSERVABLE_GETSET_PROPERTY(uint32_t, TabViewNumTabs, _PropertyChangedHandlers, 0);

    private:
        std::shared_ptr<Pane> _rootPane{ nullptr };
@@ -93,6 +96,8 @@ namespace winrt::TerminalApp::implementation
        winrt::TerminalApp::ColorPickupFlyout _tabColorPickup{};
        std::optional<winrt::Windows::UI::Color> _themeTabColor{};
        std::optional<winrt::Windows::UI::Color> _runtimeTabColor{};
+        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeOtherTabsMenuItem{};
+        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeTabsAfterMenuItem{};

        bool _focused{ false };
        winrt::Microsoft::UI::Xaml::Controls::TabViewItem _tabViewItem{ nullptr };
@@ -101,10 +106,15 @@ namespace winrt::TerminalApp::implementation
        bool _inRename{ false };
        winrt::Windows::UI::Xaml::Controls::TextBox::LayoutUpdated_revoker _tabRenameBoxLayoutUpdatedRevoker;

+        winrt::TerminalApp::ShortcutActionDispatch _dispatch;
+
        void _MakeTabViewItem();
        void _Focus();

        void _CreateContextMenu();
+        winrt::Windows::UI::Xaml::Controls::MenuFlyoutSubItem _CreateCloseSubMenu();
+        void _EnableCloseMenuItems();
+
        void _RefreshVisualState();

        void _BindEventHandlers(const winrt::Microsoft::Terminal::TerminalControl::TermControl& control) noexcept;
@@ -124,6 +134,9 @@ namespace winrt::TerminalApp::implementation

        void _MakeSwitchToTabCommand();

+        void _CloseTabsAfter();
+        void _CloseOtherTabs();
+
        friend class ::TerminalAppLocalTests::TabTests;
    };
 }
--- a/src/cascadia/TerminalApp/Tab.idl
+++ b/src/cascadia/TerminalApp/Tab.idl
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-
-import "Command.idl";
+import "ShortcutActionDispatch.idl";

 namespace TerminalApp
 {
@@ -9,8 +8,9 @@ namespace TerminalApp
    {
        String Title { get; };
        Windows.UI.Xaml.Controls.IconSource IconSource { get; };
-        Windows.UI.Xaml.UIElement Content { get; };
-        Command SwitchToTabCommand { get; };
+        Microsoft.Terminal.Settings.Model.Command SwitchToTabCommand { get; };
        UInt32 TabViewIndex { get; };
+
+        void SetDispatch(ShortcutActionDispatch dispatch);
    }
 }
--- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
+++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
@@ -92,43 +92,19 @@
    <ClInclude Include="CommandPalette.h">
      <DependentUpon>CommandPalette.xaml</DependentUpon>
    </ClInclude>
-    <ClInclude Include="Command.h">
-      <DependentUpon>Command.idl</DependentUpon>
-    </ClInclude>
    <ClInclude Include="EmptyStringVisibilityConverter.h">
      <DependentUpon>EmptyStringVisibilityConverter.idl</DependentUpon>
    </ClInclude>
    <ClInclude Include="HasNestedCommandsVisibilityConverter.h">
      <DependentUpon>HasNestedCommandsVisibilityConverter.idl</DependentUpon>
    </ClInclude>
+    <ClInclude Include="IconPathConverter.h">
+      <DependentUpon>IconPathConverter.idl</DependentUpon>
+    </ClInclude>
    <ClInclude Include="Tab.h">
      <DependentUpon>Tab.idl</DependentUpon>
    </ClInclude>
    <ClInclude Include="Pane.h" />
-    <ClInclude Include="ColorScheme.h">
-      <DependentUpon>ColorScheme.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="GlobalAppSettings.h">
-      <DependentUpon>GlobalAppSettings.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="Profile.h">
-      <DependentUpon>Profile.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="CascadiaSettings.h">
-      <DependentUpon>CascadiaSettings.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="KeyChordSerialization.h" />
-    <ClInclude Include="JsonUtils.h" />
-    <ClInclude Include="Utils.h" />
-    <ClInclude Include="DefaultProfileUtils.h" />
-    <ClInclude Include="TerminalSettingsSerializationHelpers.h" />
-    <ClInclude Include="TerminalWarnings.h">
-      <DependentUpon>TerminalWarnings.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="IDynamicProfileGenerator.h" />
-    <ClInclude Include="PowershellCoreProfileGenerator.h" />
-    <ClInclude Include="WslDistroGenerator.h" />
-    <ClInclude Include="AzureCloudShellGenerator.h" />
    <ClInclude Include="ColorHelper.h" />
    <ClInclude Include="TerminalSettings.h">
      <DependentUpon>TerminalSettings.idl</DependentUpon>
@@ -137,19 +113,10 @@
    <ClInclude Include="ShortcutActionDispatch.h">
      <DependentUpon>ShortcutActionDispatch.idl</DependentUpon>
    </ClInclude>
-    <ClInclude Include="ActionArgs.h">
-      <DependentUpon>ActionArgs.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="ActionAndArgs.h">
-      <DependentUpon>ActionArgs.idl</DependentUpon>
-    </ClInclude>
    <ClInclude Include="DebugTapConnection.h" />
    <ClInclude Include="AppKeyBindings.h">
      <DependentUpon>AppKeyBindings.idl</DependentUpon>
    </ClInclude>
-    <ClInclude Include="KeyMapping.h">
-      <DependentUpon>KeyMapping.idl</DependentUpon>
-    </ClInclude>
    <ClInclude Include="App.h">
      <DependentUpon>App.xaml</DependentUpon>
    </ClInclude>
@@ -182,46 +149,22 @@
    <ClCompile Include="CommandPalette.cpp">
      <DependentUpon>CommandPalette.xaml</DependentUpon>
    </ClCompile>
-    <ClCompile Include="Command.cpp">
-      <DependentUpon>Command.idl</DependentUpon>
-    </ClCompile>
    <ClCompile Include="EmptyStringVisibilityConverter.cpp">
      <DependentUpon>EmptyStringVisibilityConverter.idl</DependentUpon>
    </ClCompile>
    <ClCompile Include="HasNestedCommandsVisibilityConverter.cpp">
      <DependentUpon>HasNestedCommandsVisibilityConverter.idl</DependentUpon>
    </ClCompile>
+    <ClCompile Include="IconPathConverter.cpp">
+      <DependentUpon>IconPathConverter.idl</DependentUpon>
+    </ClCompile>
    <ClCompile Include="Tab.cpp">
      <DependentUpon>Tab.idl</DependentUpon>
    </ClCompile>
    <ClCompile Include="Pane.cpp" />
-    <ClCompile Include="ColorScheme.cpp">
-      <DependentUpon>ColorScheme.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="GlobalAppSettings.cpp">
-      <DependentUpon>GlobalAppSettings.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="Profile.cpp">
-      <DependentUpon>Profile.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="CascadiaSettings.cpp">
-      <DependentUpon>CascadiaSettings.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="CascadiaSettingsSerialization.cpp">
-      <DependentUpon>CascadiaSettings.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="KeyMappingSerialization.cpp">
-      <DependentUpon>KeyMapping.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="KeyChordSerialization.cpp" />
-    <ClCompile Include="DefaultProfileUtils.cpp" />
-    <ClCompile Include="PowershellCoreProfileGenerator.cpp" />
-    <ClCompile Include="WslDistroGenerator.cpp" />
-    <ClCompile Include="AzureCloudShellGenerator.cpp" />
    <ClCompile Include="Pane.LayoutSizeNode.cpp" />
    <ClCompile Include="ColorHelper.cpp" />
    <ClCompile Include="DebugTapConnection.cpp" />
-    <ClCompile Include="Utils.cpp" />
    <ClCompile Include="TerminalSettings.cpp">
      <DependentUpon>TerminalSettings.idl</DependentUpon>
    </ClCompile>
@@ -231,18 +174,9 @@
    <ClCompile Include="AppKeyBindings.cpp">
      <DependentUpon>AppKeyBindings.idl</DependentUpon>
    </ClCompile>
-    <ClCompile Include="KeyMapping.cpp">
-      <DependentUpon>KeyMapping.idl</DependentUpon>
-    </ClCompile>
    <ClCompile Include="ShortcutActionDispatch.cpp">
      <DependentUpon>ShortcutActionDispatch.idl</DependentUpon>
    </ClCompile>
-    <ClCompile Include="ActionAndArgs.cpp">
-      <DependentUpon>ActionArgs.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="ActionArgs.cpp">
-      <DependentUpon>ActionArgs.idl</DependentUpon>
-    </ClCompile>
    <ClCompile Include="App.cpp">
      <DependentUpon>App.xaml</DependentUpon>
    </ClCompile>
@@ -252,11 +186,6 @@
    <ClCompile Include="AppLogic.cpp">
      <DependentUpon>AppLogic.idl</DependentUpon>
    </ClCompile>
-    <!-- You _NEED_ to include this file and the jsoncpp IncludePath (below) if
-    you want to use jsoncpp -->
-    <ClCompile Include="$(OpenConsoleDir)\dep\jsoncpp\jsoncpp.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
  </ItemGroup>
  <!-- ========================= idl Files ======================== -->
@@ -269,9 +198,7 @@
    </Midl>
    <Midl Include="ShortcutActionDispatch.idl" />
    <Midl Include="AppKeyBindings.idl" />
-    <Midl Include="KeyMapping.idl" />
    <Midl Include="AppLogic.idl" />
-    <Midl Include="ActionArgs.idl" />
    <Midl Include="MinMaxCloseControl.idl">
      <DependentUpon>MinMaxCloseControl.xaml</DependentUpon>
      <SubType>Code</SubType>
@@ -296,16 +223,11 @@
      <DependentUpon>CommandPalette.xaml</DependentUpon>
      <SubType>Code</SubType>
    </Midl>
-    <Midl Include="Command.idl" />
    <Midl Include="EmptyStringVisibilityConverter.idl" />
    <Midl Include="HasNestedCommandsVisibilityConverter.idl" />
+    <Midl Include="IconPathConverter.idl" />
    <Midl Include="Tab.idl" />
    <Midl Include="TerminalSettings.idl" />
-    <Midl Include="ColorScheme.idl" />
-    <Midl Include="Profile.idl" />
-    <Midl Include="GlobalAppSettings.idl" />
-    <Midl Include="CascadiaSettings.idl" />
-    <Midl Include="TerminalWarnings.idl" />
  </ItemGroup>
  <!-- ========================= Misc Files ======================== -->
  <ItemGroup>
@@ -357,12 +279,18 @@
      <Private>false</Private>
      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
    </Reference>
+    <Reference Include="Microsoft.Terminal.Settings.Model">
+      <HintPath>$(_BinRoot)Microsoft.Terminal.Settings.Model\Microsoft.Terminal.Settings.Model.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
  </ItemGroup>
  <!-- ====================== Compiler & Linker Flags ===================== -->
  <ItemDefinitionGroup>
    <ClCompile>
      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..;$(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
      <!-- Manually disable unreachable code warning, because jconcpp has a ton of that. -->
      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
    </ClCompile>
@@ -402,20 +330,6 @@
      </PackagingOutputs>
    </ItemGroup>
  </Target>
-  <!-- This target will take our defaults.json and stamp it into a .h file that
-  we can include in the code directly. This way, we don't need to worry about
-  failing to load the default settings at runtime. -->
-  <Target Name="_TerminalAppGenerateDefaultsH" Inputs="defaults.json" Outputs="Generated Files\defaults.h" BeforeTargets="BeforeClCompile">
-    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile defaults.json -OutPath '&quot;Generated Files\defaults.h&quot;' -VariableName DefaultJson" />
-  </Target>
-  <!-- A different set of defaults for Universal variant -->
-  <Target Name="_TerminalAppGenerateDefaultsUniversalH" Inputs="defaults-universal.json" Outputs="Generated Files\defaults-universal.h" BeforeTargets="BeforeClCompile">
-    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile defaults-universal.json -OutPath '&quot;Generated Files\defaults-universal.h&quot;' -VariableName DefaultUniversalJson" />
-  </Target>
-  <!-- Same as above, but for the default settings.json template -->
-  <Target Name="_TerminalAppGenerateUserSettingsH" Inputs="userDefaults.json" Outputs="Generated Files\userDefaults.h" BeforeTargets="BeforeClCompile">
-    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile userDefaults.json -OutPath '&quot;Generated Files\userDefaults.h&quot;' -VariableName UserSettingsJson" />
-  </Target>

  <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
 </Project>
--- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
+++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
@@ -10,45 +10,9 @@
    <ClCompile Include="init.cpp" />
    <ClCompile Include="pch.cpp" />
    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-    <ClCompile Include="AzureCloudShellGenerator.cpp">
-      <Filter>profileGeneration</Filter>
-    </ClCompile>
-    <ClCompile Include="PowershellCoreProfileGenerator.cpp">
-      <Filter>profileGeneration</Filter>
-    </ClCompile>
-    <ClCompile Include="WslDistroGenerator.cpp">
-      <Filter>profileGeneration</Filter>
-    </ClCompile>
-    <ClCompile Include="KeyMappingSerialization.cpp">
-      <Filter>settings</Filter>
-    </ClCompile>
-    <ClCompile Include="CascadiaSettings.cpp">
-      <Filter>settings</Filter>
-    </ClCompile>
-    <ClCompile Include="CascadiaSettingsSerialization.cpp">
-      <Filter>settings</Filter>
-    </ClCompile>
-    <ClCompile Include="GlobalAppSettings.cpp">
-      <Filter>settings</Filter>
-    </ClCompile>
-    <ClCompile Include="KeyChordSerialization.cpp">
-      <Filter>settings</Filter>
-    </ClCompile>
-    <ClCompile Include="Profile.cpp">
-      <Filter>settings</Filter>
-    </ClCompile>
-    <ClCompile Include="ColorScheme.cpp">
-      <Filter>settings</Filter>
-    </ClCompile>
    <ClCompile Include="Pane.cpp">
      <Filter>pane</Filter>
    </ClCompile>
-    <ClCompile Include="DefaultProfileUtils.cpp">
-      <Filter>profileGeneration</Filter>
-    </ClCompile>
-    <ClCompile Include="$(OpenConsoleDir)\dep\jsoncpp\jsoncpp.cpp">
-      <Filter>json</Filter>
-    </ClCompile>
    <ClCompile Include="Tab.cpp">
      <Filter>tab</Filter>
    </ClCompile>
@@ -71,45 +35,9 @@
    <ClInclude Include="App.base.h">
      <Filter>app</Filter>
    </ClInclude>
-    <ClInclude Include="AzureCloudShellGenerator.h">
-      <Filter>profileGeneration</Filter>
-    </ClInclude>
-    <ClInclude Include="IDynamicProfileGenerator.h">
-      <Filter>profileGeneration</Filter>
-    </ClInclude>
-    <ClInclude Include="PowershellCoreProfileGenerator.h">
-      <Filter>profileGeneration</Filter>
-    </ClInclude>
-    <ClInclude Include="WslDistroGenerator.h">
-      <Filter>profileGeneration</Filter>
-    </ClInclude>
-    <ClInclude Include="CascadiaSettings.h">
-      <Filter>settings</Filter>
-    </ClInclude>
-    <ClInclude Include="GlobalAppSettings.h">
-      <Filter>settings</Filter>
-    </ClInclude>
-    <ClInclude Include="TerminalSettingsSerializationHelpers.h">
-      <Filter>settings</Filter>
-    </ClInclude>
-    <ClInclude Include="KeyChordSerialization.h">
-      <Filter>settings</Filter>
-    </ClInclude>
-    <ClInclude Include="Profile.h">
-      <Filter>settings</Filter>
-    </ClInclude>
-    <ClInclude Include="ColorScheme.h">
-      <Filter>settings</Filter>
-    </ClInclude>
    <ClInclude Include="Pane.h">
      <Filter>pane</Filter>
    </ClInclude>
-    <ClInclude Include="DefaultProfileUtils.h">
-      <Filter>profileGeneration</Filter>
-    </ClInclude>
-    <ClInclude Include="JsonUtils.h">
-      <Filter>json</Filter>
-    </ClInclude>
    <ClInclude Include="Tab.h">
      <Filter>tab</Filter>
    </ClInclude>
@@ -131,32 +59,17 @@
    <Midl Include="AppKeyBindings.idl">
      <Filter>settings</Filter>
    </Midl>
-    <Midl Include="KeyMapping.idl">
-      <Filter>settings</Filter>
-    </Midl>
    <Midl Include="ShortcutActionDispatch.idl">
      <Filter>settings</Filter>
    </Midl>
    <Midl Include="Tab.idl">
      <Filter>tab</Filter>
    </Midl>
-    <Midl Include="Command.idl">
-      <Filter>commandPalette</Filter>
-    </Midl>
    <Midl Include="IDirectKeyListener.idl" />
    <Midl Include="CommandKeyChordVisibilityConverter.idl" />
    <Midl Include="TerminalSettings.idl">
      <Filter>settings</Filter>
    </Midl>
-    <Midl Include="ColorScheme.idl">
-      <Filter>settings</Filter>
-    </Midl>
-    <Midl Include="Profile.idl">
-      <Filter>settings</Filter>
-    </Midl>
-    <Midl Include="GlobalAppSettings.idl">
-      <Filter>settings</Filter>
-    </Midl>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
@@ -185,9 +98,6 @@
    <Filter Include="app">
      <UniqueIdentifier>{21588d0a-fa81-4306-828d-c095af895b9e}</UniqueIdentifier>
    </Filter>
-    <Filter Include="profileGeneration">
-      <UniqueIdentifier>{c81be61b-0d58-4277-8fd1-fcc888c3da9c}</UniqueIdentifier>
-    </Filter>
    <Filter Include="settings">
      <UniqueIdentifier>{27ff86d8-2a62-4787-b55a-2ec1db32abec}</UniqueIdentifier>
    </Filter>
@@ -197,9 +107,6 @@
    <Filter Include="controls">
      <UniqueIdentifier>{2455d67b-17ef-4cdd-ad9e-eb8ec4412e03}</UniqueIdentifier>
    </Filter>
-    <Filter Include="json">
-      <UniqueIdentifier>{81a6314f-aa5b-4533-a499-13bc3a5c4af0}</UniqueIdentifier>
-    </Filter>
    <Filter Include="tab">
      <UniqueIdentifier>{6d40e12f-b83f-462e-8f93-fa421f87b27e}</UniqueIdentifier>
    </Filter>
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -3,7 +3,6 @@

 #include "pch.h"
 #include "TerminalPage.h"
-#include "ActionAndArgs.h"
 #include "Utils.h"
 #include "AppLogic.h"
 #include "../../types/inc/utils.hpp"
@@ -14,8 +13,6 @@
 #include <winrt/Windows.Storage.h>
 #include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>

-#include "KeyChordSerialization.h"
-#include "AzureCloudShellGenerator.h" // For AzureConnectionType
 #include "TabRowControl.h"
 #include "ColorHelper.h"
 #include "DebugTapConnection.h"
@@ -31,6 +28,7 @@ using namespace winrt::Windows::UI::Text;
 using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace ::TerminalApp;
 using namespace ::Microsoft::Console;

@@ -45,8 +43,7 @@ namespace winrt::TerminalApp::implementation
 {
    TerminalPage::TerminalPage() :
        _tabs{ winrt::single_threaded_observable_vector<TerminalApp::Tab>() },
-        _mruTabActions{ winrt::single_threaded_vector<winrt::TerminalApp::Command>() },
-        _startupActions{ winrt::single_threaded_vector<winrt::TerminalApp::ActionAndArgs>() }
+        _startupActions{ winrt::single_threaded_vector<ActionAndArgs>() }
    {
        InitializeComponent();
    }
@@ -59,8 +56,8 @@ namespace winrt::TerminalApp::implementation
    // Arguments:
    // - settings: The settings who's keybindings we should use to look up the key chords from
    // - commands: The list of commands to label.
-    static void _recursiveUpdateCommandKeybindingLabels(TerminalApp::CascadiaSettings settings,
-                                                        IMapView<winrt::hstring, winrt::TerminalApp::Command> commands)
+    static void _recursiveUpdateCommandKeybindingLabels(CascadiaSettings settings,
+                                                        IMapView<winrt::hstring, Command> commands)
    {
        for (const auto& nameAndCmd : commands)
        {
@@ -83,25 +80,7 @@ namespace winrt::TerminalApp::implementation
        }
    }

-    static void _recursiveUpdateCommandIcons(IMapView<winrt::hstring, winrt::TerminalApp::Command> commands)
-    {
-        for (const auto& nameAndCmd : commands)
-        {
-            const auto& command = nameAndCmd.Value();
-
-            // !!! LOAD-BEARING !!! If this is never called, then Commands will
-            // have a nullptr icon. If they do, a really weird crash can occur.
-            // MAKE SURE this is called once after a settings load.
-            command.RefreshIcon();
-
-            if (command.HasNestedCommands())
-            {
-                _recursiveUpdateCommandIcons(command.NestedCommands());
-            }
-        }
-    }
-
-    winrt::fire_and_forget TerminalPage::SetSettings(TerminalApp::CascadiaSettings settings, bool needRefreshUI)
+    winrt::fire_and_forget TerminalPage::SetSettings(CascadiaSettings settings, bool needRefreshUI)
    {
        _settings = settings;
        if (needRefreshUI)
@@ -213,8 +192,8 @@ namespace winrt::TerminalApp::implementation

                if (altPressed && !debugTap)
                {
-                    page->_SplitPane(TerminalApp::SplitState::Automatic,
-                                     TerminalApp::SplitType::Manual,
+                    page->_SplitPane(SplitState::Automatic,
+                                     SplitType::Manual,
                                     nullptr);
                }
                else
@@ -244,14 +223,24 @@ namespace winrt::TerminalApp::implementation
            }
        });

+        _tabs.VectorChanged([weakThis{ get_weak() }](auto&& s, auto&& e) {
+            if (auto page{ weakThis.get() })
+            {
+                page->CommandPalette().OnTabsChanged(s, e);
+            }
+        });
+
+        // Settings AllowDependentAnimations will affect whether animations are
+        // enabled application-wide, so we don't need to check it each time we
+        // want to create an animation.
+        WUX::Media::Animation::Timeline::AllowDependentAnimations(!_settings.GlobalSettings().DisableAnimations());
+
        // Once the page is actually laid out on the screen, trigger all our
        // startup actions. Things like Panes need to know at least how big the
        // window will be, so they can subdivide that space.
        //
        // _OnFirstLayout will remove this handler so it doesn't get called more than once.
        _layoutUpdatedRevoker = _tabContent.LayoutUpdated(winrt::auto_revoke, { this, &TerminalPage::_OnFirstLayout });
-
-        _isAlwaysOnTop = _settings.GlobalSettings().AlwaysOnTop();
    }

    // Method Description:
@@ -303,7 +292,7 @@ namespace winrt::TerminalApp::implementation
    //   should fire an Initialized event.
    // Return Value:
    // - <none>
-    winrt::fire_and_forget TerminalPage::_ProcessStartupActions(Windows::Foundation::Collections::IVector<winrt::TerminalApp::ActionAndArgs> actions,
+    winrt::fire_and_forget TerminalPage::_ProcessStartupActions(Windows::Foundation::Collections::IVector<ActionAndArgs> actions,
                                                                const bool initial)
    {
        // If there are no actions left, do nothing.
@@ -325,7 +314,7 @@ namespace winrt::TerminalApp::implementation
                }
                else
                {
-                    return;
+                    co_return;
                }
            }
        }
@@ -363,22 +352,12 @@ namespace winrt::TerminalApp::implementation

    winrt::hstring TerminalPage::ApplicationDisplayName()
    {
-        if (const auto appLogic{ implementation::AppLogic::Current() })
-        {
-            return appLogic->ApplicationDisplayName();
-        }
-
-        return RS_(L"ApplicationDisplayNameUnpackaged");
+        return CascadiaSettings::ApplicationDisplayName();
    }

    winrt::hstring TerminalPage::ApplicationVersion()
    {
-        if (const auto appLogic{ implementation::AppLogic::Current() })
-        {
-            return appLogic->ApplicationVersion();
-        }
-
-        return RS_(L"ApplicationVersionUnknown");
+        return CascadiaSettings::ApplicationVersion();
    }

    void TerminalPage::_ThirdPartyNoticesOnClick(const IInspectable& /*sender*/, const Windows::UI::Xaml::RoutedEventArgs& /*eventArgs*/)
@@ -457,14 +436,10 @@ namespace winrt::TerminalApp::implementation
            // Add the keyboard shortcuts based on the number of profiles defined
            // Look for a keychord that is bound to the equivalent
            // NewTab(ProfileIndex=N) action
-            auto actionAndArgs = winrt::make_self<winrt::TerminalApp::implementation::ActionAndArgs>();
-            actionAndArgs->Action(ShortcutAction::NewTab);
-            auto newTabArgs = winrt::make_self<winrt::TerminalApp::implementation::NewTabArgs>();
-            auto newTerminalArgs = winrt::make_self<winrt::TerminalApp::implementation::NewTerminalArgs>();
-            newTerminalArgs->ProfileIndex(profileIndex);
-            newTabArgs->TerminalArgs(*newTerminalArgs);
-            actionAndArgs->Args(*newTabArgs);
-            auto profileKeyChord{ keyBindings.GetKeyBindingForActionWithArgs(*actionAndArgs) };
+            NewTerminalArgs newTerminalArgs{ profileIndex };
+            NewTabArgs newTabArgs{ newTerminalArgs };
+            ActionAndArgs actionAndArgs{ ShortcutAction::NewTab, newTabArgs };
+            auto profileKeyChord{ keyBindings.GetKeyBindingForActionWithArgs(actionAndArgs) };

            // make sure we find one to display
            if (profileKeyChord)
@@ -477,9 +452,9 @@ namespace winrt::TerminalApp::implementation

            // If there's an icon set for this profile, set it as the icon for
            // this flyout item.
-            if (!profile.IconPath().empty())
+            if (!profile.Icon().empty())
            {
-                auto iconSource = GetColoredIcon<WUX::Controls::IconSource>(profile.ExpandedIconPath());
+                const auto iconSource{ IconPathConverter().IconSourceWUX(profile.Icon()) };

                WUX::Controls::IconSourceElement iconElement;
                iconElement.IconSource(iconSource);
@@ -511,8 +486,7 @@ namespace winrt::TerminalApp::implementation
            profileMenuItem.Click([profileIndex, weakThis{ get_weak() }](auto&&, auto&&) {
                if (auto page{ weakThis.get() })
                {
-                    auto newTerminalArgs = winrt::make_self<winrt::TerminalApp::implementation::NewTerminalArgs>();
-                    newTerminalArgs->ProfileIndex(profileIndex);
+                    NewTerminalArgs newTerminalArgs{ profileIndex };

                    // if alt is pressed, open a pane
                    const CoreWindow window = CoreWindow::GetForCurrentThread();
@@ -528,13 +502,13 @@ namespace winrt::TerminalApp::implementation

                    if (altPressed && !debugTap)
                    {
-                        page->_SplitPane(TerminalApp::SplitState::Automatic,
-                                         TerminalApp::SplitType::Manual,
-                                         *newTerminalArgs);
+                        page->_SplitPane(SplitState::Automatic,
+                                         SplitType::Manual,
+                                         newTerminalArgs);
                    }
                    else
                    {
-                        page->_OpenNewTab(*newTerminalArgs);
+                        page->_OpenNewTab(newTerminalArgs);
                    }
                }
            });
@@ -624,7 +598,7 @@ namespace winrt::TerminalApp::implementation
    // - newTerminalArgs: An object that may contain a blob of parameters to
    //   control which profile is created and with possible other
    //   configurations. See TerminalSettings::BuildSettings for more details.
-    void TerminalPage::_OpenNewTab(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs)
+    void TerminalPage::_OpenNewTab(const NewTerminalArgs& newTerminalArgs)
    try
    {
        auto [profileGuid, settings] = TerminalSettings::BuildSettings(_settings, newTerminalArgs, *_bindings);
@@ -697,10 +671,11 @@ namespace winrt::TerminalApp::implementation
        // Add the new tab to the list of our tabs.
        auto newTabImpl = winrt::make_self<Tab>(profileGuid, term);
        _tabs.Append(*newTabImpl);
-        _mruTabActions.Append(newTabImpl->SwitchToTabCommand());
+
+        newTabImpl->SetDispatch(*_actionDispatch);

        // Give the tab its index in the _tabs vector so it can manage its own SwitchToTab command.
-        newTabImpl->UpdateTabViewIndex(_tabs.Size() - 1);
+        _UpdateTabIndices();

        // Hookup our event handlers to the new terminal
        _RegisterTerminalEvents(term, *newTabImpl);
@@ -740,9 +715,9 @@ namespace winrt::TerminalApp::implementation

        // Set this tab's icon to the icon from the user's profile
        const auto profile = _settings.FindProfile(profileGuid);
-        if (profile != nullptr && !profile.IconPath().empty())
+        if (profile != nullptr && !profile.Icon().empty())
        {
-            newTabImpl->UpdateIcon(profile.ExpandedIconPath());
+            newTabImpl->UpdateIcon(profile.Icon());
        }

        tabViewItem.PointerPressed({ this, &TerminalPage::_OnTabClick });
@@ -792,7 +767,7 @@ namespace winrt::TerminalApp::implementation
        }

        if (hasConnectionType &&
-            connectionType == AzureConnectionType &&
+            connectionType == TerminalConnection::AzureConnection::ConnectionType() &&
            TerminalConnection::AzureConnection::IsAzureConnectionAvailable())
        {
            // TODO GH#4661: Replace this with directly using the AzCon when our VT is better
@@ -890,7 +865,7 @@ namespace winrt::TerminalApp::implementation
    // as the object to handle dispatching ShortcutAction events.
    // Arguments:
    // - bindings: A AppKeyBindings object to wire up with our event handlers
-    void TerminalPage::_HookupKeyBindings(const TerminalApp::KeyMapping& keymap) noexcept
+    void TerminalPage::_HookupKeyBindings(const KeyMapping& keymap) noexcept
    {
        _bindings->SetDispatch(*_actionDispatch);
        _bindings->SetKeyMapping(keymap);
@@ -978,7 +953,7 @@ namespace winrt::TerminalApp::implementation
            const auto matchingProfile = _settings.FindProfile(lastFocusedProfile);
            if (matchingProfile)
            {
-                tab.UpdateIcon(matchingProfile.ExpandedIconPath());
+                tab.UpdateIcon(matchingProfile.Icon());
            }
            else
            {
@@ -1073,13 +1048,6 @@ namespace winrt::TerminalApp::implementation
        auto tab{ _GetStrongTabImpl(tabIndex) };
        tab->Shutdown();

-        uint32_t mruIndex;
-        if (_mruTabActions.IndexOf(_tabs.GetAt(tabIndex).SwitchToTabCommand(), mruIndex))
-        {
-            _mruTabActions.RemoveAt(mruIndex);
-            CommandPalette().SetTabActions(_mruTabActions);
-        }
-
        _tabs.RemoveAt(tabIndex);
        _tabView.TabItems().RemoveAt(tabIndex);
        _UpdateTabIndices();
@@ -1172,16 +1140,6 @@ namespace winrt::TerminalApp::implementation
                {
                    page->_UpdateTitle(*tab);
                }
-                else if (args.PropertyName() == L"Content")
-                {
-                    if (tab == page->_GetFocusedTab())
-                    {
-                        page->_tabContent.Children().Clear();
-                        page->_tabContent.Children().Append(tab->Content());
-
-                        tab->SetFocused(true);
-                    }
-                }
            }
        });

@@ -1218,36 +1176,28 @@ namespace winrt::TerminalApp::implementation
    // - Sets focus to the tab to the right or left the currently selected tab.
    void TerminalPage::_SelectNextTab(const bool bMoveRight)
    {
-        if (CommandPalette().Visibility() == Visibility::Visible)
-        {
-            // If the tab switcher is currently open, don't change its mode.
-            // Just select the new tab.
-            CommandPalette().SelectNextItem(bMoveRight);
-            return;
-        }
-
-        if (_settings.GlobalSettings().UseTabSwitcher())
-        {
-            CommandPalette().SetTabActions(_mruTabActions);
-
-            // Since ATS is always MRU, our focused tab index is always 0.
-            // So, going next should go to index 1, and going prev should wrap to the end.
-            uint32_t tabCount = _mruTabActions.Size();
-            auto newTabIndex = ((tabCount + (bMoveRight ? 1 : -1)) % tabCount);
-
-            // Otherwise, set up the tab switcher in the selected mode, with
-            // the given ordering, and make it visible.
-            CommandPalette().EnableTabSwitcherMode(false, newTabIndex);
-            CommandPalette().Visibility(Visibility::Visible);
-        }
-        else if (auto index{ _GetFocusedTabIndex() })
+        if (auto index{ _GetFocusedTabIndex() })
        {
            uint32_t tabCount = _tabs.Size();
            // Wraparound math. By adding tabCount and then calculating modulo tabCount,
            // we clamp the values to the range [0, tabCount) while still supporting moving
            // leftward from 0 to tabCount - 1.
-            auto newTabIndex = ((tabCount + *index + (bMoveRight ? 1 : -1)) % tabCount);
-            _SelectTab(newTabIndex);
+            const auto newTabIndex = ((tabCount + *index + (bMoveRight ? 1 : -1)) % tabCount);
+
+            if (_settings.GlobalSettings().UseTabSwitcher())
+            {
+                if (CommandPalette().Visibility() == Visibility::Visible)
+                {
+                    CommandPalette().SelectNextItem(bMoveRight);
+                }
+
+                CommandPalette().EnableTabSwitcherMode(false, newTabIndex);
+                CommandPalette().Visibility(Visibility::Visible);
+            }
+            else
+            {
+                _SelectTab(newTabIndex);
+            }
        }
    }

@@ -1302,10 +1252,9 @@ namespace winrt::TerminalApp::implementation
            // Remove the content from the tab first, so Pane::UnZoom can
            // re-attach the content to the tree w/in the pane
            _tabContent.Children().Clear();
-            // In ExitZoom, we'll change the Tab's Content(), triggering the
-            // content changed event, which will re-attach the tab's new content
-            // root to the tree.
            activeTab->ExitZoom();
+            // Re-attach the tab's content to the UI tree.
+            _tabContent.Children().Append(activeTab->GetRootElement());
        }
    }

@@ -1423,9 +1372,8 @@ namespace winrt::TerminalApp::implementation
    //   than one tab opened, show a warning dialog.
    void TerminalPage::CloseWindow()
    {
-        if (_tabs.Size() > 1 && _settings.GlobalSettings().ConfirmCloseAllTabs() && !_displayingCloseDialog)
+        if (_tabs.Size() > 1 && _settings.GlobalSettings().ConfirmCloseAllTabs())
        {
-            _displayingCloseDialog = true;
            _ShowCloseWarningDialog();
        }
        else
@@ -1471,12 +1419,12 @@ namespace winrt::TerminalApp::implementation
    // - newTerminalArgs: An object that may contain a blob of parameters to
    //   control which profile is created and with possible other
    //   configurations. See CascadiaSettings::BuildSettings for more details.
-    void TerminalPage::_SplitPane(const TerminalApp::SplitState splitType,
-                                  const TerminalApp::SplitType splitMode,
-                                  const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs)
+    void TerminalPage::_SplitPane(const SplitState splitType,
+                                  const SplitType splitMode,
+                                  const NewTerminalArgs& newTerminalArgs)
    {
        // Do nothing if we're requesting no split.
-        if (splitType == TerminalApp::SplitState::None)
+        if (splitType == SplitState::None)
        {
            return;
        }
@@ -1496,7 +1444,7 @@ namespace winrt::TerminalApp::implementation
            GUID realGuid;
            bool profileFound = false;

-            if (splitMode == TerminalApp::SplitType::Duplicate)
+            if (splitMode == SplitType::Duplicate)
            {
                std::optional<GUID> current_guid = focusedTab->GetFocusedProfile();
                if (current_guid)
@@ -1919,14 +1867,14 @@ namespace winrt::TerminalApp::implementation
        switch (target)
        {
        case SettingsTarget::DefaultsFile:
-            openFile(CascadiaSettings::GetDefaultSettingsPath());
+            openFile(CascadiaSettings::DefaultSettingsPath());
            break;
        case SettingsTarget::SettingsFile:
-            openFile(CascadiaSettings::GetSettingsPath());
+            openFile(CascadiaSettings::SettingsPath());
            break;
        case SettingsTarget::AllFiles:
-            openFile(CascadiaSettings::GetDefaultSettingsPath());
-            openFile(CascadiaSettings::GetSettingsPath());
+            openFile(CascadiaSettings::DefaultSettingsPath());
+            openFile(CascadiaSettings::SettingsPath());
            break;
        }
    }
@@ -1955,6 +1903,10 @@ namespace winrt::TerminalApp::implementation
                _rearrangeTo = eventArgs.Index();
            }
        }
+        else
+        {
+            _UpdateCommandsForPalette();
+        }

        _UpdateTabView();
    }
@@ -1993,7 +1945,7 @@ namespace winrt::TerminalApp::implementation
                auto tab{ _GetStrongTabImpl(index) };

                _tabContent.Children().Clear();
-                _tabContent.Children().Append(tab->Content());
+                _tabContent.Children().Append(tab->GetRootElement());

                // GH#7409: If the tab switcher is open, then we _don't_ want to
                // automatically focus the new tab here. The tab switcher wants
@@ -2008,7 +1960,6 @@ namespace winrt::TerminalApp::implementation
                if (CommandPalette().Visibility() != Visibility::Visible)
                {
                    tab->SetFocused(true);
-                    _UpdateMRUTab(index);
                }

                // Raise an event that our title changed
@@ -2080,20 +2031,6 @@ namespace winrt::TerminalApp::implementation
        _CloseAllTabs();
    }

-    // Method Description:
-    // - Called when the close button of the content dialog is clicked.
-    //   This resets the flag _displayingCloseDialog, which was set before
-    //   opening the dialog. Otherwise, the Terminal app would be closed
-    //   on the next close request without showing the warning dialog.
-    // Arguments:
-    // - sender: unused
-    // - ContentDialogButtonClickEventArgs: unused
-    void TerminalPage::_CloseWarningCloseButtonOnClick(WUX::Controls::ContentDialog /* sender */,
-                                                       WUX::Controls::ContentDialogButtonClickEventArgs /* eventArgs*/)
-    {
-        _displayingCloseDialog = false;
-    }
-
    // Method Description:
    // - Hook up keybindings, and refresh the UI of the terminal.
    //   This includes update the settings of all the tabs according
@@ -2157,10 +2094,15 @@ namespace winrt::TerminalApp::implementation
        // the alwaysOnTop setting will be lost.
        _isAlwaysOnTop = _settings.GlobalSettings().AlwaysOnTop();
        _alwaysOnTopChangedHandlers(*this, nullptr);
+
+        // Settings AllowDependentAnimations will affect whether animations are
+        // enabled application-wide, so we don't need to check it each time we
+        // want to create an animation.
+        WUX::Media::Animation::Timeline::AllowDependentAnimations(!_settings.GlobalSettings().DisableAnimations());
    }

    // This is a helper to aid in sorting commands by their `Name`s, alphabetically.
-    static bool _compareSchemeNames(const winrt::TerminalApp::ColorScheme& lhs, const winrt::TerminalApp::ColorScheme& rhs)
+    static bool _compareSchemeNames(const ColorScheme& lhs, const ColorScheme& rhs)
    {
        std::wstring leftName{ lhs.Name() };
        std::wstring rightName{ rhs.Name() };
@@ -2173,13 +2115,13 @@ namespace winrt::TerminalApp::implementation
    // - <none>
    // Return Value:
    // - <none>
-    IMap<winrt::hstring, winrt::TerminalApp::Command> TerminalPage::_ExpandCommands(IMapView<winrt::hstring, winrt::TerminalApp::Command> commandsToExpand,
-                                                                                    IVectorView<winrt::TerminalApp::Profile> profiles,
-                                                                                    IMapView<winrt::hstring, winrt::TerminalApp::ColorScheme> schemes)
+    IMap<winrt::hstring, Command> TerminalPage::_ExpandCommands(IMapView<winrt::hstring, Command> commandsToExpand,
+                                                                IVectorView<Profile> profiles,
+                                                                IMapView<winrt::hstring, ColorScheme> schemes)
    {
-        std::vector<TerminalApp::SettingsLoadWarnings> warnings;
+        IVector<SettingsLoadWarnings> warnings;

-        std::vector<winrt::TerminalApp::ColorScheme> sortedSchemes;
+        std::vector<ColorScheme> sortedSchemes;
        sortedSchemes.reserve(schemes.Size());

        for (const auto& nameAndScheme : schemes)
@@ -2190,7 +2132,7 @@ namespace winrt::TerminalApp::implementation
                  sortedSchemes.end(),
                  _compareSchemeNames);

-        IMap<winrt::hstring, winrt::TerminalApp::Command> copyOfCommands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
+        IMap<winrt::hstring, Command> copyOfCommands = winrt::single_threaded_map<winrt::hstring, Command>();
        for (const auto& nameAndCommand : commandsToExpand)
        {
            copyOfCommands.Insert(nameAndCommand.Key(), nameAndCommand.Value());
@@ -2198,7 +2140,7 @@ namespace winrt::TerminalApp::implementation

        Command::ExpandCommands(copyOfCommands,
                                profiles,
-                                sortedSchemes,
+                                { sortedSchemes },
                                warnings);

        return copyOfCommands;
@@ -2213,15 +2155,14 @@ namespace winrt::TerminalApp::implementation
    // - <none>
    void TerminalPage::_UpdateCommandsForPalette()
    {
-        IMap<winrt::hstring, winrt::TerminalApp::Command> copyOfCommands = _ExpandCommands(_settings.GlobalSettings().Commands(),
-                                                                                           _settings.Profiles().GetView(),
-                                                                                           _settings.GlobalSettings().ColorSchemes());
+        IMap<winrt::hstring, Command> copyOfCommands = _ExpandCommands(_settings.GlobalSettings().Commands(),
+                                                                       _settings.Profiles().GetView(),
+                                                                       _settings.GlobalSettings().ColorSchemes());

        _recursiveUpdateCommandKeybindingLabels(_settings, copyOfCommands.GetView());
-        _recursiveUpdateCommandIcons(copyOfCommands.GetView());

        // Update the command palette when settings reload
-        auto commandsCollection = winrt::single_threaded_vector<winrt::TerminalApp::Command>();
+        auto commandsCollection = winrt::single_threaded_vector<Command>();
        for (const auto& nameAndCommand : copyOfCommands)
        {
            commandsCollection.Append(nameAndCommand.Value());
@@ -2238,13 +2179,13 @@ namespace winrt::TerminalApp::implementation
    // - actions: a list of Actions to process on startup.
    // Return Value:
    // - <none>
-    void TerminalPage::SetStartupActions(std::vector<winrt::TerminalApp::ActionAndArgs>& actions)
+    void TerminalPage::SetStartupActions(std::vector<ActionAndArgs>& actions)
    {
        // The fastest way to copy all the actions out of the std::vector and
        // put them into a winrt::IVector is by making a copy, then moving the
        // copy into the winrt vector ctor.
        auto listCopy = actions;
-        _startupActions = winrt::single_threaded_vector<winrt::TerminalApp::ActionAndArgs>(std::move(listCopy));
+        _startupActions = winrt::single_threaded_vector<ActionAndArgs>(std::move(listCopy));
    }

    winrt::TerminalApp::IDialogPresenter TerminalPage::DialogPresenter() const
@@ -2270,15 +2211,6 @@ namespace winrt::TerminalApp::implementation
        {
            _newTabButton.Flyout().Hide();
        }
-
-        for (const auto& tab : _tabs)
-        {
-            auto tabImpl{ _GetStrongTabImpl(tab) };
-            if (tabImpl->GetTabViewItem().ContextFlyout())
-            {
-                tabImpl->GetTabViewItem().ContextFlyout().Hide();
-            }
-        }
    }

    // Method Description:
@@ -2522,7 +2454,7 @@ namespace winrt::TerminalApp::implementation
    // - args: the ExecuteCommandlineArgs to synthesize a list of startup actions for.
    // Return Value:
    // - an empty list if we failed to parse, otherwise a list of actions to execute.
-    std::vector<winrt::TerminalApp::ActionAndArgs> TerminalPage::ConvertExecuteCommandlineToActions(const TerminalApp::ExecuteCommandlineArgs& args)
+    std::vector<ActionAndArgs> TerminalPage::ConvertExecuteCommandlineToActions(const ExecuteCommandlineArgs& args)
    {
        if (!args || args.Commandline().empty())
        {
@@ -2563,7 +2495,6 @@ namespace winrt::TerminalApp::implementation
        if (auto index{ _GetFocusedTabIndex() })
        {
            _GetStrongTabImpl(index.value())->SetFocused(true);
-            _UpdateMRUTab(index.value());
        }
    }

@@ -2598,101 +2529,13 @@ namespace winrt::TerminalApp::implementation
    // - <none>
    void TerminalPage::_UpdateTabIndices()
    {
-        for (uint32_t i = 0; i < _tabs.Size(); ++i)
+        const uint32_t size = _tabs.Size();
+        for (uint32_t i = 0; i < size; ++i)
        {
-            _GetStrongTabImpl(i)->UpdateTabViewIndex(i);
+            _GetStrongTabImpl(i)->UpdateTabViewIndex(i, size);
        }
    }

-    // Method Description:
-    // - Bumps the tab in its in-order index up to the top of the mru list.
-    // Arguments:
-    // - index: the in-order index of the tab to bump.
-    // Return Value:
-    // - <none>
-    void TerminalPage::_UpdateMRUTab(const uint32_t index)
-    {
-        uint32_t mruIndex;
-        auto command = _tabs.GetAt(index).SwitchToTabCommand();
-        if (_mruTabActions.IndexOf(command, mruIndex))
-        {
-            if (mruIndex > 0)
-            {
-                _mruTabActions.RemoveAt(mruIndex);
-                _mruTabActions.InsertAt(0, command);
-                CommandPalette().SetTabActions(_mruTabActions);
-            }
-        }
-    }
-
-    // Method Description:
-    // - Displays a dialog stating the "Touch Keyboard and Handwriting Panel
-    //   Service" is disabled.
-    void TerminalPage::ShowKeyboardServiceWarning()
-    {
-        if (auto presenter{ _dialogPresenter.get() })
-        {
-            presenter.ShowDialog(FindName(L"KeyboardServiceDisabledDialog").try_as<WUX::Controls::ContentDialog>());
-        }
-    }
-
-    // Function Description:
-    // - Helper function to get the OS-localized name for the "Touch Keyboard
-    //   and Handwriting Panel Service". If we can't open up the service for any
-    //   reason, then we'll just return the service's key, "TabletInputService".
-    // Return Value:
-    // - The OS-localized name for the TabletInputService
-    winrt::hstring _getTabletServiceName()
-    {
-        auto isUwp = false;
-        try
-        {
-            isUwp = ::winrt::Windows::UI::Xaml::Application::Current().as<::winrt::TerminalApp::App>().Logic().IsUwp();
-        }
-        CATCH_LOG();
-
-        if (isUwp)
-        {
-            return winrt::hstring{ TabletInputServiceKey };
-        }
-
-        wil::unique_schandle hManager{ OpenSCManager(nullptr, nullptr, 0) };
-
-        if (LOG_LAST_ERROR_IF(!hManager.is_valid()))
-        {
-            return winrt::hstring{ TabletInputServiceKey };
-        }
-
-        DWORD cchBuffer = 0;
-        GetServiceDisplayName(hManager.get(), TabletInputServiceKey.data(), nullptr, &cchBuffer);
-        std::wstring buffer;
-        cchBuffer += 1; // Add space for a null
-        buffer.resize(cchBuffer);
-
-        if (LOG_LAST_ERROR_IF(!GetServiceDisplayName(hManager.get(),
-                                                     TabletInputServiceKey.data(),
-                                                     buffer.data(),
-                                                     &cchBuffer)))
-        {
-            return winrt::hstring{ TabletInputServiceKey };
-        }
-        return winrt::hstring{ buffer };
-    }
-
-    // Method Description:
-    // - Return the fully-formed warning message for the
-    //   "KeyboardServiceDisabled" dialog. This dialog is used to warn the user
-    //   if the keyboard service is disabled, and uses the OS localization for
-    //   the service's actual name. It's bound to the dialog in XAML.
-    // Return Value:
-    // - The warning message, including the OS-localized service name.
-    winrt::hstring TerminalPage::KeyboardServiceDisabledText()
-    {
-        const winrt::hstring serviceName{ _getTabletServiceName() };
-        const winrt::hstring text{ fmt::format(std::wstring_view(RS_(L"KeyboardServiceWarningText")), serviceName) };
-        return text;
-    }
-
    // -------------------------------- WinRT Events ---------------------------------
    // Winrt events need a method for adding a callback to the event and removing the callback.
    // These macros will define them both for you.
--- a/src/cascadia/TerminalApp/TerminalPage.h
+++ b/src/cascadia/TerminalApp/TerminalPage.h
@@ -5,8 +5,6 @@

 #include "TerminalPage.g.h"
 #include "Tab.h"
-#include "CascadiaSettings.h"
-#include "Profile.h"
 #include "AppKeyBindings.h"
 #include "TerminalSettings.h"

@@ -14,8 +12,6 @@

 #include "AppCommandlineArgs.h"

-static constexpr std::wstring_view TabletInputServiceKey{ L"TabletInputService" };
-
 // fwdecl unittest classes
 namespace TerminalAppLocalTests
 {
@@ -37,7 +33,7 @@ namespace winrt::TerminalApp::implementation
    public:
        TerminalPage();

-        winrt::fire_and_forget SetSettings(TerminalApp::CascadiaSettings settings, bool needRefreshUI);
+        winrt::fire_and_forget SetSettings(Microsoft::Terminal::Settings::Model::CascadiaSettings settings, bool needRefreshUI);

        void Create();

@@ -61,15 +57,12 @@ namespace winrt::TerminalApp::implementation
        bool Fullscreen() const;
        bool AlwaysOnTop() const;

-        void SetStartupActions(std::vector<winrt::TerminalApp::ActionAndArgs>& actions);
-        static std::vector<winrt::TerminalApp::ActionAndArgs> ConvertExecuteCommandlineToActions(const TerminalApp::ExecuteCommandlineArgs& args);
+        void SetStartupActions(std::vector<Microsoft::Terminal::Settings::Model::ActionAndArgs>& actions);
+        static std::vector<Microsoft::Terminal::Settings::Model::ActionAndArgs> ConvertExecuteCommandlineToActions(const Microsoft::Terminal::Settings::Model::ExecuteCommandlineArgs& args);

        winrt::TerminalApp::IDialogPresenter DialogPresenter() const;
        void DialogPresenter(winrt::TerminalApp::IDialogPresenter dialogPresenter);

-        void ShowKeyboardServiceWarning();
-        winrt::hstring KeyboardServiceDisabledText();
-
        // -------------------------------- WinRT Events ---------------------------------
        DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(TitleChanged, _titleChangeHandlers, winrt::Windows::Foundation::IInspectable, winrt::hstring);
        DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(LastTabClosed, _lastTabClosedHandlers, winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::LastTabClosedEventArgs);
@@ -93,10 +86,9 @@ namespace winrt::TerminalApp::implementation
        Windows::UI::Xaml::Controls::Grid _tabContent{ nullptr };
        Microsoft::UI::Xaml::Controls::SplitButton _newTabButton{ nullptr };

-        TerminalApp::CascadiaSettings _settings{ nullptr };
+        Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };

        Windows::Foundation::Collections::IObservableVector<TerminalApp::Tab> _tabs;
-        Windows::Foundation::Collections::IVector<TerminalApp::Command> _mruTabActions;
        winrt::com_ptr<Tab> _GetStrongTabImpl(const uint32_t index) const;
        winrt::com_ptr<Tab> _GetStrongTabImpl(const ::winrt::TerminalApp::Tab& tab) const;
        void _UpdateTabIndices();
@@ -118,8 +110,8 @@ namespace winrt::TerminalApp::implementation
        winrt::Windows::UI::Xaml::Controls::Grid::LayoutUpdated_revoker _layoutUpdatedRevoker;
        StartupState _startupState{ StartupState::NotInitialized };

-        Windows::Foundation::Collections::IVector<winrt::TerminalApp::ActionAndArgs> _startupActions;
-        winrt::fire_and_forget _ProcessStartupActions(Windows::Foundation::Collections::IVector<winrt::TerminalApp::ActionAndArgs> actions, const bool initial);
+        Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::ActionAndArgs> _startupActions;
+        winrt::fire_and_forget _ProcessStartupActions(Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::ActionAndArgs> actions, const bool initial);

        void _ShowAboutDialog();
        void _ShowCloseWarningDialog();
@@ -128,19 +120,17 @@ namespace winrt::TerminalApp::implementation

        void _CreateNewTabFlyout();
        void _OpenNewTabDropdown();
-        void _OpenNewTab(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs);
+        void _OpenNewTab(const Microsoft::Terminal::Settings::Model::NewTerminalArgs& newTerminalArgs);
        void _CreateNewTabFromSettings(GUID profileGuid, TerminalApp::TerminalSettings settings);
        winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection _CreateConnectionFromSettings(GUID profileGuid, TerminalApp::TerminalSettings settings);

-        bool _displayingCloseDialog{ false };
        void _SettingsButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
        void _FeedbackButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
        void _AboutButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
        void _CloseWarningPrimaryButtonOnClick(Windows::UI::Xaml::Controls::ContentDialog sender, Windows::UI::Xaml::Controls::ContentDialogButtonClickEventArgs eventArgs);
-        void _CloseWarningCloseButtonOnClick(Windows::UI::Xaml::Controls::ContentDialog sender, Windows::UI::Xaml::Controls::ContentDialogButtonClickEventArgs eventArgs);
        void _ThirdPartyNoticesOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);

-        void _HookupKeyBindings(const TerminalApp::KeyMapping& keymap) noexcept;
+        void _HookupKeyBindings(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap) noexcept;
        void _RegisterActionCallbacks();

        void _UpdateTitle(const Tab& tab);
@@ -148,9 +138,9 @@ namespace winrt::TerminalApp::implementation
        void _UpdateTabView();
        void _UpdateTabWidthMode();
        void _UpdateCommandsForPalette();
-        static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::TerminalApp::Command> _ExpandCommands(Windows::Foundation::Collections::IMapView<winrt::hstring, winrt::TerminalApp::Command> commandsToExpand,
-                                                                                                                          Windows::Foundation::Collections::IVectorView<winrt::TerminalApp::Profile> profiles,
-                                                                                                                          Windows::Foundation::Collections::IMapView<winrt::hstring, winrt::TerminalApp::ColorScheme> schemes);
+        static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, Microsoft::Terminal::Settings::Model::Command> _ExpandCommands(Windows::Foundation::Collections::IMapView<winrt::hstring, Microsoft::Terminal::Settings::Model::Command> commandsToExpand,
+                                                                                                                                            Windows::Foundation::Collections::IVectorView<Microsoft::Terminal::Settings::Model::Profile> profiles,
+                                                                                                                                            Windows::Foundation::Collections::IMapView<winrt::hstring, Microsoft::Terminal::Settings::Model::ColorScheme> schemes);

        void _DuplicateTabViewItem();
        void _RemoveTabViewItem(const Microsoft::UI::Xaml::Controls::TabViewItem& tabViewItem);
@@ -160,7 +150,7 @@ namespace winrt::TerminalApp::implementation

        void _SelectNextTab(const bool bMoveRight);
        bool _SelectTab(const uint32_t tabIndex);
-        void _MoveFocus(const Direction& direction);
+        void _MoveFocus(const Microsoft::Terminal::Settings::Model::Direction& direction);

        winrt::Microsoft::Terminal::TerminalControl::TermControl _GetActiveControl();
        std::optional<uint32_t> _GetFocusedTabIndex() const noexcept;
@@ -175,8 +165,8 @@ namespace winrt::TerminalApp::implementation
        // Todo: add more event implementations here
        // MSFT:20641986: Add keybindings for New Window
        void _Scroll(int delta);
-        void _SplitPane(const winrt::TerminalApp::SplitState splitType, const winrt::TerminalApp::SplitType splitMode = winrt::TerminalApp::SplitType::Manual, const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs = nullptr);
-        void _ResizePane(const Direction& direction);
+        void _SplitPane(const Microsoft::Terminal::Settings::Model::SplitState splitType, const Microsoft::Terminal::Settings::Model::SplitType splitMode = Microsoft::Terminal::Settings::Model::SplitType::Manual, const Microsoft::Terminal::Settings::Model::NewTerminalArgs& newTerminalArgs = nullptr);
+        void _ResizePane(const Microsoft::Terminal::Settings::Model::Direction& direction);
        void _ScrollPage(int delta);
        void _SetAcceleratorForMenuItem(Windows::UI::Xaml::Controls::MenuFlyoutItem& menuItem, const winrt::Microsoft::Terminal::TerminalControl::KeyChord& keyChord);

@@ -190,7 +180,7 @@ namespace winrt::TerminalApp::implementation

        void _PasteText();

-        fire_and_forget _LaunchSettings(const winrt::TerminalApp::SettingsTarget target);
+        fire_and_forget _LaunchSettings(const Microsoft::Terminal::Settings::Model::SettingsTarget target);

        void _OnTabClick(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
        void _OnTabSelectionChanged(const IInspectable& sender, const Windows::UI::Xaml::Controls::SelectionChangedEventArgs& eventArgs);
@@ -215,48 +205,45 @@ namespace winrt::TerminalApp::implementation

        void _UnZoomIfNeeded();

-        void _UpdateTabSwitcherCommands(const bool mru);
-        void _UpdateMRUTab(const uint32_t index);
-
 #pragma region ActionHandlers
        // These are all defined in AppActionHandlers.cpp
-        void _HandleOpenNewTabDropdown(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleDuplicateTab(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleCloseTab(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleClosePane(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleScrollUp(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleScrollDown(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleNextTab(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandlePrevTab(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleSendInput(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleSplitPane(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleTogglePaneZoom(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleScrollUpPage(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleScrollDownPage(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleOpenSettings(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandlePasteText(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleNewTab(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleSwitchToTab(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleResizePane(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleMoveFocus(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleCopyText(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleCloseWindow(const IInspectable&, const TerminalApp::ActionEventArgs& args);
-        void _HandleAdjustFontSize(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleFind(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleResetFontSize(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleToggleRetroEffect(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleToggleFocusMode(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleToggleFullscreen(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleToggleAlwaysOnTop(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleSetColorScheme(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleSetTabColor(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleOpenTabColorPicker(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleRenameTab(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleExecuteCommandline(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleToggleCommandPalette(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleCloseOtherTabs(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleCloseTabsAfter(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
-        void _HandleOpenTabSearch(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
+        void _HandleOpenNewTabDropdown(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleDuplicateTab(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleCloseTab(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleClosePane(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleScrollUp(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleScrollDown(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleNextTab(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandlePrevTab(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleSendInput(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleSplitPane(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleTogglePaneZoom(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleScrollUpPage(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleScrollDownPage(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleOpenSettings(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandlePasteText(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleNewTab(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleSwitchToTab(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleResizePane(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleMoveFocus(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleCopyText(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleCloseWindow(const IInspectable&, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleAdjustFontSize(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleFind(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleResetFontSize(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleToggleRetroEffect(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleToggleFocusMode(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleToggleFullscreen(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleToggleAlwaysOnTop(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleSetColorScheme(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleSetTabColor(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleOpenTabColorPicker(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleRenameTab(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleExecuteCommandline(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleToggleCommandPalette(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleCloseOtherTabs(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleCloseTabsAfter(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
+        void _HandleOpenTabSearch(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
        // Make sure to hook new actions up in _RegisterActionCallbacks!
 #pragma endregion

--- a/src/cascadia/TerminalApp/TerminalPage.idl
+++ b/src/cascadia/TerminalApp/TerminalPage.idl
@@ -26,8 +26,6 @@ namespace TerminalApp
        // that there's only one application-global dialog visible at a time,
        // and because of GH#5224.
        IDialogPresenter DialogPresenter;
-        void ShowKeyboardServiceWarning();
-        String KeyboardServiceDisabledText { get; };

        event Windows.Foundation.TypedEventHandler<Object, String> TitleChanged;
        event Windows.Foundation.TypedEventHandler<Object, LastTabClosedEventArgs> LastTabClosed;
--- a/src/cascadia/TerminalApp/TerminalPage.xaml
+++ b/src/cascadia/TerminalApp/TerminalPage.xaml
@@ -51,8 +51,7 @@ the MIT License. See LICENSE in the project root for license information. -->
            x:Name="CloseAllDialog"
            x:Uid="CloseAllDialog"
            DefaultButton="Primary"
-            PrimaryButtonClick="_CloseWarningPrimaryButtonOnClick"
-            CloseButtonClick="_CloseWarningCloseButtonOnClick">
+            PrimaryButtonClick="_CloseWarningPrimaryButtonOnClick">
        </ContentDialog>

        <ContentDialog
@@ -83,20 +82,6 @@ the MIT License. See LICENSE in the project root for license information. -->
            </TextBlock>
        </ContentDialog>

-
-        <ContentDialog
-            x:Load="False"
-            x:Name="KeyboardServiceDisabledDialog"
-            x:Uid="KeyboardServiceDisabledDialog"
-            DefaultButton="Primary">
-
-            <TextBlock
-                Foreground="{ThemeResource ErrorTextBrush}"
-                IsTextSelectionEnabled="True"
-                TextWrapping="WrapWholeWords"
-                Text="{x:Bind KeyboardServiceDisabledText, Mode=OneWay}" />
-        </ContentDialog>
-
        <local:CommandPalette
            x:Name="CommandPalette"
            Grid.Row="1"
--- a/src/cascadia/TerminalApp/TerminalSettings.cpp
+++ b/src/cascadia/TerminalApp/TerminalSettings.cpp
@@ -7,10 +7,11 @@
 #include "TerminalSettings.g.cpp"

 using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings::Model;

 namespace winrt::TerminalApp::implementation
 {
-    TerminalSettings::TerminalSettings(const TerminalApp::CascadiaSettings& appSettings, winrt::guid profileGuid, const IKeyBindings& keybindings) :
+    TerminalSettings::TerminalSettings(const CascadiaSettings& appSettings, winrt::guid profileGuid, const IKeyBindings& keybindings) :
        _KeyBindings{ keybindings }
    {
        const auto profile = appSettings.FindProfile(profileGuid);
@@ -38,8 +39,8 @@ namespace winrt::TerminalApp::implementation
    // - keybindings: the keybinding handler
    // Return Value:
    // - the GUID of the created profile, and a fully initialized TerminalSettings object
-    std::tuple<guid, TerminalApp::TerminalSettings> TerminalSettings::BuildSettings(const TerminalApp::CascadiaSettings& appSettings,
-                                                                                    const TerminalApp::NewTerminalArgs& newTerminalArgs,
+    std::tuple<guid, TerminalApp::TerminalSettings> TerminalSettings::BuildSettings(const CascadiaSettings& appSettings,
+                                                                                    const NewTerminalArgs& newTerminalArgs,
                                                                                    const IKeyBindings& keybindings)
    {
        const guid profileGuid = appSettings.GetProfileForArgs(newTerminalArgs);
@@ -72,7 +73,7 @@ namespace winrt::TerminalApp::implementation
    // - schemes: a map of schemes to look for our color scheme in, if we have one.
    // Return Value:
    // - <none>
-    void TerminalSettings::_ApplyProfileSettings(const TerminalApp::Profile& profile, const Windows::Foundation::Collections::IMapView<winrt::hstring, TerminalApp::ColorScheme>& schemes)
+    void TerminalSettings::_ApplyProfileSettings(const Profile& profile, const Windows::Foundation::Collections::IMapView<winrt::hstring, ColorScheme>& schemes)
    {
        // Fill in the Terminal Setting's CoreSettings from the profile
        _HistorySize = profile.HistorySize();
@@ -161,7 +162,7 @@ namespace winrt::TerminalApp::implementation
    // - globalSettings: the global property values we're applying.
    // Return Value:
    // - <none>
-    void TerminalSettings::_ApplyGlobalSettings(const TerminalApp::GlobalAppSettings& globalSettings) noexcept
+    void TerminalSettings::_ApplyGlobalSettings(const GlobalAppSettings& globalSettings) noexcept
    {
        _InitialRows = globalSettings.InitialRows();
        _InitialCols = globalSettings.InitialCols();
@@ -180,7 +181,7 @@ namespace winrt::TerminalApp::implementation
    // - scheme: the ColorScheme we are applying to the TerminalSettings object
    // Return Value:
    // - <none>
-    void TerminalSettings::ApplyColorScheme(const TerminalApp::ColorScheme& scheme)
+    void TerminalSettings::ApplyColorScheme(const ColorScheme& scheme)
    {
        _DefaultForeground = til::color{ scheme.Foreground() };
        _DefaultBackground = til::color{ scheme.Background() };
--- a/src/cascadia/TerminalApp/TerminalSettings.h
+++ b/src/cascadia/TerminalApp/TerminalSettings.h
@@ -19,8 +19,6 @@ Author(s):
 #include <DefaultSettings.h>
 #include <conattrs.hpp>

-#include "CascadiaSettings.h"
-
 // fwdecl unittest classes
 namespace TerminalAppLocalTests
 {
@@ -32,15 +30,15 @@ namespace winrt::TerminalApp::implementation
    struct TerminalSettings : TerminalSettingsT<TerminalSettings>
    {
        TerminalSettings() = default;
-        TerminalSettings(const TerminalApp::CascadiaSettings& appSettings,
+        TerminalSettings(const Microsoft::Terminal::Settings::Model::CascadiaSettings& appSettings,
                         guid profileGuid,
                         const Microsoft::Terminal::TerminalControl::IKeyBindings& keybindings);

-        static std::tuple<guid, TerminalApp::TerminalSettings> BuildSettings(const TerminalApp::CascadiaSettings& appSettings,
-                                                                             const TerminalApp::NewTerminalArgs& newTerminalArgs,
+        static std::tuple<guid, TerminalApp::TerminalSettings> BuildSettings(const Microsoft::Terminal::Settings::Model::CascadiaSettings& appSettings,
+                                                                             const Microsoft::Terminal::Settings::Model::NewTerminalArgs& newTerminalArgs,
                                                                             const Microsoft::Terminal::TerminalControl::IKeyBindings& keybindings);

-        void ApplyColorScheme(const TerminalApp::ColorScheme& scheme);
+        void ApplyColorScheme(const Microsoft::Terminal::Settings::Model::ColorScheme& scheme);

 // TECHNICALLY, the hstring copy assignment can throw, but the GETSET_PROPERTY
 // macro defines the operator as `noexcept`. We're not really worried about it,
@@ -118,8 +116,8 @@ namespace winrt::TerminalApp::implementation
    private:
        std::array<uint32_t, COLOR_TABLE_SIZE> _colorTable{};

-        void _ApplyProfileSettings(const TerminalApp::Profile& profile, const Windows::Foundation::Collections::IMapView<hstring, TerminalApp::ColorScheme>& schemes);
-        void _ApplyGlobalSettings(const TerminalApp::GlobalAppSettings& globalSettings) noexcept;
+        void _ApplyProfileSettings(const Microsoft::Terminal::Settings::Model::Profile& profile, const Windows::Foundation::Collections::IMapView<hstring, Microsoft::Terminal::Settings::Model::ColorScheme>& schemes);
+        void _ApplyGlobalSettings(const Microsoft::Terminal::Settings::Model::GlobalAppSettings& globalSettings) noexcept;

        friend class TerminalAppLocalTests::SettingsTests;
    };
--- a/src/cascadia/TerminalApp/Utils.cpp
+++ b/src/cascadia/TerminalApp/Utils.cpp
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "Utils.h"
-
-std::wstring VisualizeControlCodes(std::wstring str) noexcept
-{
-    for (auto& ch : str)
-    {
-        if (ch < 0x20)
-        {
-            ch += 0x2400;
-        }
-        else if (ch == 0x20)
-        {
-            ch = 0x2423; // replace space with ␣
-        }
-        else if (ch == 0x7f)
-        {
-            ch = 0x2421; // replace del with ␡
-        }
-    }
-    return str;
-}
--- a/src/cascadia/TerminalApp/Utils.h
+++ b/src/cascadia/TerminalApp/Utils.h
@@ -1,124 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
- Utils.h
-
-Abstract:
- Helpers for the TerminalApp project
-Author(s):
- Mike Griese - May 2019
-
--*/
-#pragma once
-
-// Method Description:
-// - Create a std::string from a string_view. We do this because we can't look
-//   up a key in a Json::Value with a string_view directly, so instead we'll use
-//   this helper. Should a string_view lookup ever be added to jsoncpp, we can
-//   remove this entirely.
-// Arguments:
-// - key: the string_view to build a string from
-// Return Value:
-// - a std::string to use for looking up a value from a Json::Value
-inline std::string JsonKey(const std::string_view key)
-{
-    return static_cast<std::string>(key);
-}
-
-// This is a pair of helpers for determining if a pair of guids are equal, and
-// establishing an ordering on GUIDs (via std::less).
-namespace std
-{
-    template<>
-    struct less<GUID>
-    {
-        bool operator()(const GUID& lhs, const GUID& rhs) const
-        {
-            return memcmp(&lhs, &rhs, sizeof(rhs)) < 0;
-        }
-    };
-
-    template<>
-    struct equal_to<GUID>
-    {
-        bool operator()(const GUID& lhs, const GUID& rhs) const
-        {
-            return memcmp(&lhs, &rhs, sizeof(rhs)) == 0;
-        }
-    };
-}
-
-namespace winrt::Microsoft::UI::Xaml::Controls
-{
-    struct IconSource;
-    struct BitmapIconSource;
-}
-
-namespace winrt::Windows::UI::Xaml::Controls
-{
-    struct IconSource;
-    struct BitmapIconSource;
-}
-
-namespace Microsoft::TerminalApp::details
-{
-    // This is a template that helps us figure out which BitmapIconSource to use for a given IconSource.
-    // We have to do this because some of our code still wants to use WUX IconSources.
-    template<typename TIconSource>
-    struct BitmapIconSource
-    {
-    };
-
-    template<>
-    struct BitmapIconSource<winrt::Microsoft::UI::Xaml::Controls::IconSource>
-    {
-        using type = winrt::Microsoft::UI::Xaml::Controls::BitmapIconSource;
-    };
-
-    template<>
-    struct BitmapIconSource<winrt::Windows::UI::Xaml::Controls::IconSource>
-    {
-        using type = winrt::Windows::UI::Xaml::Controls::BitmapIconSource;
-    };
-}
-
-// Method Description:
-// - Creates an IconElement for the given path. The icon returned is a colored
-//   icon. If we couldn't create the icon for any reason, we return an empty
-//   IconElement.
-// Template Types:
-// - <TIconSource>: The type of IconSource (MUX, WUX) to generate.
-// Arguments:
-// - path: the full, expanded path to the icon.
-// Return Value:
-// - An IconElement with its IconSource set, if possible.
-template<typename TIconSource>
-TIconSource GetColoredIcon(const winrt::hstring& path)
-{
-    if (!path.empty())
-    {
-        try
-        {
-            winrt::Windows::Foundation::Uri iconUri{ path };
-            ::Microsoft::TerminalApp::details::BitmapIconSource<TIconSource>::type iconSource;
-            // Make sure to set this to false, so we keep the RGB data of the
-            // image. Otherwise, the icon will be white for all the
-            // non-transparent pixels in the image.
-            iconSource.ShowAsMonochrome(false);
-            iconSource.UriSource(iconUri);
-            return iconSource;
-        }
-        CATCH_LOG();
-    }
-
-    return nullptr;
-}
-
-std::wstring VisualizeControlCodes(std::wstring str) noexcept;
-
-inline std::wstring VisualizeControlCodes(std::wstring_view str) noexcept
-{
-    return VisualizeControlCodes(std::wstring{ str });
-}
--- a/src/cascadia/TerminalApp/dll/TerminalApp.vcxproj
+++ b/src/cascadia/TerminalApp/dll/TerminalApp.vcxproj
@@ -69,6 +69,7 @@
    include Settings and Connection, since Control will include them for us) -->
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />
    <!-- Reference TerminalAppLib here, so we can use it's TerminalApp.winmd as
    our TerminalApp.winmd. This didn't work correctly in VS2017, you'd need to
    manually reference the lib -->
--- a/src/cascadia/TerminalApp/pch.h
+++ b/src/cascadia/TerminalApp/pch.h
@@ -37,11 +37,13 @@
 #include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
 #include <winrt/Windows.UI.Xaml.Data.h>
 #include <winrt/Windows.ui.xaml.media.h>
+#include <winrt/Windows.UI.Xaml.Media.Animation.h>
 #include <winrt/Windows.ui.xaml.input.h>
 #include <winrt/Windows.UI.Xaml.Hosting.h>
 #include "winrt/Windows.UI.Xaml.Markup.h"
 #include "winrt/Windows.UI.Xaml.Documents.h"
 #include "winrt/Windows.UI.Xaml.Automation.h"
+#include "winrt/Windows.UI.ViewManagement.h"
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.ApplicationModel.DataTransfer.h>

@@ -61,12 +63,11 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
 #include <telemetry\ProjectTelemetry.h>
 #include <TraceLoggingActivity.h>

-// JsonCpp
-#include <json.h>
-
 #include <shellapi.h>

+#include <winrt/Microsoft.Terminal.TerminalControl.h>
 #include <winrt/Microsoft.Terminal.TerminalConnection.h>
+#include <winrt/Microsoft.Terminal.Settings.Model.h>
 #include <winrt/Windows.UI.Popups.h>

 #include <CLI11/CLI11.hpp>
--- a/src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj
+++ b/src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj
@@ -11,6 +11,7 @@
    <OpenConsoleUniversalApp>false</OpenConsoleUniversalApp>
    <ApplicationType>Windows Store</ApplicationType>
    <NoOutputRedirection>true</NoOutputRedirection>
+    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
  </PropertyGroup>

  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
--- a/src/cascadia/TerminalConnection/AzureConnection.cpp
+++ b/src/cascadia/TerminalConnection/AzureConnection.cpp
@@ -31,6 +31,8 @@ static constexpr auto HttpUserAgent = L"Terminal/0.0";
 static constexpr int USER_INPUT_COLOR = 93; // yellow - the color of something the user can type
 static constexpr int USER_INFO_COLOR = 97; // white - the color of clarifying information

+static constexpr winrt::guid AzureConnectionType = { 0xd9fcfdfa, 0xa479, 0x412c, { 0x83, 0xb7, 0xc5, 0x64, 0xe, 0x61, 0xcd, 0x62 } };
+
 static inline std::wstring _colorize(const unsigned int colorCode, const std::wstring_view text)
 {
    return fmt::format(L"\x1b[{0}m{1}\x1b[m", colorCode, text);
@@ -56,6 +58,11 @@ static inline std::wstring _formatTenant(int tenantNumber, const Tenant& tenant)

 namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 {
+    winrt::guid AzureConnection::ConnectionType() noexcept
+    {
+        return AzureConnectionType;
+    }
+
    // This function exists because the clientID only gets added by the release pipelines
    // and is not available on local builds, so we want to be able to make sure we don't
    // try to make an Azure connection if its a local build
--- a/src/cascadia/TerminalConnection/AzureConnection.h
+++ b/src/cascadia/TerminalConnection/AzureConnection.h
@@ -19,6 +19,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 {
    struct AzureConnection : AzureConnectionT<AzureConnection>, ConnectionStateHolder<AzureConnection>
    {
+        static winrt::guid ConnectionType() noexcept;
        static bool IsAzureConnectionAvailable() noexcept;
        AzureConnection(const uint32_t rows, const uint32_t cols);

--- a/src/cascadia/TerminalConnection/AzureConnection.idl
+++ b/src/cascadia/TerminalConnection/AzureConnection.idl
@@ -7,6 +7,7 @@ namespace Microsoft.Terminal.TerminalConnection
 {
    [default_interface] runtimeclass AzureConnection : ITerminalConnection
    {
+        static Guid ConnectionType { get; };
        static Boolean IsAzureConnectionAvailable();

        AzureConnection(UInt32 rows, UInt32 columns);
--- a/src/cascadia/TerminalConnection/ConptyConnection.cpp
+++ b/src/cascadia/TerminalConnection/ConptyConnection.cpp
@@ -6,6 +6,7 @@
 #include "ConptyConnection.h"

 #include <windows.h>
+#include <userenv.h>

 #include "ConptyConnection.g.cpp"

@@ -93,8 +94,11 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
            environment.clear();
        });

-        // Populate the environment map with the current environment.
-        RETURN_IF_FAILED(Utils::UpdateEnvironmentMapW(environment));
+        {
+            const auto newEnvironmentBlock{ Utils::CreateEnvironmentBlock() };
+            // Populate the environment map with the current environment.
+            RETURN_IF_FAILED(Utils::UpdateEnvironmentMapW(environment, newEnvironmentBlock.get()));
+        }

        {
            // Convert connection Guid to string and ignore the enclosing '{}'.
--- a/src/cascadia/TerminalControl/TermControl.cpp
+++ b/src/cascadia/TerminalControl/TermControl.cpp
@@ -83,6 +83,9 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation

        _terminal = std::make_unique<::Microsoft::Terminal::Core::Terminal>();

+        auto pfnWarningBell = std::bind(&TermControl::_TerminalWarningBell, this);
+        _terminal->SetWarningBellCallback(pfnWarningBell);
+
        auto pfnTitleChanged = std::bind(&TermControl::_TerminalTitleChanged, this, std::placeholders::_1);
        _terminal->SetTitleChangedCallback(pfnTitleChanged);

@@ -892,7 +895,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
        // keybindings on the keyUp, then we'll still send the keydown to the
        // connected terminal application, and something like ctrl+shift+T will
        // emit a ^T to the pipe.
-        if (!modifiers.IsAltGrPressed() && keyDown && _TryHandleKeyBinding(vkey, scanCode, modifiers))
+        if (!modifiers.IsAltGrPressed() && keyDown && _TryHandleKeyBinding(vkey, modifiers))
        {
            e.Handled(true);
            return;
@@ -914,9 +917,8 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
    // - Attempt to handle this key combination as a key binding
    // Arguments:
    // - vkey: The vkey of the key pressed.
-    // - scanCode: The scan code of the key pressed.
    // - modifiers: The ControlKeyStates representing the modifier key states.
-    bool TermControl::_TryHandleKeyBinding(const WORD vkey, const WORD scanCode, ::Microsoft::Terminal::Core::ControlKeyStates modifiers) const
+    bool TermControl::_TryHandleKeyBinding(const WORD vkey, ::Microsoft::Terminal::Core::ControlKeyStates modifiers) const
    {
        auto bindings = _settings.KeyBindings();
        if (!bindings)
@@ -924,44 +926,12 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
            return false;
        }

-        auto success = bindings.TryKeyChord({
+        return bindings.TryKeyChord({
            modifiers.IsCtrlPressed(),
            modifiers.IsAltPressed(),
            modifiers.IsShiftPressed(),
            vkey,
        });
-        if (!success)
-        {
-            return false;
-        }
-
-        // Let's assume the user has bound the dead key "^" to a sendInput command that sends "b".
-        // If the user presses the two keys "^a" it'll produce "bâ", despite us marking the key event as handled.
-        // The following is used to manually "consume" such dead keys and clear them from the keyboard state.
-        _ClearKeyboardState(vkey, scanCode);
-        return true;
-    }
-
-    // Method Description:
-    // - Discards currently pressed dead keys.
-    // Arguments:
-    // - vkey: The vkey of the key pressed.
-    // - scanCode: The scan code of the key pressed.
-    void TermControl::_ClearKeyboardState(const WORD vkey, const WORD scanCode) const noexcept
-    {
-        std::array<BYTE, 256> keyState;
-        if (!GetKeyboardState(keyState.data()))
-        {
-            return;
-        }
-
-        // As described in "Sometimes you *want* to interfere with the keyboard's state buffer":
-        //   http://archives.miloush.net/michkap/archive/2006/09/10/748775.html
-        // > "The key here is to keep trying to pass stuff to ToUnicode until -1 is not returned."
-        std::array<wchar_t, 16> buffer;
-        while (ToUnicodeEx(vkey, scanCode, keyState.data(), buffer.data(), gsl::narrow_cast<int>(buffer.size()), 0b1, nullptr) < 0)
-        {
-        }
    }

    // Method Description:
@@ -971,7 +941,6 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
    // - Makes the cursor briefly visible during typing.
    // Arguments:
    // - vkey: The vkey of the key pressed.
-    // - scanCode: The scan code of the key pressed.
    // - states: The Microsoft::Terminal::Core::ControlKeyStates representing the modifier key states.
    // - keyDown: If true, the key was pressed, otherwise the key was released.
    bool TermControl::_TrySendKeyEvent(const WORD vkey,
@@ -2207,6 +2176,11 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
        }
    }

+    void TermControl::_TerminalWarningBell()
+    {
+        _WarningBellHandlers(*this, nullptr);
+    }
+
    void TermControl::_TerminalTitleChanged(const std::wstring_view& wstr)
    {
        _titleChangedHandlers(winrt::hstring{ wstr });
@@ -2969,20 +2943,10 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
    // - Checks if the uri is valid and sends an event if so
    // Arguments:
    // - The uri
-    winrt::fire_and_forget TermControl::_HyperlinkHandler(const std::wstring_view uri)
+    void TermControl::_HyperlinkHandler(const std::wstring_view uri)
    {
-        // Save things we need to resume later.
-        winrt::hstring heldUri{ uri };
-        auto strongThis{ get_strong() };
-
-        // Pop the rest of this function to the tail of the UI thread
-        // Just in case someone was holding a lock when they called us and
-        // the handlers decide to do something that take another lock
-        // (like ShellExecute pumping our messaging thread...GH#7994)
-        co_await Dispatcher();
-
-        auto hyperlinkArgs = winrt::make_self<OpenHyperlinkEventArgs>(heldUri);
-        _openHyperlinkHandlers(*strongThis, *hyperlinkArgs);
+        auto hyperlinkArgs = winrt::make_self<OpenHyperlinkEventArgs>(winrt::hstring{ uri });
+        _openHyperlinkHandlers(*this, *hyperlinkArgs);
    }

    // Method Description:
--- a/src/cascadia/TerminalControl/TermControl.h
+++ b/src/cascadia/TerminalControl/TermControl.h
@@ -149,6 +149,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
        DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(CopyToClipboard,     _clipboardCopyHandlers,     TerminalControl::TermControl, TerminalControl::CopyToClipboardEventArgs);
        DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(OpenHyperlink, _openHyperlinkHandlers, TerminalControl::TermControl, TerminalControl::OpenHyperlinkEventArgs);

+        TYPED_EVENT(WarningBell, IInspectable, IInspectable);
        TYPED_EVENT(ConnectionStateChanged, TerminalControl::TermControl, IInspectable);
        TYPED_EVENT(Initialized, TerminalControl::TermControl, Windows::UI::Xaml::RoutedEventArgs);
        TYPED_EVENT(TabColorChanged, IInspectable, IInspectable);
@@ -249,7 +250,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
        void _LostFocusHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
        winrt::fire_and_forget _DragDropHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::DragEventArgs const e);
        void _DragOverHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::DragEventArgs const& e);
-        winrt::fire_and_forget _HyperlinkHandler(const std::wstring_view uri);
+        void _HyperlinkHandler(const std::wstring_view uri);

        void _CursorTimerTick(Windows::Foundation::IInspectable const& sender, Windows::Foundation::IInspectable const& e);
        void _BlinkTimerTick(Windows::Foundation::IInspectable const& sender, Windows::Foundation::IInspectable const& e);
@@ -261,6 +262,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
        void _SwapChainScaleChanged(Windows::UI::Xaml::Controls::SwapChainPanel const& sender, Windows::Foundation::IInspectable const& args);
        void _DoResizeUnderLock(const double newWidth, const double newHeight);
        void _RefreshSizeUnderLock();
+        void _TerminalWarningBell();
        void _TerminalTitleChanged(const std::wstring_view& wstr);
        void _TerminalTabColorChanged(const std::optional<til::color> color);
        void _CopyToClipboard(const std::wstring_view& wstr);
@@ -283,8 +285,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation

        void _KeyHandler(Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e, const bool keyDown);
        ::Microsoft::Terminal::Core::ControlKeyStates _GetPressedModifierKeys() const;
-        bool _TryHandleKeyBinding(const WORD vkey, const WORD scanCode, ::Microsoft::Terminal::Core::ControlKeyStates modifiers) const;
-        void _ClearKeyboardState(const WORD vkey, const WORD scanCode) const noexcept;
+        bool _TryHandleKeyBinding(const WORD vkey, ::Microsoft::Terminal::Core::ControlKeyStates modifiers) const;
        bool _TrySendKeyEvent(const WORD vkey, const WORD scanCode, ::Microsoft::Terminal::Core::ControlKeyStates modifiers, const bool keyDown);
        bool _TrySendMouseEvent(Windows::UI::Input::PointerPoint const& point);
        bool _CanSendVTMouseInput();
--- a/src/cascadia/TerminalControl/TermControl.idl
+++ b/src/cascadia/TerminalControl/TermControl.idl
@@ -60,6 +60,7 @@ namespace Microsoft.Terminal.TerminalControl
        event Windows.Foundation.TypedEventHandler<TermControl, CopyToClipboardEventArgs> CopyToClipboard;
        event Windows.Foundation.TypedEventHandler<TermControl, PasteFromClipboardEventArgs> PasteFromClipboard;
        event Windows.Foundation.TypedEventHandler<TermControl, OpenHyperlinkEventArgs> OpenHyperlink;
+        event Windows.Foundation.TypedEventHandler<Object, Object> WarningBell;

        event Windows.Foundation.TypedEventHandler<TermControl, Windows.UI.Xaml.RoutedEventArgs> Initialized;
        // This is an event handler forwarder for the underlying connection.
--- a/src/cascadia/TerminalCore/ITerminalApi.hpp
+++ b/src/cascadia/TerminalCore/ITerminalApi.hpp
@@ -34,6 +34,7 @@ namespace Microsoft::Terminal::Core
        virtual bool EraseInLine(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::EraseType eraseType) noexcept = 0;
        virtual bool EraseInDisplay(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::EraseType eraseType) noexcept = 0;

+        virtual bool WarningBell() noexcept = 0;
        virtual bool SetWindowTitle(std::wstring_view title) noexcept = 0;

        virtual bool SetColorTableEntry(const size_t tableIndex, const DWORD color) noexcept = 0;
--- a/src/cascadia/TerminalCore/Terminal.cpp
+++ b/src/cascadia/TerminalCore/Terminal.cpp
@@ -9,6 +9,7 @@
 #include "../../inc/DefaultSettings.h"
 #include "../../inc/argb.h"
 #include "../../types/inc/utils.hpp"
+#include "../../types/inc/colorTable.hpp"

 #include <winrt/Microsoft.Terminal.TerminalControl.h>

@@ -471,20 +472,15 @@ bool Terminal::SendKeyEvent(const WORD vkey,

    _StoreKeyEvent(vkey, scanCode);

-    // Certain applications like AutoHotKey and its keyboard remapping feature,
-    // send us key events using SendInput() whose values are outside of the valid range.
+    // As a Terminal we're mostly interested in getting key events from physical hardware (mouse & keyboard).
+    // We're thus ignoring events whose values are outside the valid range and unlikely to be generated by the current keyboard.
+    // It's very likely that a proper followup character event will be sent to us.
+    // This prominently happens using AutoHotKey's keyboard remapping feature,
+    // which sends input events whose vkey is 0xff and scanCode is 0.
+    // We need to check for this early, as _CharacterFromKeyEvent() always returns 0 for such invalid values,
+    // making us believe that this is an actual non-character input, while it usually isn't.
    // GH#7064
-    if (vkey == 0 || vkey >= 0xff)
-    {
-        return false;
-    }
-
-    // While not explicitly permitted, a wide range of software, including Windows' own touch keyboard,
-    // sets the wScan member of the KEYBDINPUT structure to 0, resulting in scanCode being 0 as well.
-    // --> Alternatively get the scanCode from the vkey if possible.
-    // GH#7495
-    const auto sc = scanCode ? scanCode : _ScanCodeFromVirtualKey(vkey);
-    if (sc == 0)
+    if (vkey == 0 || vkey >= 0xff || scanCode == 0)
    {
        return false;
    }
@@ -510,7 +506,7 @@ bool Terminal::SendKeyEvent(const WORD vkey,
    // is the underlying ASCII character (e.g. A-Z) on the keyboard in our case.
    // See GH#5525/GH#6211 for more details
    const auto isSuppressedAltGrAlias = !_altGrAliasing && states.IsAltPressed() && states.IsCtrlPressed() && !states.IsAltGrPressed();
-    const auto ch = isSuppressedAltGrAlias ? UNICODE_NULL : _CharacterFromKeyEvent(vkey, sc, states);
+    const auto ch = isSuppressedAltGrAlias ? UNICODE_NULL : _CharacterFromKeyEvent(vkey, scanCode, states);

    // Delegate it to the character event handler if this key event can be
    // mapped to one (see method description above). For Alt+key combinations
@@ -525,7 +521,7 @@ bool Terminal::SendKeyEvent(const WORD vkey,
        return false;
    }

-    KeyEvent keyEv{ keyDown, 1, vkey, sc, ch, states.Value() };
+    KeyEvent keyEv{ keyDown, 1, vkey, scanCode, ch, states.Value() };
    return _terminalInput->HandleKey(&keyEv);
 }

@@ -642,6 +638,8 @@ WORD Terminal::_VirtualKeyFromCharacter(const wchar_t ch) noexcept
 wchar_t Terminal::_CharacterFromKeyEvent(const WORD vkey, const WORD scanCode, const ControlKeyStates states) noexcept
 try
 {
+    const auto sc = scanCode != 0 ? scanCode : _ScanCodeFromVirtualKey(vkey);
+
    // We might want to use GetKeyboardState() instead of building our own keyState.
    // The question is whether that's necessary though. For now it seems to work fine as it is.
    std::array<BYTE, 256> keyState = {};
@@ -660,7 +658,7 @@ try
    // * If bit 0 is set, a menu is active.
    //   If this flag is not specified ToUnicodeEx will send us character events on certain Alt+Key combinations (e.g. Alt+Arrow-Up).
    // * If bit 2 is set, keyboard state is not changed (Windows 10, version 1607 and newer)
-    const auto result = ToUnicodeEx(vkey, scanCode, keyState.data(), buffer.data(), gsl::narrow_cast<int>(buffer.size()), 0b101, nullptr);
+    const auto result = ToUnicodeEx(vkey, sc, keyState.data(), buffer.data(), gsl::narrow_cast<int>(buffer.size()), 0b101, nullptr);

    // TODO:GH#2853 We're only handling single UTF-16 code points right now, since that's the only thing KeyEvent supports.
    return result == 1 || result == -1 ? buffer.at(0) : 0;
@@ -968,6 +966,11 @@ void Terminal::SetWriteInputCallback(std::function<void(std::wstring&)> pfn) noe
    _pfnWriteInput.swap(pfn);
 }

+void Terminal::SetWarningBellCallback(std::function<void()> pfn) noexcept
+{
+    _pfnWarningBell.swap(pfn);
+}
+
 void Terminal::SetTitleChangedCallback(std::function<void(const std::wstring_view&)> pfn) noexcept
 {
    _pfnTitleChanged.swap(pfn);
--- a/src/cascadia/TerminalCore/Terminal.hpp
+++ b/src/cascadia/TerminalCore/Terminal.hpp
@@ -90,6 +90,7 @@ public:
    bool EraseCharacters(const size_t numChars) noexcept override;
    bool EraseInLine(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::EraseType eraseType) noexcept override;
    bool EraseInDisplay(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::EraseType eraseType) noexcept override;
+    bool WarningBell() noexcept override;
    bool SetWindowTitle(std::wstring_view title) noexcept override;
    bool SetColorTableEntry(const size_t tableIndex, const COLORREF color) noexcept override;
    bool SetCursorStyle(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle cursorStyle) noexcept override;
@@ -175,6 +176,7 @@ public:
 #pragma endregion

    void SetWriteInputCallback(std::function<void(std::wstring&)> pfn) noexcept;
+    void SetWarningBellCallback(std::function<void()> pfn) noexcept;
    void SetTitleChangedCallback(std::function<void(const std::wstring_view&)> pfn) noexcept;
    void SetTabColorChangedCallback(std::function<void(const std::optional<til::color>)> pfn) noexcept;
    void SetCopyToClipboardCallback(std::function<void(const std::wstring_view&)> pfn) noexcept;
@@ -207,6 +209,7 @@ public:

 private:
    std::function<void(std::wstring&)> _pfnWriteInput;
+    std::function<void()> _pfnWarningBell;
    std::function<void(const std::wstring_view&)> _pfnTitleChanged;
    std::function<void(const std::wstring_view&)> _pfnCopyToClipboard;
    std::function<void(const int, const int, const int)> _pfnScrollPositionChanged;
--- a/src/cascadia/TerminalCore/TerminalApi.cpp
+++ b/src/cascadia/TerminalCore/TerminalApi.cpp
@@ -249,7 +249,7 @@ try
        startPos.X = viewport.Left();
        nlength = viewport.RightExclusive() - startPos.X;
        break;
-    case DispatchTypes::EraseType::Scrollback:
+    default:
        return false;
    }

@@ -345,6 +345,14 @@ try
 }
 CATCH_LOG_RETURN_FALSE()

+bool Terminal::WarningBell() noexcept
+try
+{
+    _pfnWarningBell();
+    return true;
+}
+CATCH_LOG_RETURN_FALSE()
+
 bool Terminal::SetWindowTitle(std::wstring_view title) noexcept
 try
 {
@@ -574,7 +582,7 @@ CATCH_LOG_RETURN_FALSE()
 bool Terminal::AddHyperlink(std::wstring_view uri, std::wstring_view params) noexcept
 {
    auto attr = _buffer->GetCurrentAttributes();
-    const auto id = _buffer->GetHyperlinkId(uri, params);
+    const auto id = _buffer->GetHyperlinkId(params);
    attr.SetHyperlinkId(id);
    _buffer->SetCurrentAttributes(attr);
    _buffer->AddHyperlinkToMap(uri, id);
--- a/src/cascadia/TerminalCore/TerminalDispatch.cpp
+++ b/src/cascadia/TerminalCore/TerminalDispatch.cpp
@@ -109,6 +109,13 @@ try
 }
 CATCH_LOG_RETURN_FALSE()

+bool TerminalDispatch::WarningBell() noexcept
+try
+{
+    return _terminalApi.WarningBell();
+}
+CATCH_LOG_RETURN_FALSE()
+
 bool TerminalDispatch::CarriageReturn() noexcept
 try
 {
@@ -361,14 +368,14 @@ bool TerminalDispatch::EnableAlternateScroll(const bool enabled) noexcept
    return true;
 }

-bool TerminalDispatch::SetPrivateModes(const gsl::span<const DispatchTypes::PrivateModeParams> params) noexcept
+bool TerminalDispatch::SetPrivateMode(const DispatchTypes::PrivateModeParams param) noexcept
 {
-    return _SetResetPrivateModes(params, true);
+    return _PrivateModeParamsHelper(param, true);
 }

-bool TerminalDispatch::ResetPrivateModes(const gsl::span<const DispatchTypes::PrivateModeParams> params) noexcept
+bool TerminalDispatch::ResetPrivateMode(const DispatchTypes::PrivateModeParams param) noexcept
 {
-    return _SetResetPrivateModes(params, false);
+    return _PrivateModeParamsHelper(param, false);
 }

 // Method Description:
@@ -392,32 +399,10 @@ bool TerminalDispatch::EndHyperlink() noexcept
    return _terminalApi.EndHyperlink();
 }

-// Routine Description:
-// - Generalized handler for the setting/resetting of DECSET/DECRST parameters.
-//     All params in the rgParams will attempt to be executed, even if one
-//     fails, to allow us to successfully re/set params that are chained with
-//     params we don't yet support.
-// Arguments:
-// - params - array of params to set/reset
-// - enable - True for set, false for unset.
-// Return Value:
-// - True if ALL params were handled successfully. False otherwise.
-bool TerminalDispatch::_SetResetPrivateModes(const gsl::span<const DispatchTypes::PrivateModeParams> params, const bool enable) noexcept
-{
-    // because the user might chain together params we don't support with params we DO support, execute all
-    // params in the sequence, and only return failure if we failed at least one of them
-    size_t failures = 0;
-    for (const auto& p : params)
-    {
-        failures += _PrivateModeParamsHelper(p, enable) ? 0 : 1; // increment the number of failures if we fail.
-    }
-    return failures == 0;
-}
-
 // Routine Description:
 // - Support routine for routing private mode parameters to be set/reset as flags
 // Arguments:
-// - params - array of params to set/reset
+// - param - mode parameter to set/reset
 // - enable - True for set, false for unset.
 // Return Value:
 // - True if handled successfully. False otherwise.
@@ -496,8 +481,7 @@ bool TerminalDispatch::SoftReset() noexcept
    //     success = _pConApi->SetConsoleOutputCP(_initialCodePage.value()) && success;
    // }

-    const auto opt = DispatchTypes::GraphicsOptions::Off;
-    success = SetGraphicsRendition({ &opt, 1 }) && success; // Normal rendition.
+    success = SetGraphicsRendition({}) && success; // Normal rendition.

    // // Reset the saved cursor state.
    // // Note that XTerm only resets the main buffer state, but that
--- a/src/cascadia/TerminalCore/TerminalDispatch.hpp
+++ b/src/cascadia/TerminalCore/TerminalDispatch.hpp
@@ -13,7 +13,7 @@ public:
    void Print(const wchar_t wchPrintable) noexcept override;
    void PrintString(const std::wstring_view string) noexcept override;

-    bool SetGraphicsRendition(const gsl::span<const ::Microsoft::Console::VirtualTerminal::DispatchTypes::GraphicsOptions> options) noexcept override;
+    bool SetGraphicsRendition(const ::Microsoft::Console::VirtualTerminal::VTParameters options) noexcept override;

    bool CursorPosition(const size_t line,
                        const size_t column) noexcept override; // CUP
@@ -30,6 +30,7 @@ public:
    bool LineFeed(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::LineFeedType lineFeedType) noexcept override;

    bool EraseCharacters(const size_t numChars) noexcept override;
+    bool WarningBell() noexcept override;
    bool CarriageReturn() noexcept override;
    bool SetWindowTitle(std::wstring_view title) noexcept override;

@@ -60,8 +61,8 @@ public:
    bool EnableAnyEventMouseMode(const bool enabled) noexcept override; // ?1003
    bool EnableAlternateScroll(const bool enabled) noexcept override; // ?1007

-    bool SetPrivateModes(const gsl::span<const ::Microsoft::Console::VirtualTerminal::DispatchTypes::PrivateModeParams> /*params*/) noexcept override; // DECSET
-    bool ResetPrivateModes(const gsl::span<const ::Microsoft::Console::VirtualTerminal::DispatchTypes::PrivateModeParams> /*params*/) noexcept override; // DECRST
+    bool SetPrivateMode(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::PrivateModeParams /*param*/) noexcept override; // DECSET
+    bool ResetPrivateMode(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::PrivateModeParams /*param*/) noexcept override; // DECRST

    bool AddHyperlink(const std::wstring_view uri, const std::wstring_view params) noexcept override;
    bool EndHyperlink() noexcept override;
@@ -69,10 +70,9 @@ public:
 private:
    ::Microsoft::Terminal::Core::ITerminalApi& _terminalApi;

-    size_t _SetRgbColorsHelper(const gsl::span<const ::Microsoft::Console::VirtualTerminal::DispatchTypes::GraphicsOptions> options,
+    size_t _SetRgbColorsHelper(const ::Microsoft::Console::VirtualTerminal::VTParameters options,
                               TextAttribute& attr,
                               const bool isForeground) noexcept;

-    bool _SetResetPrivateModes(const gsl::span<const ::Microsoft::Console::VirtualTerminal::DispatchTypes::PrivateModeParams> params, const bool enable) noexcept;
    bool _PrivateModeParamsHelper(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::PrivateModeParams param, const bool enable) noexcept;
 };
--- a/src/cascadia/TerminalCore/TerminalDispatchGraphics.cpp
+++ b/src/cascadia/TerminalCore/TerminalDispatchGraphics.cpp
@@ -41,43 +41,39 @@ const BYTE BRIGHT_WHITE   = BRIGHT_ATTR | RED_ATTR | GREEN_ATTR | BLUE_ATTR;
 // - isForeground - Whether or not the parsed color is for the foreground.
 // Return Value:
 // - The number of options consumed, not including the initial 38/48.
-size_t TerminalDispatch::_SetRgbColorsHelper(const gsl::span<const DispatchTypes::GraphicsOptions> options,
+size_t TerminalDispatch::_SetRgbColorsHelper(const VTParameters options,
                                             TextAttribute& attr,
                                             const bool isForeground) noexcept
 {
-    size_t optionsConsumed = 0;
-    if (options.size() >= 1)
+    size_t optionsConsumed = 1;
+    const DispatchTypes::GraphicsOptions typeOpt = options.at(0);
+    if (typeOpt == DispatchTypes::GraphicsOptions::RGBColorOrFaint)
    {
-        optionsConsumed = 1;
-        const auto typeOpt = til::at(options, 0);
-        if (typeOpt == DispatchTypes::GraphicsOptions::RGBColorOrFaint && options.size() >= 4)
+        optionsConsumed = 4;
+        const size_t red = options.at(1).value_or(0);
+        const size_t green = options.at(2).value_or(0);
+        const size_t blue = options.at(3).value_or(0);
+        // ensure that each value fits in a byte
+        if (red <= 255 && green <= 255 && blue <= 255)
        {
-            optionsConsumed = 4;
-            const size_t red = til::at(options, 1);
-            const size_t green = til::at(options, 2);
-            const size_t blue = til::at(options, 3);
-            // ensure that each value fits in a byte
-            if (red <= 255 && green <= 255 && blue <= 255)
-            {
-                const COLORREF rgbColor = RGB(red, green, blue);
-                attr.SetColor(rgbColor, isForeground);
-            }
+            const COLORREF rgbColor = RGB(red, green, blue);
+            attr.SetColor(rgbColor, isForeground);
        }
-        else if (typeOpt == DispatchTypes::GraphicsOptions::BlinkOrXterm256Index && options.size() >= 2)
+    }
+    else if (typeOpt == DispatchTypes::GraphicsOptions::BlinkOrXterm256Index)
+    {
+        optionsConsumed = 2;
+        const size_t tableIndex = options.at(1).value_or(0);
+        if (tableIndex <= 255)
        {
-            optionsConsumed = 2;
-            const size_t tableIndex = til::at(options, 1);
-            if (tableIndex <= 255)
+            const auto adjustedIndex = gsl::narrow_cast<BYTE>(tableIndex);
+            if (isForeground)
            {
-                const auto adjustedIndex = gsl::narrow_cast<BYTE>(tableIndex);
-                if (isForeground)
-                {
-                    attr.SetIndexedForeground256(adjustedIndex);
-                }
-                else
-                {
-                    attr.SetIndexedBackground256(adjustedIndex);
-                }
+                attr.SetIndexedForeground256(adjustedIndex);
+            }
+            else
+            {
+                attr.SetIndexedBackground256(adjustedIndex);
            }
        }
    }
@@ -94,14 +90,14 @@ size_t TerminalDispatch::_SetRgbColorsHelper(const gsl::span<const DispatchTypes
 //   one at a time by setting or removing flags in the font style properties.
 // Return Value:
 // - True if handled successfully. False otherwise.
-bool TerminalDispatch::SetGraphicsRendition(const gsl::span<const DispatchTypes::GraphicsOptions> options) noexcept
+bool TerminalDispatch::SetGraphicsRendition(const VTParameters options) noexcept
 {
    TextAttribute attr = _terminalApi.GetTextAttributes();

    // Run through the graphics options and apply them
    for (size_t i = 0; i < options.size(); i++)
    {
-        const auto opt = til::at(options, i);
+        const GraphicsOptions opt = options.at(i);
        switch (opt)
        {
        case Off:
--- a/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp
+++ b/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp
@@ -51,9 +51,9 @@ static constexpr std::string_view ActionKey{ "action" };
 // This key is reserved to remove a keybinding, instead of mapping it to an action.
 static constexpr std::string_view UnboundKey{ "unbound" };

-namespace winrt::TerminalApp::implementation
+namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 {
-    using namespace ::TerminalApp;
+    using namespace ::Microsoft::Terminal::Settings::Model;

    // Specifically use a map here over an unordered_map. We want to be able to
    // iterate over these entries in-order when we're serializing the keybindings.
@@ -105,7 +105,7 @@ namespace winrt::TerminalApp::implementation
        { UnboundKey, ShortcutAction::Invalid },
    };

-    using ParseResult = std::tuple<IActionArgs, std::vector<TerminalApp::SettingsLoadWarnings>>;
+    using ParseResult = std::tuple<IActionArgs, std::vector<SettingsLoadWarnings>>;
    using ParseActionFunction = std::function<ParseResult(const Json::Value&)>;

    // This is a map of ShortcutAction->function<IActionArgs(Json::Value)>. It holds
@@ -169,7 +169,7 @@ namespace winrt::TerminalApp::implementation
    // - a deserialized ActionAndArgs corresponding to the values in json, or
    //   null if we failed to deserialize an action.
    winrt::com_ptr<ActionAndArgs> ActionAndArgs::FromJson(const Json::Value& json,
-                                                          std::vector<TerminalApp::SettingsLoadWarnings>& warnings)
+                                                          std::vector<SettingsLoadWarnings>& warnings)
    {
        // Invalid is our placeholder that the action was not parsed.
        ShortcutAction action = ShortcutAction::Invalid;
@@ -208,7 +208,7 @@ namespace winrt::TerminalApp::implementation
        // does, we'll try to deserialize any "args" that were provided with
        // the binding.
        IActionArgs args{ nullptr };
-        std::vector<TerminalApp::SettingsLoadWarnings> parseWarnings;
+        std::vector<Microsoft::Terminal::Settings::Model::SettingsLoadWarnings> parseWarnings;
        const auto deserializersIter = argParsers.find(action);
        if (deserializersIter != argParsers.end())
        {
--- a/src/cascadia/TerminalSettingsModel/ActionAndArgs.h
+++ b/src/cascadia/TerminalSettingsModel/ActionAndArgs.h
@@ -1,25 +1,33 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
 #pragma once
+
 #include "ActionAndArgs.g.h"
 #include "TerminalWarnings.h"
 #include "..\inc\cppwinrt_utils.h"

-namespace winrt::TerminalApp::implementation
+namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 {
    struct ActionAndArgs : public ActionAndArgsT<ActionAndArgs>
    {
        static const std::map<std::string_view, ShortcutAction, std::less<>> ActionKeyNamesMap;
        static winrt::com_ptr<ActionAndArgs> FromJson(const Json::Value& json,
-                                                      std::vector<TerminalApp::SettingsLoadWarnings>& warnings);
+                                                      std::vector<SettingsLoadWarnings>& warnings);

        ActionAndArgs() = default;
+        ActionAndArgs(ShortcutAction action, IActionArgs args) :
+            _Action{ action },
+            _Args{ args } {};
+
        hstring GenerateName() const;

-        GETSET_PROPERTY(TerminalApp::ShortcutAction, Action, TerminalApp::ShortcutAction::Invalid);
+        GETSET_PROPERTY(ShortcutAction, Action, ShortcutAction::Invalid);
        GETSET_PROPERTY(IActionArgs, Args, nullptr);
    };
 }

-namespace winrt::TerminalApp::factory_implementation
+namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation
 {
    BASIC_FACTORY(ActionAndArgs);
 }
--- a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp
+++ b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp
@@ -20,14 +20,14 @@
 #include "SetTabColorArgs.g.cpp"
 #include "RenameTabArgs.g.cpp"
 #include "ExecuteCommandlineArgs.g.cpp"
-
-#include "Utils.h"
+#include "CloseOtherTabsArgs.g.cpp"
+#include "CloseTabsAfterArgs.g.cpp"

 #include <LibraryResources.h>

 using namespace winrt::Microsoft::Terminal::TerminalControl;

-namespace winrt::TerminalApp::implementation
+namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 {
    winrt::hstring NewTerminalArgs::GenerateName() const
    {
@@ -212,7 +212,7 @@ namespace winrt::TerminalApp::implementation
        // The string will be similar to the following:
        // * "Send Input: ...input..."

-        auto escapedInput = VisualizeControlCodes(_Input);
+        auto escapedInput = til::visualize_control_codes(_Input);
        auto name = fmt::format(std::wstring_view(RS_(L"SendInputCommandKey")), escapedInput);
        return winrt::hstring{ name };
    }
--- a/src/cascadia/TerminalSettingsModel/ActionArgs.h
+++ b/src/cascadia/TerminalSettingsModel/ActionArgs.h
@@ -24,7 +24,6 @@
 #include "CloseTabsAfterArgs.g.h"

 #include "../../cascadia/inc/cppwinrt_utils.h"
-#include "Utils.h"
 #include "JsonUtils.h"
 #include "TerminalWarnings.h"

@@ -36,16 +35,16 @@
 // * ActionEventArgs holds a single IActionArgs. For events that don't need
 //   additional args, this can be nullptr.

-namespace winrt::TerminalApp::implementation
+namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 {
-    using namespace ::TerminalApp;
-    using FromJsonResult = std::tuple<winrt::TerminalApp::IActionArgs, std::vector<TerminalApp::SettingsLoadWarnings>>;
+    using namespace ::Microsoft::Terminal::Settings::Model;
+    using FromJsonResult = std::tuple<Model::IActionArgs, std::vector<SettingsLoadWarnings>>;

    struct ActionEventArgs : public ActionEventArgsT<ActionEventArgs>
    {
        ActionEventArgs() = default;

-        explicit ActionEventArgs(const TerminalApp::IActionArgs& args) :
+        explicit ActionEventArgs(const Model::IActionArgs& args) :
            _ActionArgs{ args } {};
        GETSET_PROPERTY(IActionArgs, ActionArgs, nullptr);
        GETSET_PROPERTY(bool, Handled, false);
@@ -54,6 +53,8 @@ namespace winrt::TerminalApp::implementation
    struct NewTerminalArgs : public NewTerminalArgsT<NewTerminalArgs>
    {
        NewTerminalArgs() = default;
+        NewTerminalArgs(int32_t& profileIndex) :
+            _ProfileIndex{ profileIndex } {};
        GETSET_PROPERTY(winrt::hstring, Commandline, L"");
        GETSET_PROPERTY(winrt::hstring, StartingDirectory, L"");
        GETSET_PROPERTY(winrt::hstring, TabTitle, L"");
@@ -69,7 +70,7 @@ namespace winrt::TerminalApp::implementation
    public:
        hstring GenerateName() const;

-        bool Equals(const winrt::TerminalApp::NewTerminalArgs& other)
+        bool Equals(const Model::NewTerminalArgs& other)
        {
            return other.Commandline() == _Commandline &&
                   other.StartingDirectory() == _StartingDirectory &&
@@ -77,7 +78,7 @@ namespace winrt::TerminalApp::implementation
                   other.ProfileIndex() == _ProfileIndex &&
                   other.Profile() == _Profile;
        };
-        static winrt::TerminalApp::NewTerminalArgs FromJson(const Json::Value& json)
+        static Model::NewTerminalArgs FromJson(const Json::Value& json)
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<NewTerminalArgs>();
@@ -94,7 +95,7 @@ namespace winrt::TerminalApp::implementation
    {
        CopyTextArgs() = default;
        GETSET_PROPERTY(bool, SingleLine, false);
-        GETSET_PROPERTY(Windows::Foundation::IReference<Microsoft::Terminal::TerminalControl::CopyFormat>, CopyFormatting, nullptr);
+        GETSET_PROPERTY(Windows::Foundation::IReference<TerminalControl::CopyFormat>, CopyFormatting, nullptr);

        static constexpr std::string_view SingleLineKey{ "singleLine" };
        static constexpr std::string_view CopyFormattingKey{ "copyFormatting" };
@@ -125,7 +126,9 @@ namespace winrt::TerminalApp::implementation
    struct NewTabArgs : public NewTabArgsT<NewTabArgs>
    {
        NewTabArgs() = default;
-        GETSET_PROPERTY(winrt::TerminalApp::NewTerminalArgs, TerminalArgs, nullptr);
+        NewTabArgs(const Model::NewTerminalArgs& terminalArgs) :
+            _TerminalArgs{ terminalArgs } {};
+        GETSET_PROPERTY(Model::NewTerminalArgs, TerminalArgs, nullptr);

    public:
        hstring GenerateName() const;
@@ -151,6 +154,8 @@ namespace winrt::TerminalApp::implementation
    struct SwitchToTabArgs : public SwitchToTabArgsT<SwitchToTabArgs>
    {
        SwitchToTabArgs() = default;
+        SwitchToTabArgs(uint32_t& tabIndex) :
+            _TabIndex{ tabIndex } {};
        GETSET_PROPERTY(uint32_t, TabIndex, 0);

        static constexpr std::string_view TabIndexKey{ "index" };
@@ -179,7 +184,7 @@ namespace winrt::TerminalApp::implementation
    struct ResizePaneArgs : public ResizePaneArgsT<ResizePaneArgs>
    {
        ResizePaneArgs() = default;
-        GETSET_PROPERTY(TerminalApp::Direction, Direction, TerminalApp::Direction::None);
+        GETSET_PROPERTY(Model::Direction, Direction, Direction::None);

        static constexpr std::string_view DirectionKey{ "direction" };

@@ -200,9 +205,9 @@ namespace winrt::TerminalApp::implementation
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<ResizePaneArgs>();
            JsonUtils::GetValueForKey(json, DirectionKey, args->_Direction);
-            if (args->_Direction == TerminalApp::Direction::None)
+            if (args->_Direction == Direction::None)
            {
-                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { SettingsLoadWarnings::MissingRequiredParameter } };
            }
            else
            {
@@ -214,10 +219,7 @@ namespace winrt::TerminalApp::implementation
    struct MoveFocusArgs : public MoveFocusArgsT<MoveFocusArgs>
    {
        MoveFocusArgs() = default;
-        MoveFocusArgs(TerminalApp::Direction direction) :
-            _Direction{ direction } {};
-
-        GETSET_PROPERTY(TerminalApp::Direction, Direction, TerminalApp::Direction::None);
+        GETSET_PROPERTY(Model::Direction, Direction, Direction::None);

        static constexpr std::string_view DirectionKey{ "direction" };

@@ -238,9 +240,9 @@ namespace winrt::TerminalApp::implementation
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<MoveFocusArgs>();
            JsonUtils::GetValueForKey(json, DirectionKey, args->_Direction);
-            if (args->_Direction == TerminalApp::Direction::None)
+            if (args->_Direction == Direction::None)
            {
-                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { SettingsLoadWarnings::MissingRequiredParameter } };
            }
            else
            {
@@ -302,7 +304,7 @@ namespace winrt::TerminalApp::implementation
            JsonUtils::GetValueForKey(json, InputKey, args->_Input);
            if (args->_Input.empty())
            {
-                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { SettingsLoadWarnings::MissingRequiredParameter } };
            }
            return { *args, {} };
        }
@@ -311,14 +313,12 @@ namespace winrt::TerminalApp::implementation
    struct SplitPaneArgs : public SplitPaneArgsT<SplitPaneArgs>
    {
        SplitPaneArgs() = default;
-        SplitPaneArgs(winrt::TerminalApp::SplitState style, const winrt::TerminalApp::NewTerminalArgs& terminalArgs) :
+        SplitPaneArgs(SplitState style, const Model::NewTerminalArgs& terminalArgs) :
            _SplitStyle{ style },
            _TerminalArgs{ terminalArgs } {};
-        SplitPaneArgs(SplitType splitMode) :
-            _SplitMode{ splitMode } {};
-        GETSET_PROPERTY(winrt::TerminalApp::SplitState, SplitStyle, winrt::TerminalApp::SplitState::Automatic);
-        GETSET_PROPERTY(winrt::TerminalApp::NewTerminalArgs, TerminalArgs, nullptr);
-        GETSET_PROPERTY(winrt::TerminalApp::SplitType, SplitMode, winrt::TerminalApp::SplitType::Manual);
+        GETSET_PROPERTY(SplitState, SplitStyle, SplitState::Automatic);
+        GETSET_PROPERTY(Model::NewTerminalArgs, TerminalArgs, nullptr);
+        GETSET_PROPERTY(SplitType, SplitMode, SplitType::Manual);

        static constexpr std::string_view SplitKey{ "split" };
        static constexpr std::string_view SplitModeKey{ "splitMode" };
@@ -352,7 +352,7 @@ namespace winrt::TerminalApp::implementation
    struct OpenSettingsArgs : public OpenSettingsArgsT<OpenSettingsArgs>
    {
        OpenSettingsArgs() = default;
-        GETSET_PROPERTY(TerminalApp::SettingsTarget, Target, TerminalApp::SettingsTarget::SettingsFile);
+        GETSET_PROPERTY(SettingsTarget, Target, SettingsTarget::SettingsFile);

        static constexpr std::string_view TargetKey{ "target" };

@@ -403,7 +403,7 @@ namespace winrt::TerminalApp::implementation
            JsonUtils::GetValueForKey(json, NameKey, args->_SchemeName);
            if (args->_SchemeName.empty())
            {
-                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { SettingsLoadWarnings::MissingRequiredParameter } };
            }
            return { *args, {} };
        }
@@ -471,6 +471,8 @@ namespace winrt::TerminalApp::implementation
    struct ExecuteCommandlineArgs : public ExecuteCommandlineArgsT<ExecuteCommandlineArgs>
    {
        ExecuteCommandlineArgs() = default;
+        ExecuteCommandlineArgs(winrt::hstring commandline) :
+            _Commandline{ commandline } {};
        GETSET_PROPERTY(winrt::hstring, Commandline, L"");

        static constexpr std::string_view CommandlineKey{ "commandline" };
@@ -494,7 +496,7 @@ namespace winrt::TerminalApp::implementation
            JsonUtils::GetValueForKey(json, CommandlineKey, args->_Commandline);
            if (args->_Commandline.empty())
            {
-                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { SettingsLoadWarnings::MissingRequiredParameter } };
            }
            return { *args, {} };
        }
@@ -503,7 +505,9 @@ namespace winrt::TerminalApp::implementation
    struct CloseOtherTabsArgs : public CloseOtherTabsArgsT<CloseOtherTabsArgs>
    {
        CloseOtherTabsArgs() = default;
-        GETSET_PROPERTY(winrt::Windows::Foundation::IReference<uint32_t>, Index, nullptr);
+        CloseOtherTabsArgs(uint32_t& tabIndex) :
+            _Index{ tabIndex } {};
+        GETSET_PROPERTY(Windows::Foundation::IReference<uint32_t>, Index, nullptr);

        static constexpr std::string_view IndexKey{ "index" };

@@ -531,7 +535,9 @@ namespace winrt::TerminalApp::implementation
    struct CloseTabsAfterArgs : public CloseTabsAfterArgsT<CloseTabsAfterArgs>
    {
        CloseTabsAfterArgs() = default;
-        GETSET_PROPERTY(winrt::Windows::Foundation::IReference<uint32_t>, Index, nullptr);
+        CloseTabsAfterArgs(uint32_t& tabIndex) :
+            _Index{ tabIndex } {};
+        GETSET_PROPERTY(Windows::Foundation::IReference<uint32_t>, Index, nullptr);

        static constexpr std::string_view IndexKey{ "index" };

@@ -557,10 +563,14 @@ namespace winrt::TerminalApp::implementation
    };
 }

-namespace winrt::TerminalApp::factory_implementation
+namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation
 {
    BASIC_FACTORY(ActionEventArgs);
+    BASIC_FACTORY(SwitchToTabArgs);
    BASIC_FACTORY(NewTerminalArgs);
-    BASIC_FACTORY(MoveFocusArgs);
+    BASIC_FACTORY(NewTabArgs);
    BASIC_FACTORY(SplitPaneArgs);
+    BASIC_FACTORY(ExecuteCommandlineArgs);
+    BASIC_FACTORY(CloseOtherTabsArgs);
+    BASIC_FACTORY(CloseTabsAfterArgs);
 }
--- a/Show More
+++ b/Show More