Migrate spelling-0.0.21 changes from main

Migrate spelling-0.0.19 changes from main
Use DComp surface handle for Swap Chain management.
2026-04-18 12:11:06 +00:00 · 2020-07-16 09:38:08 -07:00 · 2020-07-16 09:38:08 -07:00 · 2020-07-16 09:38:08 -07:00
174 changed files with 2667 additions and 4052 deletions
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -8,7 +8,7 @@
        <!--<add key="Static Package Dependencies" value="dep\packages" />-->
        
        <!-- Use our own NuGet Feed -->
-        <add key="TerminalDependencies" value="https://pkgs.dev.azure.com/ms/terminal/_packaging/TerminalDependencies/nuget/v3/index.json" />
+        <add key="Windows Terminal NuGet Feed" value="https://terminalnuget.blob.core.windows.net/feed/index.json" />
        
        <!-- Internal NuGet feeds that may not be accessible outside Microsoft corporate network -->
        <!--<add key="TAEF - internal" value="https://microsoft.pkgs.visualstudio.com/DefaultCollection/_packaging/Taef/nuget/v3/index.json" />
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -160,11 +160,15 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalConnection", "src\cascadia\TerminalConnection\TerminalConnection.vcxproj", "{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalCore", "src\cascadia\TerminalCore\lib\TerminalCore-lib.vcxproj", "{CA5CAD1A-ABCD-429C-B551-8562EC954746}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalControl", "src\cascadia\TerminalControl\TerminalControl.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746} = {CA5CAD1A-ABCD-429C-B551-8562EC954746}
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 		{1CF55140-EF6A-4736-A403-957E4F7430BB} = {1CF55140-EF6A-4736-A403-957E4F7430BB}
 		{48D21369-3D7B-4431-9967-24E81292CF63} = {48D21369-3D7B-4431-9967-24E81292CF63}
 	EndProjectSection
@@ -174,6 +178,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminal", "src\casc
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746} = {CA5CAD1A-ABCD-429C-B551-8562EC954746}
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
 	EndProjectSection
 EndProject
@@ -182,8 +187,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
 		{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
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalSettings", "src\cascadia\TerminalSettings\TerminalSettings.vcxproj", "{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminalShellExt", "src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj", "{F2ED628A-DB22-446F-A081-4CC845B51A2B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalCore", "src\cascadia\UnitTests_TerminalCore\UnitTests.vcxproj", "{2C2BEEF4-9333-4D05-B12A-1905CBF112F9}"
@@ -230,6 +238,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\cascadia\TerminalApp\lib\TerminalAppLib.vcxproj", "{CA5CAD1A-9A12-429C-B551-8562EC954746}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_TerminalApp", "src\cascadia\LocalTests_TerminalApp\TerminalApp.LocalTests.vcxproj", "{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}"
@@ -1380,6 +1389,35 @@ Global
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}.Release|x64.Build.0 = Release|x64
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}.Release|x86.ActiveCfg = Release|Win32
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}.Release|x86.Build.0 = Release|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|Any CPU.ActiveCfg = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|ARM64.ActiveCfg = Release|ARM64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|DotNet_x64Test.ActiveCfg = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|DotNet_x86Test.ActiveCfg = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x64.Build.0 = AuditMode|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x86.ActiveCfg = Release|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|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x64Test.Build.0 = Debug|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x86Test.Build.0 = 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|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x64Test.Build.0 = Release|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x86Test.Build.0 = 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
 		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|Any CPU.ActiveCfg = Release|Win32
 		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|ARM64.ActiveCfg = Release|ARM64
 		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
@@ -2035,6 +2073,7 @@ Global
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {59840756-302F-44DF-AA47-441A9D673202}
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {59840756-302F-44DF-AA47-441A9D673202}
 		{F2ED628A-DB22-446F-A081-4CC845B51A2B} = {59840756-302F-44DF-AA47-441A9D673202}
 		{2C2BEEF4-9333-4D05-B12A-1905CBF112F9} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{EF3E32A7-5FF6-42B4-B6E2-96CD7D033F00} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
--- a/custom.props
+++ b/custom.props
@@ -5,7 +5,7 @@
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
    <XesBaseYearForStoreVersion>2020</XesBaseYearForStoreVersion>
    <VersionMajor>1</VersionMajor>
-    <VersionMinor>3</VersionMinor>
+    <VersionMinor>2</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
  </PropertyGroup>
 </Project>
--- a/doc/Niksa.md
+++ b/doc/Niksa.md
@@ -9,8 +9,6 @@ This document serves as a storage point for those posts.
 - [Output Processing between "Far East" and "Western"](#fesb)
 - [Why do we not backport things?](#backport)
 - [Why can't we have mixed elevated and non-elevated tabs in the Terminal?](#elevation)
- [What's the difference between a shell and a terminal?](#shell-vs-terminal)
-

 ## <a name="cmd"></a>Why do we avoid changing CMD.exe?
 `setlocal` doesn't behave the same way as an environment variable. It's a thing that would have to be put in at the top of the batch script that is `somefile.cmd` as one of its first commands to adjust the way that one specific batch file is processed by the `cmd.exe` engine. That's probably not suitable for your needs, but that's the way we have to go.
@@ -181,20 +179,3 @@ Other platforms have accepted that risk in preference for user convenience. They

 Original Source: https://github.com/microsoft/terminal/issues/632#issuecomment-519375707

-## <a name="shell-vs-terminal"></a>What's the difference between a shell and a terminal?
-
-_guest speaker @zadjii-msft_
-
-I think there might be a bit of a misunderstanding here - there are two different kinds of applications we're talking about here:
-* shell applications, like `cmd.exe`, `powershell`, `zsh`, etc. These are text-only applications that emit streams of characters. They don't care at all about how they're eventually rendered to the user. These are also sometimes referred to as "commandline client" applications.
-* terminal applications, like the Windows Terminal, gnome-terminal, xterm, iterm2, hyper. These are graphical applications that can be used to render the output of commandline clients. 
-
-On Windows, if you just run `cmd.exe` directly, the OS will create an instance of `conhost.exe` as the _terminal_ for `cmd.exe`. The same thing happens for `powershell.exe`, the system will creates a new conhost window for any client that's not already connected to a terminal of some sort. This has lead to an enormous amount of confusion for people thinking that a conhost window is actually a "`cmd` window". `cmd` can't have a window, it's just a commandline application. Its window is always some other terminal.
-
-Any terminal can run any commandline client application. So you can use the Windows Terminal to run whatever shell you want. I use mine for both `cmd` and `powershell`, and also WSL:
-
-![image](https://user-images.githubusercontent.com/18356694/89556758-79d27e80-d7d7-11ea-84e2-10710e09ef4a.png)
-
-It's not the Terminal's responsibility to remember the commands executed by a commandline client. That's the responsibility of the _shell_. How would the terminal remember commands executed by something like `emacs` or `vim`? Those are both applications where the user is typing input and hitting enter, like they would at a cmd prompt, but without something that resembles a command history.
-
-Original Source: https://github.com/microsoft/terminal/issues/6500#issuecomment-670035468
--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@@ -63,9 +63,6 @@
        "openTabColorPicker",
        "renameTab",
        "commandPalette",
-        "wt",
-        "closeOtherTabs",
-        "closeTabsAfter",
        "unbound"
      ],
      "type": "string"
@@ -283,57 +280,6 @@
        }
      ]
    },
-    "WtAction": {
-      "description": "Arguments corresponding to a wt Action",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "wt" },
-            "commandline": {
-              "type": "string",
-              "default": "",
-              "description": "a `wt` commandline to run in the current window"
-            }
-          }
-        }
-      ],
-      "required": [ "commandline" ]
-    },
-    "CloseOtherTabsAction": {
-      "description": "Arguments for a closeOtherTabs action",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "closeOtherTabs" },
-            "index": {
-              "type": "integer",
-              "default": "",
-              "description": "close the tabs following the tab at this index"
-            }
-          }
-        }
-      ],
-      "required": [ "index" ]
-    },
-    "CloseTabsAfterAction": {
-      "description": "Arguments for a closeTabsAfter action",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "closeTabsAfter" },
-            "index": {
-              "type": "integer",
-              "default": "",
-              "description": "close the tabs other than the one at this index"
-            }
-          }
-        }
-      ],
-      "required": [ "index" ]
-    },
    "Keybinding": {
      "additionalProperties": false,
      "properties": {
@@ -350,9 +296,6 @@
              { "$ref": "#/definitions/SplitPaneAction" },
              { "$ref": "#/definitions/OpenSettingsAction" },
              { "$ref": "#/definitions/SetTabColorAction" },
-              { "$ref": "#/definitions/WtAction" },
-              { "$ref": "#/definitions/CloseOtherTabsAction" },
-              { "$ref": "#/definitions/CloseTabsAfterAction" },
              { "type": "null" }
            ]
        },
--- a/doc/specs/#1337
+++ b/doc/specs/#1337
@@ -1,146 +0,0 @@
---
-author: Mike Griese @zadjii-msft
-created on: 2020-07-31
-last updated: 2020-08-03
-issue id: #1337
---
-# Per-Profile Tab Colors
-
-## Abstract
-
-This spec describes a way to specify tab colors in a profile in a way that will
-be forward compatible with theming the Terminal. This spec will be largely
-dedicated to the design of a single setting, but within the context of theming.
-
-## Inspiration
-
-Following the addition of the Tab Color Picker in [#3789], we've had numerous
-requests for the ability to set the color of a tab directly within a profile.
-While largely we're tracking theming in [#3327], including the specification of
-a tab color, the theming spec ([#5772] )is very large and will take a while to
-revise and approve. This spec is intended to pull a single point out from that
-spec to make it more easily reviewable, and implement it in a way that will
-continue working when we add support for themes in the future.
-
-## Solution Design
-
-To enable per-profile tab colors, we'll add a single setting: `tabColor`. For
-now<sup>[[1](#user-content-footnote-1)]</sup>, this setting will accept any
-`#rrggbb` color string.
-
-Since each profile creates a `Pane` with a `TermControl`, we'll need to store
-this color not in the `Tab`, but somewhere below `Pane`, so that when you switch
-between Panes in a tab with different `tabColor`s, the color will update
-automatically. When a new `TermControl` is created, we'll store this color in the
-`TermControl`'s `Terminal` core. This is to support the future possibility of
-setting the tab color via VT sequences.
-
-A Tab's color will be the result of layering a variety of sources, from the bottom up:
-
-Color | | Set by
-- | -- | --
-Runtime Color | _optional_ |Color Picker / `setTabColor` action
-Control Tab Color | _optional_ | Profile's `tabColor`, or a color set by VT
-Theme Tab Background | _optional_ | `tab.backgroundColor` in the theme
-Tab Default Color | **default** | TabView in XAML
-
-Some examples:
-* **Scenario 1**: The user has set `"tabColor": "#ff0000"` in their profile.
-  When they create tabs with that profile, instead of appearing in the default
-  color for the TabView, they'll be `#ff0000`.
-* **Scenario 2**: The user has set `"tabColor": "#ff0000"` in their profile.
-  When they try to set the color for that tab (with the color picker) to
-  `#0000ff`, the tab's color is updated to reflect this new blue color. When
-  they clear the runtime color (with the color picker), the tab will return to
-  `#ff0000`.
-* **Scenario 3**: The user has two profiles with colors set, one to `"tabColor":
-  "#ff0000"`, and the other with `"tabColor": "#00ff00"`. If they open these
-  profiles in two panes side-by side, the tab's color will update to reflect the
-  color from the currently-focused control.
-* **Scenario 4**: The user has two profiles with colors set, one to `"tabColor":
-  "#ff0000"`, and the other with `"tabColor": "#00ff00"`. If they open these
-  profiles in two panes side-by side, and try to set the color for that tab
-  (with the color picker) to `#0000ff`, the tab's color is updated to reflect
-  this new blue color. Regardless of which pane is focused, the tab will be
-  blue.
-* **Scenario 5**: The user has set `"tabColor": "#ff0000"` in their profile
-  ("Profile A"), and `"tab.backgroundColor": "#00ff00"`in their theme. When they
-  create tabs with "Profile A", the tabs will appear red. Other tabs (for
-  profiles without `tabColor` set) will appear green, using the color from the
-  theme.
-
-
-## UI/UX Design
-
-In general, this is going to look exactly like the colored tabs look now.
-
-![preview](profile-tabColor-000.gif)
-
-## Capabilities
-
-<table>
-<tr>
-<td><strong>Accessibility</strong></td>
-<td>
-N/A
-</td>
-</tr>
-<tr>
-<td><strong>Security</strong></td>
-<td>
-N/A
-</td>
-</tr>
-<tr>
-<td><strong>Reliability</strong></td>
-<td>
-No expected change
-</td>
-</tr>
-<tr>
-<td><strong>Compatibility</strong></td>
-<td>
-This entire spec outlines how this feature is designed with a emphasis on future
-compatibility. As such, there are no expected regressions in the future when we
-do add support for themes.
-</td>
-</tr>
-<tr>
-<td><strong>Performance, Power, and Efficiency</strong></td>
-<td>
-No expected change
-</td>
-</tr>
-</table>
-
-## Potential Issues
-
-None expected.
-
-## Footnotes
-
-<a id="footnote-1"><a>[1]: When full theming support is added, themes will
-provide support for setting colors as one of a variety of values:
-
-  * An `#rrggbb` string
-  * The system accent color
-  * The current background color of the Terminal
-  * A value from a given resource key from XAML
-
-When support for these other types of "smart" colors is added, then the profile
-`tabColor` setting will also gracefully accept these values.
-
-## Future considerations
-
-* It's not out of the realm of possibility that someone might want to color each
-  _pane_'s color at runtime. In that case, the runtime color would be stored in
-  the `Pane`, not the `Tab`.
-
-
-
-<!-- Footnotes -->
-
-[#1337]: https://github.com/microsoft/terminal/issues/1337
-[#3789]: https://github.com/microsoft/terminal/issues/3789
-[#3327]: https://github.com/microsoft/terminal/issues/3327
-[#5772]: https://github.com/microsoft/terminal/pull/5772
--- a/Colors/profile-tabColor-000.gif
+++ b/Colors/profile-tabColor-000.gif
--- a/res/Cascadia.ttf
+++ b/res/Cascadia.ttf
--- a/res/CascadiaMono.ttf
+++ b/res/CascadiaMono.ttf
--- a/res/README.md
+++ b/res/README.md
@@ -17,5 +17,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi

 ### Fonts Included

-* Cascadia Code, Cascadia Mono (2007.15)
-   * from microsoft/cascadia-code@2a54363b2c867f7ae811b9a034c0024cef67de96
+* Cascadia Code, Cascadia Mono (2007.01)
+   * from microsoft/cascadia-code@311cc603f30635da704b6a7d13050e245e61667b
--- a/src/buffer/out/Row.cpp
+++ b/src/buffer/out/Row.cpp
@@ -160,98 +160,66 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, co
    // If we're given a right-side column limit, use it. Otherwise, the write limit is the final column index available in the char row.
    const auto finalColumnInRow = limitRight.value_or(_charRow.size() - 1);

-    if (it)
+    while (it && currentIndex <= finalColumnInRow)
    {
-        // Accumulate usages of the same color so we can spend less time in InsertAttrRuns rewriting it.
-        auto currentColor = it->TextAttr();
-        size_t colorUses = 0;
-        size_t colorStarts = index;
-
-        while (it && currentIndex <= finalColumnInRow)
+        // Fill the color if the behavior isn't set to keeping the current color.
+        if (it->TextAttrBehavior() != TextAttributeBehavior::Current)
        {
-            // Fill the color if the behavior isn't set to keeping the current color.
-            if (it->TextAttrBehavior() != TextAttributeBehavior::Current)
+            const TextAttributeRun attrRun{ 1, it->TextAttr() };
+            LOG_IF_FAILED(_attrRow.InsertAttrRuns({ &attrRun, 1 },
+                                                  currentIndex,
+                                                  currentIndex,
+                                                  _charRow.size()));
+        }
+
+        // Fill the text if the behavior isn't set to saying there's only a color stored in this iterator.
+        if (it->TextAttrBehavior() != TextAttributeBehavior::StoredOnly)
+        {
+            const bool fillingLastColumn = currentIndex == finalColumnInRow;
+
+            // TODO: MSFT: 19452170 - We need to ensure when writing any trailing byte that the one to the left
+            // is a matching leading byte. Likewise, if we're writing a leading byte, we need to make sure we still have space in this loop
+            // for the trailing byte coming up before writing it.
+
+            // If we're trying to fill the first cell with a trailing byte, pad it out instead by clearing it.
+            // Don't increment iterator. We'll advance the index and try again with this value on the next round through the loop.
+            if (currentIndex == 0 && it->DbcsAttr().IsTrailing())
            {
-                // If the color of this cell is the same as the run we're currently on,
-                // just increment the counter.
-                if (currentColor == it->TextAttr())
-                {
-                    ++colorUses;
-                }
-                else
-                {
-                    // Otherwise, commit this color into the run and save off the new one.
-                    const TextAttributeRun run{ colorUses, currentColor };
-                    // Now commit the new color runs into the attr row.
-                    LOG_IF_FAILED(_attrRow.InsertAttrRuns({ &run, 1 },
-                                                          colorStarts,
-                                                          currentIndex - 1,
-                                                          _charRow.size()));
-                    currentColor = it->TextAttr();
-                    colorUses = 1;
-                    colorStarts = currentIndex;
-                }
+                _charRow.ClearCell(currentIndex);
            }
-
-            // Fill the text if the behavior isn't set to saying there's only a color stored in this iterator.
-            if (it->TextAttrBehavior() != TextAttributeBehavior::StoredOnly)
+            // If we're trying to fill the last cell with a leading byte, pad it out instead by clearing it.
+            // Don't increment iterator. We'll exit because we couldn't write a lead at the end of a line.
+            else if (fillingLastColumn && it->DbcsAttr().IsLeading())
            {
-                const bool fillingLastColumn = currentIndex == finalColumnInRow;
-
-                // TODO: MSFT: 19452170 - We need to ensure when writing any trailing byte that the one to the left
-                // is a matching leading byte. Likewise, if we're writing a leading byte, we need to make sure we still have space in this loop
-                // for the trailing byte coming up before writing it.
-
-                // If we're trying to fill the first cell with a trailing byte, pad it out instead by clearing it.
-                // Don't increment iterator. We'll advance the index and try again with this value on the next round through the loop.
-                if (currentIndex == 0 && it->DbcsAttr().IsTrailing())
-                {
-                    _charRow.ClearCell(currentIndex);
-                }
-                // If we're trying to fill the last cell with a leading byte, pad it out instead by clearing it.
-                // Don't increment iterator. We'll exit because we couldn't write a lead at the end of a line.
-                else if (fillingLastColumn && it->DbcsAttr().IsLeading())
-                {
-                    _charRow.ClearCell(currentIndex);
-                    _charRow.SetDoubleBytePadded(true);
-                }
-                // Otherwise, copy the data given and increment the iterator.
-                else
-                {
-                    _charRow.DbcsAttrAt(currentIndex) = it->DbcsAttr();
-                    _charRow.GlyphAt(currentIndex) = it->Chars();
-                    ++it;
-                }
-
-                // If we're asked to (un)set the wrap status and we just filled the last column with some text...
-                // NOTE:
-                //  - wrap = std::nullopt    --> don't change the wrap value
-                //  - wrap = true            --> we're filling cells as a steam, consider this a wrap
-                //  - wrap = false           --> we're filling cells as a block, unwrap
-                if (wrap.has_value() && fillingLastColumn)
-                {
-                    // set wrap status on the row to parameter's value.
-                    _charRow.SetWrapForced(wrap.value());
-                }
+                _charRow.ClearCell(currentIndex);
+                _charRow.SetDoubleBytePadded(true);
            }
+            // Otherwise, copy the data given and increment the iterator.
            else
            {
+                _charRow.DbcsAttrAt(currentIndex) = it->DbcsAttr();
+                _charRow.GlyphAt(currentIndex) = it->Chars();
                ++it;
            }

-            // Move to the next cell for the next time through the loop.
-            ++currentIndex;
+            // If we're asked to (un)set the wrap status and we just filled the last column with some text...
+            // NOTE:
+            //  - wrap = std::nullopt    --> don't change the wrap value
+            //  - wrap = true            --> we're filling cells as a steam, consider this a wrap
+            //  - wrap = false           --> we're filling cells as a block, unwrap
+            if (wrap.has_value() && fillingLastColumn)
+            {
+                // set wrap status on the row to parameter's value.
+                _charRow.SetWrapForced(wrap.value());
+            }
+        }
+        else
+        {
+            ++it;
        }

-        // Now commit the final color into the attr row
-        if (colorUses)
-        {
-            const TextAttributeRun run{ colorUses, currentColor };
-            LOG_IF_FAILED(_attrRow.InsertAttrRuns({ &run, 1 },
-                                                  colorStarts,
-                                                  currentIndex - 1,
-                                                  _charRow.size()));
-        }
+        // Move to the next cell for the next time through the loop.
+        ++currentIndex;
    }

    return it;
--- a/src/buffer/out/TextAttribute.cpp
+++ b/src/buffer/out/TextAttribute.cpp
@@ -246,7 +246,8 @@ bool TextAttribute::IsCrossedOut() const noexcept

 bool TextAttribute::IsUnderlined() const noexcept
 {
-    return WI_IsFlagSet(_extendedAttrs, ExtendedAttributes::Underlined);
+    // TODO:GH#2915 Treat underline separately from LVB_UNDERSCORE
+    return WI_IsFlagSet(_wAttrLegacy, COMMON_LVB_UNDERSCORE);
 }

 bool TextAttribute::IsOverlined() const noexcept
@@ -269,7 +270,7 @@ void TextAttribute::SetFaint(bool isFaint) noexcept
    WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::Faint, isFaint);
 }

-void TextAttribute::SetItalic(bool isItalic) noexcept
+void TextAttribute::SetItalics(bool isItalic) noexcept
 {
    WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::Italics, isItalic);
 }
@@ -289,12 +290,13 @@ void TextAttribute::SetCrossedOut(bool isCrossedOut) noexcept
    WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::CrossedOut, isCrossedOut);
 }

-void TextAttribute::SetUnderlined(bool isUnderlined) noexcept
+void TextAttribute::SetUnderline(bool isUnderlined) noexcept
 {
-    WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::Underlined, isUnderlined);
+    // TODO:GH#2915 Treat underline separately from LVB_UNDERSCORE
+    WI_UpdateFlag(_wAttrLegacy, COMMON_LVB_UNDERSCORE, isUnderlined);
 }

-void TextAttribute::SetOverlined(bool isOverlined) noexcept
+void TextAttribute::SetOverline(bool isOverlined) noexcept
 {
    WI_UpdateFlag(_wAttrLegacy, COMMON_LVB_GRID_HORIZONTAL, isOverlined);
 }
--- a/src/buffer/out/TextAttribute.hpp
+++ b/src/buffer/out/TextAttribute.hpp
@@ -100,12 +100,12 @@ public:

    void SetBold(bool isBold) noexcept;
    void SetFaint(bool isFaint) noexcept;
-    void SetItalic(bool isItalic) noexcept;
+    void SetItalics(bool isItalic) noexcept;
    void SetBlinking(bool isBlinking) noexcept;
    void SetInvisible(bool isInvisible) noexcept;
    void SetCrossedOut(bool isCrossedOut) noexcept;
-    void SetUnderlined(bool isUnderlined) noexcept;
-    void SetOverlined(bool isOverlined) noexcept;
+    void SetUnderline(bool isUnderlined) noexcept;
+    void SetOverline(bool isOverlined) noexcept;
    void SetReverseVideo(bool isReversed) noexcept;

    ExtendedAttributes GetExtendedAttributes() const noexcept;
@@ -218,12 +218,11 @@ namespace WEX
            static WEX::Common::NoThrowString ToString(const TextAttribute& attr)
            {
                return WEX::Common::NoThrowString().Format(
-                    L"{FG:%s,BG:%s,bold:%d,wLegacy:(0x%04x),ext:(0x%02x)}",
+                    L"{FG:%s,BG:%s,bold:%d,wLegacy:(0x%04x)}",
                    VerifyOutputTraits<TextColor>::ToString(attr._foreground).GetBuffer(),
                    VerifyOutputTraits<TextColor>::ToString(attr._background).GetBuffer(),
                    attr.IsBold(),
-                    attr._wAttrLegacy,
-                    static_cast<DWORD>(attr._extendedAttrs));
+                    attr._wAttrLegacy);
            }
        };
    }
--- a/src/buffer/out/textBuffer.cpp
+++ b/src/buffer/out/textBuffer.cpp
@@ -787,7 +787,7 @@ const Cursor& TextBuffer::GetCursor() const noexcept
    return _currentAttributes;
 }

-void TextBuffer::SetCurrentAttributes(const TextAttribute& currentAttributes) noexcept
+void TextBuffer::SetCurrentAttributes(const TextAttribute currentAttributes) noexcept
 {
    _currentAttributes = currentAttributes;
 }
--- a/src/buffer/out/textBuffer.hpp
+++ b/src/buffer/out/textBuffer.hpp
@@ -118,7 +118,7 @@ public:

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

-    void SetCurrentAttributes(const TextAttribute& currentAttributes) noexcept;
+    void SetCurrentAttributes(const TextAttribute currentAttributes) noexcept;

    void Reset();

--- a/src/cascadia/LocalTests_TerminalApp/CommandTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/CommandTests.cpp
@@ -10,7 +10,7 @@
 using namespace Microsoft::Console;
 using namespace TerminalApp;
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
@@ -147,8 +147,10 @@ namespace TerminalAppLocalTests
            { "name": "command0", "command": { "action": "splitPane", "split": null } },
            { "name": "command1", "command": { "action": "splitPane", "split": "vertical" } },
            { "name": "command2", "command": { "action": "splitPane", "split": "horizontal" } },
+            { "name": "command3", "command": { "action": "splitPane", "split": "none" } },
            { "name": "command4", "command": { "action": "splitPane" } },
-            { "name": "command5", "command": { "action": "splitPane", "split": "auto" } }
+            { "name": "command5", "command": { "action": "splitPane", "split": "auto" } },
+            { "name": "command6", "command": { "action": "splitPane", "split": "foo" } }
        ])" };

        const auto commands0Json = VerifyParseSucceeded(commands0String);
@@ -157,7 +159,7 @@ namespace TerminalAppLocalTests
        VERIFY_ARE_EQUAL(0u, commands.size());
        auto warnings = implementation::Command::LayerJson(commands, commands0Json);
        VERIFY_ARE_EQUAL(0u, warnings.size());
-        VERIFY_ARE_EQUAL(5u, commands.size());
+        VERIFY_ARE_EQUAL(7u, commands.size());

        {
            auto command = commands.at(L"command0");
@@ -189,6 +191,16 @@ namespace TerminalAppLocalTests
            // Verify the args have the expected value
            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
        }
+        {
+            auto command = commands.at(L"command3");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
+            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());
+        }
        {
            auto command = commands.at(L"command4");
            VERIFY_IS_NOT_NULL(command);
@@ -209,6 +221,16 @@ namespace TerminalAppLocalTests
            // Verify the args have the expected value
            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
        }
+        {
+            auto command = commands.at(L"command6");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
+            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());
+        }
    }
    void CommandTests::TestResourceKeyName()
    {
--- a/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
@@ -4,9 +4,7 @@
 #include "pch.h"
 #include <WexTestClass.h>

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

 using namespace WEX::Logging;
 using namespace WEX::Common;
@@ -54,10 +52,6 @@ namespace TerminalAppLocalTests

        TEST_METHOD(CheckTypos);

-        TEST_METHOD(TestSimpleExecuteCommandlineAction);
-        TEST_METHOD(TestMultipleCommandExecuteCommandlineAction);
-        TEST_METHOD(TestInvalidExecuteCommandlineAction);
-
    private:
        void _buildCommandlinesHelper(AppCommandlineArgs& appArgs,
                                      const size_t expectedSubcommands,
@@ -1073,66 +1067,4 @@ namespace TerminalAppLocalTests
            VERIFY_ARE_EQUAL(L"C:\\", myArgs.TerminalArgs().StartingDirectory());
        }
    }
-
-    void CommandlineTest::TestSimpleExecuteCommandlineAction()
-    {
-        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
-        args->Commandline(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());
-        VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-        auto myArgs = actionAndArgs.Args().try_as<NewTabArgs>();
-        VERIFY_IS_NOT_NULL(myArgs);
-        VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
-        VERIFY_IS_TRUE(myArgs.TerminalArgs().Commandline().empty());
-        VERIFY_IS_TRUE(myArgs.TerminalArgs().StartingDirectory().empty());
-        VERIFY_IS_TRUE(myArgs.TerminalArgs().TabTitle().empty());
-        VERIFY_IS_TRUE(myArgs.TerminalArgs().ProfileIndex() == nullptr);
-        VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
-    }
-
-    void CommandlineTest::TestMultipleCommandExecuteCommandlineAction()
-    {
-        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
-        args->Commandline(L"new-tab ; split-pane");
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(*args);
-        VERIFY_ARE_EQUAL(2u, actions.size());
-        {
-            auto actionAndArgs = actions.at(0);
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<NewTabArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().ProfileIndex() == nullptr);
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
-        }
-        {
-            auto actionAndArgs = actions.at(1);
-            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().ProfileIndex() == nullptr);
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
-        }
-    }
-
-    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);
-        VERIFY_ARE_EQUAL(0u, actions.size());
-    }
 }
--- a/src/cascadia/LocalTests_TerminalApp/KeyBindingsTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/KeyBindingsTests.cpp
@@ -11,7 +11,7 @@
 using namespace Microsoft::Console;
 using namespace TerminalApp;
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
@@ -323,8 +323,10 @@ namespace TerminalAppLocalTests
            { "keys": ["ctrl+c"], "command": { "action": "splitPane", "split": null } },
            { "keys": ["ctrl+d"], "command": { "action": "splitPane", "split": "vertical" } },
            { "keys": ["ctrl+e"], "command": { "action": "splitPane", "split": "horizontal" } },
+            { "keys": ["ctrl+f"], "command": { "action": "splitPane", "split": "none" } },
            { "keys": ["ctrl+g"], "command": { "action": "splitPane" } },
-            { "keys": ["ctrl+h"], "command": { "action": "splitPane", "split": "auto" } }
+            { "keys": ["ctrl+h"], "command": { "action": "splitPane", "split": "auto" } },
+            { "keys": ["ctrl+i"], "command": { "action": "splitPane", "split": "foo" } }
        ])" };

        const auto bindings0Json = VerifyParseSucceeded(bindings0String);
@@ -333,7 +335,7 @@ namespace TerminalAppLocalTests
        VERIFY_IS_NOT_NULL(appKeyBindings);
        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(5u, appKeyBindings->_keyShortcuts.size());
+        VERIFY_ARE_EQUAL(7u, appKeyBindings->_keyShortcuts.size());

        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
@@ -362,6 +364,15 @@ namespace TerminalAppLocalTests
            // Verify the args have the expected value
            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, 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());
+        }
        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
@@ -380,6 +391,15 @@ namespace TerminalAppLocalTests
            // Verify the args have the expected value
            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('I') };
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, 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());
+        }
    }

    void KeyBindingsTests::TestSetTabColorArgs()
@@ -387,6 +407,7 @@ namespace TerminalAppLocalTests
        const std::string bindings0String{ R"([
            { "keys": ["ctrl+c"], "command": { "action": "setTabColor", "color": null } },
            { "keys": ["ctrl+d"], "command": { "action": "setTabColor", "color": "#123456" } },
+            { "keys": ["ctrl+e"], "command": { "action": "setTabColor", "color": "thisStringObviouslyWontWork" } },
            { "keys": ["ctrl+f"], "command": "setTabColor" },
        ])" };

@@ -396,7 +417,7 @@ namespace TerminalAppLocalTests
        VERIFY_IS_NOT_NULL(appKeyBindings);
        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(3u, appKeyBindings->_keyShortcuts.size());
+        VERIFY_ARE_EQUAL(4u, appKeyBindings->_keyShortcuts.size());

        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
@@ -418,6 +439,15 @@ namespace TerminalAppLocalTests
            // Remember that COLORREFs are actually BBGGRR order, while the string is in #RRGGBB order
            VERIFY_ARE_EQUAL(static_cast<uint32_t>(til::color(0x563412)), realArgs.TabColor().Value());
        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('E') };
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_IS_NULL(realArgs.TabColor());
+        }
        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
--- a/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
@@ -16,7 +16,7 @@ using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings;

 namespace TerminalAppLocalTests
 {
@@ -76,8 +76,6 @@ namespace TerminalAppLocalTests

        TEST_METHOD(ValidateKeybindingsWarnings);

-        TEST_METHOD(ValidateExecuteCommandlineWarning);
-
        TEST_METHOD(ValidateLegacyGlobalsWarning);

        TEST_METHOD(TestTrailingCommas);
@@ -93,7 +91,7 @@ namespace TerminalAppLocalTests

    void SettingsTests::TryCreateWinRTType()
    {
-        TerminalSettings settings;
+        winrt::Microsoft::Terminal::Settings::TerminalSettings settings;
        VERIFY_IS_NOT_NULL(settings);
        auto oldFontSize = settings.FontSize();
        settings.FontSize(oldFontSize + 5);
@@ -1433,6 +1431,10 @@ namespace TerminalAppLocalTests
                {
                    "name": "profile3",
                    "closeOnExit": null
+                },
+                {
+                    "name": "profile4",
+                    "closeOnExit": { "clearly": "not a string" }
                }
            ]
        })" };
@@ -1447,6 +1449,7 @@ namespace TerminalAppLocalTests

        // Unknown modes parse as "Graceful"
        VERIFY_ARE_EQUAL(CloseOnExitMode::Graceful, settings._profiles[3].GetCloseOnExitMode());
+        VERIFY_ARE_EQUAL(CloseOnExitMode::Graceful, settings._profiles[4].GetCloseOnExitMode());
    }
    void SettingsTests::TestCloseOnExitCompatibilityShim()
    {
@@ -2256,57 +2259,6 @@ namespace TerminalAppLocalTests
        VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_warnings.at(3));
    }

-    void SettingsTests::ValidateExecuteCommandlineWarning()
-    {
-        Log::Comment(L"This test is affected by GH#6949, so we're just skipping it for now.");
-        Log::Result(WEX::Logging::TestResults::Skipped);
-        return;
-
-        // const std::string badSettings{ R"(
-        // {
-        //     "defaultProfile": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-        //     "profiles": [
-        //         {
-        //             "name" : "profile0",
-        //             "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}"
-        //         },
-        //         {
-        //             "name" : "profile1",
-        //             "guid": "{6239a42c-3333-49a3-80bd-e8fdd045185c}"
-        //         }
-        //     ],
-        //     "keybindings": [
-        //         { "name":null, "command": { "action": "wt" }, "keys": [ "ctrl+a" ] },
-        //         { "name":null, "command": { "action": "wt", "commandline":"" }, "keys": [ "ctrl+b" ] },
-        //         { "name":null, "command": { "action": "wt", "commandline":null }, "keys": [ "ctrl+c" ] }
-        //     ]
-        // })" };
-
-        // const auto settingsObject = VerifyParseSucceeded(badSettings);
-
-        // auto settings = CascadiaSettings::FromJson(settingsObject);
-
-        // VERIFY_ARE_EQUAL(0u, settings->_globals._keybindings->_keyShortcuts.size());
-
-        // for (const auto& warning : settings->_globals._keybindingsWarnings)
-        // {
-        //     Log::Comment(NoThrowString().Format(
-        //         L"warning:%d", warning));
-        // }
-        // VERIFY_ARE_EQUAL(3u, settings->_globals._keybindingsWarnings.size());
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_globals._keybindingsWarnings.at(0));
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_globals._keybindingsWarnings.at(1));
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_globals._keybindingsWarnings.at(2));
-
-        // settings->_ValidateKeybindings();
-
-        // VERIFY_ARE_EQUAL(4u, settings->_warnings.size());
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::AtLeastOneKeybindingWarning, settings->_warnings.at(0));
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_warnings.at(1));
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_warnings.at(2));
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_warnings.at(3));
-    }
-
    void SettingsTests::ValidateLegacyGlobalsWarning()
    {
        const std::string badSettings{ R"(
--- a/src/cascadia/LocalTests_TerminalApp/TabTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/TabTests.cpp
@@ -84,7 +84,7 @@ namespace TerminalAppLocalTests
    {
        // Verify we can create a WinRT type we authored
        // Just creating it is enough to know that everything is working.
-        TerminalSettings settings;
+        winrt::Microsoft::Terminal::Settings::TerminalSettings settings;
        VERIFY_IS_NOT_NULL(settings);
        auto oldFontSize = settings.FontSize();
        settings.FontSize(oldFontSize + 5);
@@ -140,7 +140,7 @@ namespace TerminalAppLocalTests
            // 4. one of our types that uses MUX/Xaml in this dll (Tab).
            // Just creating all of them is enough to know that everything is working.
            const auto profileGuid{ Utils::CreateGuid() };
-            TerminalSettings settings{};
+            winrt::Microsoft::Terminal::Settings::TerminalSettings settings{};
            VERIFY_IS_NOT_NULL(settings);
            winrt::Microsoft::Terminal::TerminalConnection::EchoConnection conn{};
            VERIFY_IS_NOT_NULL(conn);
--- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
+++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
@@ -79,6 +79,7 @@

    <!-- If you don't reference these projects here, the
    _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettings\TerminalSettings.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\TerminalApp.vcxproj" />
--- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
+++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
@@ -45,11 +45,11 @@
    "taef.png" is actually in the package. taef.png will get copied to the
    OutputPath when taef is run, but if this isn't set to false, then the CI
    will try and make sure taef.png is in the OutputPath at build time.-->
-
+  
  <PropertyGroup Label="UserMacros">
    <GenerateAppxPackageOnBuild>false</GenerateAppxPackageOnBuild>
  </PropertyGroup>
-
+  
  <ItemDefinitionGroup>
    <ClCompile>
      <DisableSpecificWarnings>4453;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -94,6 +94,7 @@
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj">
      <Project>{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}</Project>
    </ProjectReference>
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettings\TerminalSettings.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />

    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\TerminalApp.vcxproj">
@@ -113,7 +114,7 @@

  <ItemGroup>
    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestExecutor.WinRTCore">
-      <HintPath>$(OpenConsoleDir)\packages\Taef.Redist.Wlk.10.57.200731005-develop\lib\Microsoft.VisualStudio.TestPlatform.TestExecutor.WinRTCore.winmd</HintPath>
+      <HintPath>$(OpenConsoleDir)\packages\Taef.Redist.Wlk.10.51.200127004\lib\Microsoft.VisualStudio.TestPlatform.TestExecutor.WinRTCore.winmd</HintPath>
      <IsWinMDFile>true</IsWinMDFile>

      <!-- This path is _relative to the .winmd_ -->
--- a/src/cascadia/LocalTests_TerminalApp/TestUtils.h
+++ b/src/cascadia/LocalTests_TerminalApp/TestUtils.h
@@ -24,18 +24,18 @@ public:
    // 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::AppKeyBindings& bindings,
-                                                                    const winrt::Microsoft::Terminal::TerminalControl::KeyChord& kc)
+                                                                    const winrt::Microsoft::Terminal::Settings::KeyChord& kc)
    {
        std::wstring buffer{ L"" };
-        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Ctrl))
+        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::Settings::KeyModifiers::Ctrl))
        {
            buffer += L"Ctrl+";
        }
-        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Shift))
+        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::Settings::KeyModifiers::Shift))
        {
            buffer += L"Shift+";
        }
-        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Alt))
+        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::Settings::KeyModifiers::Alt))
        {
            buffer += L"Alt+";
        }
--- a/src/cascadia/PublicTerminalCore/HwndTerminal.cpp
+++ b/src/cascadia/PublicTerminalCore/HwndTerminal.cpp
@@ -21,26 +21,7 @@ static constexpr bool _IsMouseMessage(UINT uMsg)
    return uMsg == WM_LBUTTONDOWN || uMsg == WM_LBUTTONUP || uMsg == WM_LBUTTONDBLCLK ||
           uMsg == WM_MBUTTONDOWN || uMsg == WM_MBUTTONUP || uMsg == WM_MBUTTONDBLCLK ||
           uMsg == WM_RBUTTONDOWN || uMsg == WM_RBUTTONUP || uMsg == WM_RBUTTONDBLCLK ||
-           uMsg == WM_MOUSEMOVE || uMsg == WM_MOUSEWHEEL || uMsg == WM_MOUSEHWHEEL;
-}
-
-// Helper static function to ensure that all ambiguous-width glyphs are reported as narrow.
-// See microsoft/terminal#2066 for more info.
-static bool _IsGlyphWideForceNarrowFallback(const std::wstring_view /* glyph */) noexcept
-{
-    return false; // glyph is not wide.
-}
-
-static bool _EnsureStaticInitialization()
-{
-    // use C++11 magic statics to make sure we only do this once.
-    static bool initialized = []() {
-        // *** THIS IS A SINGLETON ***
-        SetGlyphWidthFallback(_IsGlyphWideForceNarrowFallback);
-
-        return true;
-    }();
-    return initialized;
+           uMsg == WM_MOUSEMOVE || uMsg == WM_MOUSEWHEEL;
 }

 LRESULT CALLBACK HwndTerminal::HwndTerminalWndProc(
@@ -55,29 +36,10 @@ try

    if (terminal)
    {
-        if (_IsMouseMessage(uMsg))
+        if (_IsMouseMessage(uMsg) && terminal->_CanSendVTMouseInput())
        {
-            if (terminal->_CanSendVTMouseInput() && terminal->_SendMouseEvent(uMsg, wParam, lParam))
+            if (terminal->_SendMouseEvent(uMsg, wParam, lParam))
            {
-                // GH#6401: Capturing the mouse ensures that we get drag/release events
-                // even if the user moves outside the window.
-                // _SendMouseEvent returns false if the terminal's not in VT mode, so we'll
-                // fall through to release the capture.
-                switch (uMsg)
-                {
-                case WM_LBUTTONDOWN:
-                case WM_MBUTTONDOWN:
-                case WM_RBUTTONDOWN:
-                    SetCapture(hwnd);
-                    break;
-                case WM_LBUTTONUP:
-                case WM_MBUTTONUP:
-                case WM_RBUTTONUP:
-                    ReleaseCapture();
-                    break;
-                }
-
-                // Suppress all mouse events that made it into the terminal.
                return 0;
            }
        }
@@ -95,10 +57,6 @@ try
            return 0;
        case WM_LBUTTONUP:
            terminal->_singleClickTouchdownPos = std::nullopt;
-            [[fallthrough]];
-        case WM_MBUTTONUP:
-        case WM_RBUTTONUP:
-            ReleaseCapture();
            break;
        case WM_MOUSEMOVE:
            if (WI_IsFlagSet(wParam, MK_LBUTTON))
@@ -114,7 +72,7 @@ try
                {
                    const auto bufferData = terminal->_terminal->RetrieveSelectedTextFromBuffer(false);
                    LOG_IF_FAILED(terminal->_CopyTextToSystemClipboard(bufferData, true));
-                    TerminalClearSelection(terminal);
+                    terminal->_terminal->ClearSelection();
                }
                CATCH_LOG();
            }
@@ -123,11 +81,6 @@ try
                terminal->_PasteTextFromClipboard();
            }
            return 0;
-        case WM_DESTROY:
-            // Release Terminal's hwnd so Teardown doesn't try to destroy it again
-            terminal->_hwnd.release();
-            terminal->Teardown();
-            return 0;
        }
    }
    return DefWindowProc(hwnd, uMsg, wParam, lParam);
@@ -161,16 +114,14 @@ static bool RegisterTermClass(HINSTANCE hInstance) noexcept
 }

 HwndTerminal::HwndTerminal(HWND parentHwnd) :
-    _desiredFont{ L"Consolas", 0, DEFAULT_FONT_WEIGHT, { 0, 14 }, CP_UTF8 },
-    _actualFont{ L"Consolas", 0, DEFAULT_FONT_WEIGHT, { 0, 14 }, CP_UTF8, false },
+    _desiredFont{ L"Consolas", 0, 10, { 0, 14 }, CP_UTF8 },
+    _actualFont{ L"Consolas", 0, 10, { 0, 14 }, CP_UTF8, false },
    _uiaProvider{ nullptr },
    _uiaProviderInitialized{ false },
    _currentDpi{ USER_DEFAULT_SCREEN_DPI },
    _pfnWriteCallback{ nullptr },
    _multiClickTime{ 500 } // this will be overwritten by the windows system double-click time
 {
-    _EnsureStaticInitialization();
-
    HINSTANCE hInstance = wil::GetModuleInstanceHandle();

    if (RegisterTermClass(hInstance))
@@ -197,11 +148,6 @@ HwndTerminal::HwndTerminal(HWND parentHwnd) :
    }
 }

-HwndTerminal::~HwndTerminal()
-{
-    Teardown();
-}
-
 HRESULT HwndTerminal::Initialize()
 {
    _terminal = std::make_unique<::Microsoft::Terminal::Core::Terminal>();
@@ -216,6 +162,9 @@ HRESULT HwndTerminal::Initialize()
    RETURN_IF_FAILED(dxEngine->Enable());
    _renderer->AddRenderEngine(dxEngine.get());

+    const auto pfn = std::bind(&::Microsoft::Console::Render::Renderer::IsGlyphWideByFont, _renderer.get(), std::placeholders::_1);
+    SetGlyphWidthFallback(pfn);
+
    _UpdateFont(USER_DEFAULT_SCREEN_DPI);
    RECT windowRect;
    GetWindowRect(_hwnd.get(), &windowRect);
@@ -232,8 +181,8 @@ HRESULT HwndTerminal::Initialize()
    _terminal->SetBackgroundCallback([](auto) {});

    _terminal->Create(COORD{ 80, 25 }, 1000, *_renderer);
-    _terminal->SetDefaultBackground(RGB(12, 12, 12));
-    _terminal->SetDefaultForeground(RGB(204, 204, 204));
+    _terminal->SetDefaultBackground(RGB(5, 27, 80));
+    _terminal->SetDefaultForeground(RGB(255, 255, 255));
    _terminal->SetWriteInputCallback([=](std::wstring & input) noexcept { _WriteTextToConnection(input); });
    localPointerToThread->EnablePainting();

@@ -242,33 +191,6 @@ HRESULT HwndTerminal::Initialize()
    return S_OK;
 }

-void HwndTerminal::Teardown() noexcept
-try
-{
-    // As a rule, detach resources from the Terminal before shutting them down.
-    // This ensures that teardown is reentrant.
-
-    // Shut down the renderer (and therefore the thread) before we implode
-    if (auto localRenderEngine{ std::exchange(_renderEngine, nullptr) })
-    {
-        if (auto localRenderer{ std::exchange(_renderer, nullptr) })
-        {
-            localRenderer->TriggerTeardown();
-            // renderer is destroyed
-        }
-        // renderEngine is destroyed
-    }
-
-    if (auto localHwnd{ _hwnd.release() })
-    {
-        // If we're being called through WM_DESTROY, we won't get here (hwnd is already released)
-        // If we're not, we may end up in Teardown _again_... but by the time we do, all other
-        // resources have been released and will not be released again.
-        DestroyWindow(localHwnd);
-    }
-}
-CATCH_LOG();
-
 void HwndTerminal::RegisterScrollCallback(std::function<void(int, int, int)> callback)
 {
    _terminal->SetScrollPositionChangedCallback(callback);
@@ -545,21 +467,11 @@ try
 }
 CATCH_RETURN();

-void HwndTerminal::_ClearSelection() noexcept
-try
-{
-    auto lock{ _terminal->LockForWriting() };
-    _terminal->ClearSelection();
-    _renderer->TriggerSelection();
-}
-CATCH_LOG();
-
 void _stdcall TerminalClearSelection(void* terminal)
 {
-    auto publicTerminal = static_cast<HwndTerminal*>(terminal);
-    publicTerminal->_ClearSelection();
+    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
+    publicTerminal->_terminal->ClearSelection();
 }
-
 bool _stdcall TerminalIsSelectionActive(void* terminal)
 {
    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
@@ -570,10 +482,9 @@ bool _stdcall TerminalIsSelectionActive(void* terminal)
 // Returns the selected text in the terminal.
 const wchar_t* _stdcall TerminalGetSelection(void* terminal)
 {
-    auto publicTerminal = static_cast<HwndTerminal*>(terminal);
+    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);

    const auto bufferData = publicTerminal->_terminal->RetrieveSelectedTextFromBuffer(false);
-    publicTerminal->_ClearSelection();

    // convert text: vector<string> --> string
    std::wstring selectedText;
@@ -583,6 +494,8 @@ const wchar_t* _stdcall TerminalGetSelection(void* terminal)
    }

    auto returnText = wil::make_cotaskmem_string_nothrow(selectedText.c_str());
+    TerminalClearSelection(terminal);
+
    return returnText.release();
 }

@@ -628,21 +541,16 @@ bool HwndTerminal::_CanSendVTMouseInput() const noexcept
 bool HwndTerminal::_SendMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam) noexcept
 try
 {
-    til::point cursorPosition{
+    const til::point cursorPosition{
        GET_X_LPARAM(lParam),
        GET_Y_LPARAM(lParam),
    };

    const til::size fontSize{ this->_actualFont.GetSize() };
    short wheelDelta{ 0 };
-    if (uMsg == WM_MOUSEWHEEL || uMsg == WM_MOUSEHWHEEL)
+    if (uMsg == WM_MOUSEWHEEL)
    {
        wheelDelta = HIWORD(wParam);
-
-        // If it's a *WHEEL event, it's in screen coordinates, not window (?!)
-        POINT coordsToTransform = cursorPosition;
-        ScreenToClient(_hwnd.get(), &coordsToTransform);
-        cursorPosition = coordsToTransform;
    }

    return _terminal->SendMouseEvent(cursorPosition / fontSize, uMsg, getControlKeyState(), wheelDelta);
@@ -653,24 +561,20 @@ catch (...)
    return false;
 }

-void HwndTerminal::_SendKeyEvent(WORD vkey, WORD scanCode, WORD flags, bool keyDown) noexcept
+void HwndTerminal::_SendKeyEvent(WORD vkey, WORD scanCode, bool keyDown) noexcept
 try
 {
-    auto modifiers = getControlKeyState();
-    if (WI_IsFlagSet(flags, ENHANCED_KEY))
-    {
-        modifiers |= ControlKeyStates::EnhancedKey;
-    }
-    _terminal->SendKeyEvent(vkey, scanCode, modifiers, keyDown);
+    const auto flags = getControlKeyState();
+    _terminal->SendKeyEvent(vkey, scanCode, flags, keyDown);
 }
 CATCH_LOG();

-void HwndTerminal::_SendCharEvent(wchar_t ch, WORD scanCode, WORD flags) noexcept
+void HwndTerminal::_SendCharEvent(wchar_t ch, WORD scanCode) noexcept
 try
 {
    if (_terminal->IsSelectionActive())
    {
-        _ClearSelection();
+        _terminal->ClearSelection();
        if (ch == UNICODE_ESC)
        {
            // ESC should clear any selection before it triggers input.
@@ -685,25 +589,21 @@ try
        return;
    }

-    auto modifiers = getControlKeyState();
-    if (WI_IsFlagSet(flags, ENHANCED_KEY))
-    {
-        modifiers |= ControlKeyStates::EnhancedKey;
-    }
-    _terminal->SendCharEvent(ch, scanCode, modifiers);
+    const auto flags = getControlKeyState();
+    _terminal->SendCharEvent(ch, scanCode, flags);
 }
 CATCH_LOG();

-void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, WORD flags, bool keyDown)
+void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, bool keyDown)
 {
    const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
-    publicTerminal->_SendKeyEvent(vkey, scanCode, flags, keyDown);
+    publicTerminal->_SendKeyEvent(vkey, scanCode, keyDown);
 }

-void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD scanCode, WORD flags)
+void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD scanCode)
 {
    const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
-    publicTerminal->_SendCharEvent(ch, scanCode, flags);
+    publicTerminal->_SendCharEvent(ch, scanCode);
 }

 void _stdcall DestroyTerminal(void* terminal)
@@ -732,7 +632,7 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font

    publicTerminal->_terminal->SetCursorStyle(theme.CursorStyle);

-    publicTerminal->_desiredFont = { fontFamily, 0, DEFAULT_FONT_WEIGHT, { 0, fontSize }, CP_UTF8 };
+    publicTerminal->_desiredFont = { fontFamily, 0, 10, { 0, fontSize }, CP_UTF8 };
    publicTerminal->_UpdateFont(newDpi);

    // When the font changes the terminal dimensions need to be recalculated since the available row and column
--- a/src/cascadia/PublicTerminalCore/HwndTerminal.hpp
+++ b/src/cascadia/PublicTerminalCore/HwndTerminal.hpp
@@ -34,8 +34,8 @@ __declspec(dllexport) bool _stdcall TerminalIsSelectionActive(void* terminal);
 __declspec(dllexport) void _stdcall DestroyTerminal(void* terminal);
 __declspec(dllexport) void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR fontFamily, short fontSize, int newDpi);
 __declspec(dllexport) void _stdcall TerminalRegisterWriteCallback(void* terminal, const void __stdcall callback(wchar_t*));
-__declspec(dllexport) void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, WORD flags, bool keyDown);
-__declspec(dllexport) void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD flags, WORD scanCode);
+__declspec(dllexport) void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, bool keyDown);
+__declspec(dllexport) void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD scanCode);
 __declspec(dllexport) void _stdcall TerminalBlinkCursor(void* terminal);
 __declspec(dllexport) void _stdcall TerminalSetCursorVisible(void* terminal, const bool visible);
 __declspec(dllexport) void _stdcall TerminalSetFocus(void* terminal);
@@ -51,10 +51,9 @@ public:
    HwndTerminal(HwndTerminal&&) = default;
    HwndTerminal& operator=(const HwndTerminal&) = default;
    HwndTerminal& operator=(HwndTerminal&&) = default;
-    ~HwndTerminal();
+    ~HwndTerminal() = default;

    HRESULT Initialize();
-    void Teardown() noexcept;
    void SendOutput(std::wstring_view data);
    HRESULT Refresh(const SIZE windowSize, _Out_ COORD* dimensions);
    void RegisterScrollCallback(std::function<void(int, int, int)> callback);
@@ -93,8 +92,8 @@ private:
    friend void _stdcall TerminalClearSelection(void* terminal);
    friend const wchar_t* _stdcall TerminalGetSelection(void* terminal);
    friend bool _stdcall TerminalIsSelectionActive(void* terminal);
-    friend void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, WORD flags, bool keyDown);
-    friend void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD scanCode, WORD flags);
+    friend void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, bool keyDown);
+    friend void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD scanCode);
    friend void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR fontFamily, short fontSize, int newDpi);
    friend void _stdcall TerminalBlinkCursor(void* terminal);
    friend void _stdcall TerminalSetCursorVisible(void* terminal, const bool visible);
@@ -113,13 +112,11 @@ private:
    HRESULT _MoveSelection(LPARAM lParam) noexcept;
    IRawElementProviderSimple* _GetUiaProvider() noexcept;

-    void _ClearSelection() noexcept;
-
    bool _CanSendVTMouseInput() const noexcept;
    bool _SendMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam) noexcept;

-    void _SendKeyEvent(WORD vkey, WORD scanCode, WORD flags, bool keyDown) noexcept;
-    void _SendCharEvent(wchar_t ch, WORD scanCode, WORD flags) noexcept;
+    void _SendKeyEvent(WORD vkey, WORD scanCode, bool keyDown) noexcept;
+    void _SendCharEvent(wchar_t ch, WORD scanCode) noexcept;

    // Inherited via IControlAccessibilityInfo
    COORD GetFontSize() const override;
--- a/src/cascadia/TerminalApp/ActionAndArgs.cpp
+++ b/src/cascadia/TerminalApp/ActionAndArgs.cpp
@@ -2,9 +2,6 @@
 #include "ActionArgs.h"
 #include "ActionAndArgs.h"
 #include "ActionAndArgs.g.cpp"
-
-#include "JsonUtils.h"
-
 #include <LibraryResources.h>

 static constexpr std::string_view CopyTextKey{ "copy" };
@@ -38,10 +35,7 @@ static constexpr std::string_view ToggleAlwaysOnTopKey{ "toggleAlwaysOnTop" };
 static constexpr std::string_view SetTabColorKey{ "setTabColor" };
 static constexpr std::string_view OpenTabColorPickerKey{ "openTabColorPicker" };
 static constexpr std::string_view RenameTabKey{ "renameTab" };
-static constexpr std::string_view ExecuteCommandlineKey{ "wt" };
 static constexpr std::string_view ToggleCommandPaletteKey{ "commandPalette" };
-static constexpr std::string_view CloseOtherTabsKey{ "closeOtherTabs" };
-static constexpr std::string_view CloseTabsAfterKey{ "closeTabsAfter" };

 static constexpr std::string_view ActionKey{ "action" };

@@ -50,8 +44,6 @@ static constexpr std::string_view UnboundKey{ "unbound" };

 namespace winrt::TerminalApp::implementation
 {
-    using namespace ::TerminalApp;
-
    // 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.
    // HERE BE DRAGONS:
@@ -92,10 +84,7 @@ namespace winrt::TerminalApp::implementation
        { UnboundKey, ShortcutAction::Invalid },
        { FindKey, ShortcutAction::Find },
        { RenameTabKey, ShortcutAction::RenameTab },
-        { ExecuteCommandlineKey, ShortcutAction::ExecuteCommandline },
        { ToggleCommandPaletteKey, ShortcutAction::ToggleCommandPalette },
-        { CloseOtherTabsKey, ShortcutAction::CloseOtherTabs },
-        { CloseTabsAfterKey, ShortcutAction::CloseTabsAfter },
    };

    using ParseResult = std::tuple<IActionArgs, std::vector<::TerminalApp::SettingsLoadWarnings>>;
@@ -127,12 +116,6 @@ namespace winrt::TerminalApp::implementation

        { ShortcutAction::RenameTab, winrt::TerminalApp::implementation::RenameTabArgs::FromJson },

-        { ShortcutAction::ExecuteCommandline, winrt::TerminalApp::implementation::ExecuteCommandlineArgs::FromJson },
-
-        { ShortcutAction::CloseOtherTabs, winrt::TerminalApp::implementation::CloseOtherTabsArgs::FromJson },
-
-        { ShortcutAction::CloseTabsAfter, winrt::TerminalApp::implementation::CloseTabsAfterArgs::FromJson },
-
        { ShortcutAction::Invalid, nullptr },
    };

@@ -200,9 +183,11 @@ namespace winrt::TerminalApp::implementation
        }
        else if (json.isObject())
        {
-            if (const auto actionString{ JsonUtils::GetValueForKey<std::optional<std::string>>(json, ActionKey) })
+            const auto actionVal = json[JsonKey(ActionKey)];
+            if (actionVal.isString())
            {
-                action = GetActionFromString(*actionString);
+                auto actionString = actionVal.asString();
+                action = GetActionFromString(actionString);
                argsVal = json;
            }
        }
@@ -280,10 +265,7 @@ namespace winrt::TerminalApp::implementation
                { ShortcutAction::SetTabColor, RS_(L"ResetTabColorCommandKey") },
                { ShortcutAction::OpenTabColorPicker, RS_(L"OpenTabColorPickerCommandKey") },
                { ShortcutAction::RenameTab, RS_(L"ResetTabNameCommandKey") },
-                { ShortcutAction::ExecuteCommandline, RS_(L"ExecuteCommandlineCommandKey") },
                { ShortcutAction::ToggleCommandPalette, RS_(L"ToggleCommandPaletteCommandKey") },
-                { ShortcutAction::CloseOtherTabs, L"" }, // Intentionally omitted, must be generated by GenerateName
-                { ShortcutAction::CloseTabsAfter, L"" }, // Intentionally omitted, must be generated by GenerateName
            };
        }();

@@ -299,4 +281,5 @@ namespace winrt::TerminalApp::implementation
        const auto found = GeneratedActionNames.find(_Action);
        return found != GeneratedActionNames.end() ? found->second : L"";
    }
+
 }
--- a/src/cascadia/TerminalApp/ActionArgs.cpp
+++ b/src/cascadia/TerminalApp/ActionArgs.cpp
@@ -17,7 +17,6 @@
 #include "OpenSettingsArgs.g.cpp"
 #include "SetTabColorArgs.g.cpp"
 #include "RenameTabArgs.g.cpp"
-#include "ExecuteCommandlineArgs.g.cpp"

 #include <LibraryResources.h>

@@ -259,34 +258,4 @@ namespace winrt::TerminalApp::implementation
        return RS_(L"ResetTabNameCommandKey");
    }

-    winrt::hstring ExecuteCommandlineArgs::GenerateName() const
-    {
-        // "Run commandline "{_Commandline}" in this window"
-        if (!_Commandline.empty())
-        {
-            return winrt::hstring{
-                fmt::format(std::wstring_view(RS_(L"ExecuteCommandlineCommandKey")),
-                            _Commandline.c_str())
-            };
-        }
-        return L"";
-    }
-
-    winrt::hstring CloseOtherTabsArgs::GenerateName() const
-    {
-        // "Close tabs other than index {0}"
-        return winrt::hstring{
-            fmt::format(std::wstring_view(RS_(L"CloseOtherTabsCommandKey")),
-                        _Index)
-        };
-    }
-
-    winrt::hstring CloseTabsAfterArgs::GenerateName() const
-    {
-        // "Close tabs after index {0}"
-        return winrt::hstring{
-            fmt::format(std::wstring_view(RS_(L"CloseTabsAfterCommandKey")),
-                        _Index)
-        };
-    }
 }
--- a/src/cascadia/TerminalApp/ActionArgs.h
+++ b/src/cascadia/TerminalApp/ActionArgs.h
@@ -17,17 +17,12 @@
 #include "OpenSettingsArgs.g.h"
 #include "SetTabColorArgs.g.h"
 #include "RenameTabArgs.g.h"
-#include "ExecuteCommandlineArgs.g.h"
-#include "CloseOtherTabsArgs.g.h"
-#include "CloseTabsAfterArgs.g.h"

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

-#include "TerminalSettingsSerializationHelpers.h"
-
 // Notes on defining ActionArgs and ActionEventArgs:
 // * All properties specific to an action should be defined as an ActionArgs
 //   class that implements IActionArgs
@@ -36,7 +31,6 @@

 namespace winrt::TerminalApp::implementation
 {
-    using namespace ::TerminalApp;
    using FromJsonResult = std::tuple<winrt::TerminalApp::IActionArgs, std::vector<::TerminalApp::SettingsLoadWarnings>>;

    struct ActionEventArgs : public ActionEventArgsT<ActionEventArgs>
@@ -79,11 +73,26 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<NewTerminalArgs>();
-            JsonUtils::GetValueForKey(json, CommandlineKey, args->_Commandline);
-            JsonUtils::GetValueForKey(json, StartingDirectoryKey, args->_StartingDirectory);
-            JsonUtils::GetValueForKey(json, TabTitleKey, args->_TabTitle);
-            JsonUtils::GetValueForKey(json, ProfileIndexKey, args->_ProfileIndex);
-            JsonUtils::GetValueForKey(json, ProfileKey, args->_Profile);
+            if (auto commandline{ json[JsonKey(CommandlineKey)] })
+            {
+                args->_Commandline = winrt::to_hstring(commandline.asString());
+            }
+            if (auto startingDirectory{ json[JsonKey(StartingDirectoryKey)] })
+            {
+                args->_StartingDirectory = winrt::to_hstring(startingDirectory.asString());
+            }
+            if (auto tabTitle{ json[JsonKey(TabTitleKey)] })
+            {
+                args->_TabTitle = winrt::to_hstring(tabTitle.asString());
+            }
+            if (auto index{ json[JsonKey(ProfileIndexKey)] })
+            {
+                args->_ProfileIndex = index.asInt();
+            }
+            if (auto profile{ json[JsonKey(ProfileKey)] })
+            {
+                args->_Profile = winrt::to_hstring(profile.asString());
+            }
            return *args;
        }
    };
@@ -111,7 +120,10 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<CopyTextArgs>();
-            JsonUtils::GetValueForKey(json, SingleLineKey, args->_SingleLine);
+            if (auto singleLine{ json[JsonKey(SingleLineKey)] })
+            {
+                args->_SingleLine = singleLine.asBool();
+            }
            return { *args, {} };
        }
    };
@@ -165,11 +177,49 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<SwitchToTabArgs>();
-            JsonUtils::GetValueForKey(json, TabIndexKey, args->_TabIndex);
+            if (auto tabIndex{ json[JsonKey(TabIndexKey)] })
+            {
+                args->_TabIndex = tabIndex.asUInt();
+            }
            return { *args, {} };
        }
    };

+    // Possible Direction values
+    // TODO:GH#2550/#3475 - move these to a centralized deserializing place
+    static constexpr std::string_view LeftString{ "left" };
+    static constexpr std::string_view RightString{ "right" };
+    static constexpr std::string_view UpString{ "up" };
+    static constexpr std::string_view DownString{ "down" };
+
+    // Function Description:
+    // - Helper function for parsing a Direction from a string
+    // Arguments:
+    // - directionString: the string to attempt to parse
+    // Return Value:
+    // - The encoded Direction value, or Direction::None if it was an invalid string
+    static TerminalApp::Direction ParseDirection(const std::string& directionString)
+    {
+        if (directionString == LeftString)
+        {
+            return TerminalApp::Direction::Left;
+        }
+        else if (directionString == RightString)
+        {
+            return TerminalApp::Direction::Right;
+        }
+        else if (directionString == UpString)
+        {
+            return TerminalApp::Direction::Up;
+        }
+        else if (directionString == DownString)
+        {
+            return TerminalApp::Direction::Down;
+        }
+        // default behavior for invalid data
+        return TerminalApp::Direction::None;
+    };
+
    struct ResizePaneArgs : public ResizePaneArgsT<ResizePaneArgs>
    {
        ResizePaneArgs() = default;
@@ -193,7 +243,10 @@ 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 (auto directionString{ json[JsonKey(DirectionKey)] })
+            {
+                args->_Direction = ParseDirection(directionString.asString());
+            }
            if (args->_Direction == TerminalApp::Direction::None)
            {
                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
@@ -228,7 +281,10 @@ 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 (auto directionString{ json[JsonKey(DirectionKey)] })
+            {
+                args->_Direction = ParseDirection(directionString.asString());
+            }
            if (args->_Direction == TerminalApp::Direction::None)
            {
                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
@@ -263,11 +319,48 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<AdjustFontSizeArgs>();
-            JsonUtils::GetValueForKey(json, AdjustFontSizeDelta, args->_Delta);
+            if (auto jsonDelta{ json[JsonKey(AdjustFontSizeDelta)] })
+            {
+                args->_Delta = jsonDelta.asInt();
+            }
            return { *args, {} };
        }
    };

+    // Possible SplitState values
+    // TODO:GH#2550/#3475 - move these to a centralized deserializing place
+    static constexpr std::string_view VerticalKey{ "vertical" };
+    static constexpr std::string_view HorizontalKey{ "horizontal" };
+    static constexpr std::string_view AutomaticKey{ "auto" };
+    static TerminalApp::SplitState ParseSplitState(const std::string& stateString)
+    {
+        if (stateString == VerticalKey)
+        {
+            return TerminalApp::SplitState::Vertical;
+        }
+        else if (stateString == HorizontalKey)
+        {
+            return TerminalApp::SplitState::Horizontal;
+        }
+        else if (stateString == AutomaticKey)
+        {
+            return TerminalApp::SplitState::Automatic;
+        }
+        // default behavior for invalid data
+        return TerminalApp::SplitState::Automatic;
+    };
+
+    // Possible SplitType values
+    static constexpr std::string_view DuplicateKey{ "duplicate" };
+    static TerminalApp::SplitType ParseSplitModeState(const std::string& stateString)
+    {
+        if (stateString == DuplicateKey)
+        {
+            return TerminalApp::SplitType::Duplicate;
+        }
+        return TerminalApp::SplitType::Manual;
+    }
+
    struct SplitPaneArgs : public SplitPaneArgsT<SplitPaneArgs>
    {
        SplitPaneArgs() = default;
@@ -298,12 +391,48 @@ namespace winrt::TerminalApp::implementation
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<SplitPaneArgs>();
            args->_TerminalArgs = NewTerminalArgs::FromJson(json);
-            JsonUtils::GetValueForKey(json, SplitKey, args->_SplitStyle);
-            JsonUtils::GetValueForKey(json, SplitModeKey, args->_SplitMode);
+            if (auto jsonStyle{ json[JsonKey(SplitKey)] })
+            {
+                args->_SplitStyle = ParseSplitState(jsonStyle.asString());
+            }
+            if (auto jsonStyle{ json[JsonKey(SplitModeKey)] })
+            {
+                args->_SplitMode = ParseSplitModeState(jsonStyle.asString());
+            }
            return { *args, {} };
        }
    };

+    // Possible SettingsTarget values
+    // TODO:GH#2550/#3475 - move these to a centralized deserializing place
+    static constexpr std::string_view SettingsFileString{ "settingsFile" };
+    static constexpr std::string_view DefaultsFileString{ "defaultsFile" };
+    static constexpr std::string_view AllFilesString{ "allFiles" };
+
+    // Function Description:
+    // - Helper function for parsing a SettingsTarget from a string
+    // Arguments:
+    // - targetString: the string to attempt to parse
+    // Return Value:
+    // - The encoded SettingsTarget value, or SettingsTarget::SettingsFile if it was an invalid string
+    static TerminalApp::SettingsTarget ParseSettingsTarget(const std::string& targetString)
+    {
+        if (targetString == SettingsFileString)
+        {
+            return TerminalApp::SettingsTarget::SettingsFile;
+        }
+        else if (targetString == DefaultsFileString)
+        {
+            return TerminalApp::SettingsTarget::DefaultsFile;
+        }
+        else if (targetString == AllFilesString)
+        {
+            return TerminalApp::SettingsTarget::AllFiles;
+        }
+        // default behavior for invalid data
+        return TerminalApp::SettingsTarget::SettingsFile;
+    };
+
    struct OpenSettingsArgs : public OpenSettingsArgsT<OpenSettingsArgs>
    {
        OpenSettingsArgs() = default;
@@ -327,7 +456,10 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<OpenSettingsArgs>();
-            JsonUtils::GetValueForKey(json, TargetKey, args->_Target);
+            if (auto targetString{ json[JsonKey(TargetKey)] })
+            {
+                args->_Target = ParseSettingsTarget(targetString.asString());
+            }
            return { *args, {} };
        }
    };
@@ -355,10 +487,16 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<SetTabColorArgs>();
-            if (const auto temp{ JsonUtils::GetValueForKey<std::optional<til::color>>(json, ColorKey) })
+            std::optional<til::color> temp;
+            try
            {
-                args->_TabColor = static_cast<uint32_t>(*temp);
+                ::TerminalApp::JsonUtils::GetOptionalColor(json, ColorKey, temp);
+                if (temp.has_value())
+                {
+                    args->_TabColor = static_cast<uint32_t>(temp.value());
+                }
            }
+            CATCH_LOG();
            return { *args, {} };
        }
    };
@@ -386,99 +524,13 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<RenameTabArgs>();
-            JsonUtils::GetValueForKey(json, TitleKey, args->_Title);
-            return { *args, {} };
-        }
-    };
-
-    struct ExecuteCommandlineArgs : public ExecuteCommandlineArgsT<ExecuteCommandlineArgs>
-    {
-        ExecuteCommandlineArgs() = default;
-        GETSET_PROPERTY(winrt::hstring, Commandline, L"");
-
-        static constexpr std::string_view CommandlineKey{ "commandline" };
-
-    public:
-        hstring GenerateName() const;
-
-        bool Equals(const IActionArgs& other)
-        {
-            auto otherAsUs = other.try_as<ExecuteCommandlineArgs>();
-            if (otherAsUs)
+            if (auto title{ json[JsonKey(TitleKey)] })
            {
-                return otherAsUs->_Commandline == _Commandline;
-            }
-            return false;
-        };
-        static FromJsonResult FromJson(const Json::Value& json)
-        {
-            // LOAD BEARING: Not using make_self here _will_ break you in the future!
-            auto args = winrt::make_self<ExecuteCommandlineArgs>();
-            JsonUtils::GetValueForKey(json, CommandlineKey, args->_Commandline);
-            if (args->_Commandline.empty())
-            {
-                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+                args->_Title = winrt::to_hstring(title.asString());
            }
            return { *args, {} };
        }
    };
-
-    struct CloseOtherTabsArgs : public CloseOtherTabsArgsT<CloseOtherTabsArgs>
-    {
-        CloseOtherTabsArgs() = default;
-        GETSET_PROPERTY(uint32_t, Index, 0);
-
-        static constexpr std::string_view IndexKey{ "index" };
-
-    public:
-        hstring GenerateName() const;
-
-        bool Equals(const IActionArgs& other)
-        {
-            auto otherAsUs = other.try_as<CloseOtherTabsArgs>();
-            if (otherAsUs)
-            {
-                return otherAsUs->_Index == _Index;
-            }
-            return false;
-        };
-        static FromJsonResult FromJson(const Json::Value& json)
-        {
-            // LOAD BEARING: Not using make_self here _will_ break you in the future!
-            auto args = winrt::make_self<CloseOtherTabsArgs>();
-            JsonUtils::GetValueForKey(json, IndexKey, args->_Index);
-            return { *args, {} };
-        }
-    };
-
-    struct CloseTabsAfterArgs : public CloseTabsAfterArgsT<CloseTabsAfterArgs>
-    {
-        CloseTabsAfterArgs() = default;
-        GETSET_PROPERTY(uint32_t, Index, 0);
-
-        static constexpr std::string_view IndexKey{ "index" };
-
-    public:
-        hstring GenerateName() const;
-
-        bool Equals(const IActionArgs& other)
-        {
-            auto otherAsUs = other.try_as<CloseTabsAfterArgs>();
-            if (otherAsUs)
-            {
-                return otherAsUs->_Index == _Index;
-            }
-            return false;
-        };
-        static FromJsonResult FromJson(const Json::Value& json)
-        {
-            // LOAD BEARING: Not using make_self here _will_ break you in the future!
-            auto args = winrt::make_self<CloseTabsAfterArgs>();
-            JsonUtils::GetValueForKey(json, IndexKey, args->_Index);
-            return { *args, {} };
-        }
-    };
-
 }

 namespace winrt::TerminalApp::factory_implementation
--- a/src/cascadia/TerminalApp/ActionArgs.idl
+++ b/src/cascadia/TerminalApp/ActionArgs.idl
@@ -115,19 +115,4 @@ namespace TerminalApp
    {
        String Title { get; };
    };
-
-    [default_interface] runtimeclass ExecuteCommandlineArgs : IActionArgs
-    {
-        String Commandline;
-    };
-
-    [default_interface] runtimeclass CloseOtherTabsArgs : IActionArgs
-    {
-        UInt32 Index { get; };
-    };
-
-    [default_interface] runtimeclass CloseTabsAfterArgs : IActionArgs
-    {
-        UInt32 Index { get; };
-    };
 }
--- a/src/cascadia/TerminalApp/AppActionHandlers.cpp
+++ b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -11,9 +11,9 @@ using namespace winrt::Windows::ApplicationModel::DataTransfer;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Text;
 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;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
 using namespace ::TerminalApp;
@@ -334,65 +334,4 @@ namespace winrt::TerminalApp::implementation
        }
        args.Handled(true);
    }
-
-    void TerminalPage::_HandleExecuteCommandline(const IInspectable& /*sender*/,
-                                                 const TerminalApp::ActionEventArgs& actionArgs)
-    {
-        if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::ExecuteCommandlineArgs>())
-        {
-            auto actions = winrt::single_threaded_vector<winrt::TerminalApp::ActionAndArgs>(std::move(
-                TerminalPage::ConvertExecuteCommandlineToActions(realArgs)));
-
-            if (_startupActions.Size() != 0)
-            {
-                actionArgs.Handled(true);
-                _ProcessStartupActions(actions, false);
-            }
-        }
-    }
-
-    void TerminalPage::_HandleCloseOtherTabs(const IInspectable& /*sender*/,
-                                             const TerminalApp::ActionEventArgs& actionArgs)
-    {
-        if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::CloseOtherTabsArgs>())
-        {
-            uint32_t index = realArgs.Index();
-
-            // Remove tabs after the current one
-            while (_tabs.Size() > index + 1)
-            {
-                _RemoveTabViewItemByIndex(_tabs.Size() - 1);
-            }
-
-            // Remove all of them leading up to the selected tab
-            while (_tabs.Size() > 1)
-            {
-                _RemoveTabViewItemByIndex(0);
-            }
-
-            actionArgs.Handled(true);
-        }
-    }
-    void TerminalPage::_HandleCloseTabsAfter(const IInspectable& /*sender*/,
-                                             const TerminalApp::ActionEventArgs& actionArgs)
-    {
-        if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::CloseTabsAfterArgs>())
-        {
-            uint32_t index = realArgs.Index();
-
-            // Remove tabs after the current one
-            while (_tabs.Size() > index + 1)
-            {
-                _RemoveTabViewItemByIndex(_tabs.Size() - 1);
-            }
-
-            // TODO:GH#7182 For whatever reason, if you run this action
-            // when the tab that's currently focused is _before_ the `index`
-            // param, then the tabs will expand to fill the entire width of the
-            // tab row, until you mouse over them. Probably has something to do
-            // with tabs not resizing down until there's a mouse exit event.
-
-            actionArgs.Handled(true);
-        }
-    }
 }
--- a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
+++ b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
@@ -599,7 +599,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::deque<winrt::TerminalApp::ActionAndArgs>& AppCommandlineArgs::GetStartupActions()
 {
    return _startupActions;
 }
@@ -658,8 +658,7 @@ void AppCommandlineArgs::ValidateStartupCommands()
        auto newTerminalArgs = winrt::make_self<implementation::NewTerminalArgs>();
        args->TerminalArgs(*newTerminalArgs);
        newTabAction->Args(*args);
-        // push the arg onto the front
-        _startupActions.insert(_startupActions.begin(), 1, *newTabAction);
+        _startupActions.push_front(*newTabAction);
    }
 }

@@ -667,52 +666,3 @@ std::optional<winrt::TerminalApp::LaunchMode> AppCommandlineArgs::GetLaunchMode(
 {
    return _launchMode;
 }
-
-// Method Description:
-// - Attempts to parse an array of commandline args into a list of
-//   commands to execute, and then parses these commands. As commands are
-//   successfully parsed, they will generate ShortcutActions for us to be
-//   able to execute. If we fail to parse any commands, we'll return the
-//   error code from the failure to parse that command, and stop processing
-//   additional commands.
-// - The first arg in args should be the program name "wt" (or some variant). It
-//   will be ignored during parsing.
-// Arguments:
-// - args: an array of strings to process as a commandline. These args can contain spaces
-// Return Value:
-// - 0 if the commandline was successfully parsed
-int AppCommandlineArgs::ParseArgs(winrt::array_view<const winrt::hstring>& args)
-{
-    auto commands = ::TerminalApp::AppCommandlineArgs::BuildCommands(args);
-
-    for (auto& cmdBlob : commands)
-    {
-        // On one hand, it seems like we should be able to have one
-        // AppCommandlineArgs for parsing all of them, and collect the
-        // results one at a time.
-        //
-        // On the other hand, re-using a CLI::App seems to leave state from
-        // previous parsings around, so we could get mysterious behavior
-        // where one command affects the values of the next.
-        //
-        // From https://cliutils.github.io/CLI11/book/chapters/options.html:
-        // > If that option is not given, CLI11 will not touch the initial
-        // > value. This allows you to set up defaults by simply setting
-        // > your value beforehand.
-        //
-        // So we pretty much need the to either manually reset the state
-        // each command, or build new ones.
-        const auto result = ParseCommand(cmdBlob);
-
-        // If this succeeded, result will be 0. Otherwise, the caller should
-        // exit(result), to exit the program.
-        if (result != 0)
-        {
-            return result;
-        }
-    }
-
-    // If all the args were successfully parsed, we'll have some commands
-    // built in _appArgs, which we'll use when the application starts up.
-    return 0;
-}
--- a/src/cascadia/TerminalApp/AppCommandlineArgs.h
+++ b/src/cascadia/TerminalApp/AppCommandlineArgs.h
@@ -28,15 +28,13 @@ public:

    AppCommandlineArgs();
    ~AppCommandlineArgs() = default;
-
    int ParseCommand(const Commandline& command);
-    int ParseArgs(winrt::array_view<const winrt::hstring>& args);

    static std::vector<Commandline> BuildCommands(const std::vector<const wchar_t*>& args);
    static std::vector<Commandline> BuildCommands(winrt::array_view<const winrt::hstring>& args);

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

@@ -92,7 +90,7 @@ private:
    std::optional<winrt::TerminalApp::LaunchMode> _launchMode{ std::nullopt };
    // Are you adding more args here? Make sure to reset them in _resetStateToDefault

-    std::vector<winrt::TerminalApp::ActionAndArgs> _startupActions;
+    std::deque<winrt::TerminalApp::ActionAndArgs> _startupActions;
    std::string _exitMessage;
    bool _shouldExitEarly{ false };

--- a/src/cascadia/TerminalApp/AppKeyBindings.cpp
+++ b/src/cascadia/TerminalApp/AppKeyBindings.cpp
@@ -9,12 +9,12 @@

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

 namespace winrt::TerminalApp::implementation
 {
    void AppKeyBindings::SetKeyBinding(const TerminalApp::ActionAndArgs& actionAndArgs,
-                                       const KeyChord& chord)
+                                       const Settings::KeyChord& chord)
    {
        _keyShortcuts[chord] = actionAndArgs;
    }
@@ -25,7 +25,7 @@ namespace winrt::TerminalApp::implementation
    // - chord: the keystroke to remove the action for.
    // Return Value:
    // - <none>
-    void AppKeyBindings::ClearKeyBinding(const KeyChord& chord)
+    void AppKeyBindings::ClearKeyBinding(const Settings::KeyChord& chord)
    {
        _keyShortcuts.erase(chord);
    }
@@ -67,7 +67,7 @@ namespace winrt::TerminalApp::implementation
        return { nullptr };
    }

-    bool AppKeyBindings::TryKeyChord(const KeyChord& kc)
+    bool AppKeyBindings::TryKeyChord(const Settings::KeyChord& kc)
    {
        const auto keyIter = _keyShortcuts.find(kc);
        if (keyIter != _keyShortcuts.end())
@@ -87,19 +87,19 @@ namespace winrt::TerminalApp::implementation
    // - Takes the KeyModifier flags from Terminal and maps them to the WinRT types which are used by XAML
    // Return Value:
    // - a Windows::System::VirtualKeyModifiers object with the flags of which modifiers used.
-    Windows::System::VirtualKeyModifiers AppKeyBindings::ConvertVKModifiers(KeyModifiers modifiers)
+    Windows::System::VirtualKeyModifiers AppKeyBindings::ConvertVKModifiers(Settings::KeyModifiers modifiers)
    {
        Windows::System::VirtualKeyModifiers keyModifiers = Windows::System::VirtualKeyModifiers::None;

-        if (WI_IsFlagSet(modifiers, KeyModifiers::Ctrl))
+        if (WI_IsFlagSet(modifiers, Settings::KeyModifiers::Ctrl))
        {
            keyModifiers |= Windows::System::VirtualKeyModifiers::Control;
        }
-        if (WI_IsFlagSet(modifiers, KeyModifiers::Shift))
+        if (WI_IsFlagSet(modifiers, Settings::KeyModifiers::Shift))
        {
            keyModifiers |= Windows::System::VirtualKeyModifiers::Shift;
        }
-        if (WI_IsFlagSet(modifiers, KeyModifiers::Alt))
+        if (WI_IsFlagSet(modifiers, Settings::KeyModifiers::Alt))
        {
            // note: Menu is the Alt VK_MENU
            keyModifiers |= Windows::System::VirtualKeyModifiers::Menu;
--- a/src/cascadia/TerminalApp/AppKeyBindings.h
+++ b/src/cascadia/TerminalApp/AppKeyBindings.h
@@ -20,10 +20,10 @@ namespace winrt::TerminalApp::implementation
 {
    struct KeyChordHash
    {
-        std::size_t operator()(const winrt::Microsoft::Terminal::TerminalControl::KeyChord& key) const
+        std::size_t operator()(const winrt::Microsoft::Terminal::Settings::KeyChord& key) const
        {
            std::hash<int32_t> keyHash;
-            std::hash<winrt::Microsoft::Terminal::TerminalControl::KeyModifiers> modifiersHash;
+            std::hash<winrt::Microsoft::Terminal::Settings::KeyModifiers> modifiersHash;
            std::size_t hashedKey = keyHash(key.Vkey());
            std::size_t hashedMods = modifiersHash(key.Modifiers());
            return hashedKey ^ hashedMods;
@@ -32,7 +32,7 @@ namespace winrt::TerminalApp::implementation

    struct KeyChordEquality
    {
-        bool operator()(const winrt::Microsoft::Terminal::TerminalControl::KeyChord& lhs, const winrt::Microsoft::Terminal::TerminalControl::KeyChord& rhs) const
+        bool operator()(const winrt::Microsoft::Terminal::Settings::KeyChord& lhs, const winrt::Microsoft::Terminal::Settings::KeyChord& rhs) const
        {
            return lhs.Modifiers() == rhs.Modifiers() && lhs.Vkey() == rhs.Vkey();
        }
@@ -42,15 +42,15 @@ namespace winrt::TerminalApp::implementation
    {
        AppKeyBindings() = default;

-        bool TryKeyChord(winrt::Microsoft::Terminal::TerminalControl::KeyChord const& kc);
+        bool TryKeyChord(winrt::Microsoft::Terminal::Settings::KeyChord const& kc);

        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);
+                           winrt::Microsoft::Terminal::Settings::KeyChord const& chord);
+        void ClearKeyBinding(winrt::Microsoft::Terminal::Settings::KeyChord const& chord);
+        Microsoft::Terminal::Settings::KeyChord GetKeyBindingForAction(TerminalApp::ShortcutAction const& action);
+        Microsoft::Terminal::Settings::KeyChord GetKeyBindingForActionWithArgs(TerminalApp::ActionAndArgs const& actionAndArgs);

-        static Windows::System::VirtualKeyModifiers ConvertVKModifiers(winrt::Microsoft::Terminal::TerminalControl::KeyModifiers modifiers);
+        static Windows::System::VirtualKeyModifiers ConvertVKModifiers(winrt::Microsoft::Terminal::Settings::KeyModifiers modifiers);

        // Defined in AppKeyBindingsSerialization.cpp
        std::vector<::TerminalApp::SettingsLoadWarnings> LayerJson(const Json::Value& json);
@@ -59,7 +59,7 @@ namespace winrt::TerminalApp::implementation
        void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);

    private:
-        std::unordered_map<winrt::Microsoft::Terminal::TerminalControl::KeyChord, TerminalApp::ActionAndArgs, KeyChordHash, KeyChordEquality> _keyShortcuts;
+        std::unordered_map<winrt::Microsoft::Terminal::Settings::KeyChord, TerminalApp::ActionAndArgs, KeyChordHash, KeyChordEquality> _keyShortcuts;

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

--- a/src/cascadia/TerminalApp/AppKeyBindings.idl
+++ b/src/cascadia/TerminalApp/AppKeyBindings.idl
@@ -5,15 +5,15 @@ import "../ShortcutActionDispatch.idl";

 namespace TerminalApp
 {
-    [default_interface] runtimeclass AppKeyBindings : Microsoft.Terminal.TerminalControl.IKeyBindings
+    [default_interface] runtimeclass AppKeyBindings : Microsoft.Terminal.Settings.IKeyBindings
    {
        AppKeyBindings();

-        void SetKeyBinding(ActionAndArgs actionAndArgs, Microsoft.Terminal.TerminalControl.KeyChord chord);
-        void ClearKeyBinding(Microsoft.Terminal.TerminalControl.KeyChord chord);
+        void SetKeyBinding(ActionAndArgs actionAndArgs, Microsoft.Terminal.Settings.KeyChord chord);
+        void ClearKeyBinding(Microsoft.Terminal.Settings.KeyChord chord);

-        Microsoft.Terminal.TerminalControl.KeyChord GetKeyBindingForAction(ShortcutAction action);
-        Microsoft.Terminal.TerminalControl.KeyChord GetKeyBindingForActionWithArgs(ActionAndArgs actionAndArgs);
+        Microsoft.Terminal.Settings.KeyChord GetKeyBindingForAction(ShortcutAction action);
+        Microsoft.Terminal.Settings.KeyChord GetKeyBindingForActionWithArgs(ActionAndArgs actionAndArgs);

        void SetDispatch(ShortcutActionDispatch dispatch);
    }
--- a/src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp
+++ b/src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp
@@ -12,8 +12,9 @@
 #include "KeyChordSerialization.h"
 #include "Utils.h"
 #include "JsonUtils.h"
+#include <winrt/Microsoft.Terminal.Settings.h>

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

 static constexpr std::string_view KeysKey{ "keys" };
--- a/src/cascadia/TerminalApp/AppLogic.cpp
+++ b/src/cascadia/TerminalApp/AppLogic.cpp
@@ -15,6 +15,7 @@ using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::System;
 using namespace winrt::Microsoft::Terminal;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace ::TerminalApp;

@@ -473,7 +474,7 @@ namespace winrt::TerminalApp::implementation
    // - <none>
    // Return Value:
    // - a point containing the requested dimensions in pixels.
-    winrt::Windows::Foundation::Size AppLogic::GetLaunchDimensions(uint32_t dpi)
+    winrt::Windows::Foundation::Point AppLogic::GetLaunchDimensions(uint32_t dpi)
    {
        if (!_loadedInitialSettings)
        {
@@ -503,7 +504,7 @@ namespace winrt::TerminalApp::implementation
            // of the height calculation here.
            auto titlebar = TitlebarControl{ static_cast<uint64_t>(0) };
            titlebar.Measure({ SHRT_MAX, SHRT_MAX });
-            proposedSize.Height += (titlebar.DesiredSize().Height) * scale;
+            proposedSize.Y += (titlebar.DesiredSize().Height) * scale;
        }
        else if (_settings->GlobalSettings().AlwaysShowTabs())
        {
@@ -518,7 +519,7 @@ namespace winrt::TerminalApp::implementation
            // For whatever reason, there's about 6px of unaccounted-for space
            // in the application. I couldn't tell you where these 6px are
            // coming from, but they need to be included in this math.
-            proposedSize.Width += (tabControl.DesiredSize().Height + 6) * scale;
+            proposedSize.Y += (tabControl.DesiredSize().Height + 6) * scale;
        }

        return proposedSize;
@@ -973,7 +974,7 @@ namespace winrt::TerminalApp::implementation
    //   or 0. (see AppLogic::_ParseArgs)
    int32_t AppLogic::SetStartupCommandline(array_view<const winrt::hstring> args)
    {
-        const auto result = _appArgs.ParseArgs(args);
+        const auto result = _ParseArgs(args);
        if (result == 0)
        {
            _appArgs.ValidateStartupCommands();
@@ -983,6 +984,53 @@ namespace winrt::TerminalApp::implementation
        return result;
    }

+    // Method Description:
+    // - Attempts to parse an array of commandline args into a list of
+    //   commands to execute, and then parses these commands. As commands are
+    //   successfully parsed, they will generate ShortcutActions for us to be
+    //   able to execute. If we fail to parse any commands, we'll return the
+    //   error code from the failure to parse that command, and stop processing
+    //   additional commands.
+    // Arguments:
+    // - args: an array of strings to process as a commandline. These args can contain spaces
+    // Return Value:
+    // - 0 if the commandline was successfully parsed
+    int AppLogic::_ParseArgs(winrt::array_view<const hstring>& args)
+    {
+        auto commands = ::TerminalApp::AppCommandlineArgs::BuildCommands(args);
+
+        for (auto& cmdBlob : commands)
+        {
+            // On one hand, it seems like we should be able to have one
+            // AppCommandlineArgs for parsing all of them, and collect the
+            // results one at a time.
+            //
+            // On the other hand, re-using a CLI::App seems to leave state from
+            // previous parsings around, so we could get mysterious behavior
+            // where one command affects the values of the next.
+            //
+            // From https://cliutils.github.io/CLI11/book/chapters/options.html:
+            // > If that option is not given, CLI11 will not touch the initial
+            // > value. This allows you to set up defaults by simply setting
+            // > your value beforehand.
+            //
+            // So we pretty much need the to either manually reset the state
+            // each command, or build new ones.
+            const auto result = _appArgs.ParseCommand(cmdBlob);
+
+            // If this succeeded, result will be 0. Otherwise, the caller should
+            // exit(result), to exit the program.
+            if (result != 0)
+            {
+                return result;
+            }
+        }
+
+        // If all the args were successfully parsed, we'll have some commands
+        // built in _appArgs, which we'll use when the application starts up.
+        return 0;
+    }
+
    // Method Description:
    // - If there were any errors parsing the commandline that was used to
    //   initialize the terminal, this will return a string containing that
--- a/src/cascadia/TerminalApp/AppLogic.h
+++ b/src/cascadia/TerminalApp/AppLogic.h
@@ -37,7 +37,7 @@ namespace winrt::TerminalApp::implementation
        bool Fullscreen() const;
        bool AlwaysOnTop() const;

-        Windows::Foundation::Size GetLaunchDimensions(uint32_t dpi);
+        Windows::Foundation::Point GetLaunchDimensions(uint32_t dpi);
        winrt::Windows::Foundation::Point GetLaunchInitialPositions(int32_t defaultInitialX, int32_t defaultInitialY);
        winrt::Windows::UI::Xaml::ElementTheme GetRequestedTheme();
        LaunchMode GetLaunchMode();
--- a/src/cascadia/TerminalApp/AppLogic.idl
+++ b/src/cascadia/TerminalApp/AppLogic.idl
@@ -45,8 +45,7 @@ namespace TerminalApp
        Boolean Fullscreen { get; };
        Boolean AlwaysOnTop { get; };

-        Windows.Foundation.Size GetLaunchDimensions(UInt32 dpi);
-
+        Windows.Foundation.Point GetLaunchDimensions(UInt32 dpi);
        Windows.Foundation.Point GetLaunchInitialPositions(Int32 defaultInitialX, Int32 defaultInitialY);
        Windows.UI.Xaml.ElementTheme GetRequestedTheme();
        LaunchMode GetLaunchMode();
--- a/src/cascadia/TerminalApp/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettings.cpp
@@ -17,6 +17,7 @@
 #include "WslDistroGenerator.h"
 #include "AzureCloudShellGenerator.h"

+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace ::TerminalApp;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::TerminalApp;
--- a/src/cascadia/TerminalApp/CascadiaSettings.h
+++ b/src/cascadia/TerminalApp/CascadiaSettings.h
@@ -54,8 +54,8 @@ public:

    static const CascadiaSettings& GetCurrentAppSettings();

-    std::tuple<GUID, winrt::TerminalApp::TerminalSettings> BuildSettings(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs) const;
-    winrt::TerminalApp::TerminalSettings BuildSettings(GUID profileGuid) const;
+    std::tuple<GUID, winrt::Microsoft::Terminal::Settings::TerminalSettings> BuildSettings(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs) const;
+    winrt::Microsoft::Terminal::Settings::TerminalSettings BuildSettings(GUID profileGuid) const;

    GlobalAppSettings& GlobalSettings();

--- a/src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp
@@ -249,9 +249,9 @@ void CascadiaSettings::_LoadDynamicProfiles()
    const auto disabledProfileSources = CascadiaSettings::_GetDisabledProfileSourcesJsonObject(_userSettings);
    if (disabledProfileSources.isArray())
    {
-        for (const auto& json : disabledProfileSources)
+        for (const auto& ns : disabledProfileSources)
        {
-            ignoredNamespaces.emplace(JsonUtils::GetValue<std::wstring>(json));
+            ignoredNamespaces.emplace(GetWstringFromJson(ns));
        }
    }

--- a/src/cascadia/TerminalApp/ColorScheme.cpp
+++ b/src/cascadia/TerminalApp/ColorScheme.cpp
@@ -10,7 +10,8 @@

 using namespace ::Microsoft::Console;
 using namespace TerminalApp;
-using namespace winrt::TerminalApp;
+using namespace winrt::Microsoft::Terminal::Settings;
+using namespace winrt::Microsoft::Terminal::TerminalControl;

 static constexpr std::string_view NameKey{ "name" };
 static constexpr std::string_view ForegroundKey{ "foreground" };
@@ -104,9 +105,9 @@ ColorScheme ColorScheme::FromJson(const Json::Value& json)
 // - true iff the json object has the same `name` as we do.
 bool ColorScheme::ShouldBeLayered(const Json::Value& json) const
 {
-    std::wstring nameFromJson{};
-    if (JsonUtils::GetValueForKey(json, NameKey, nameFromJson))
+    if (const auto name{ json[JsonKey(NameKey)] })
    {
+        const auto nameFromJson = GetWstringFromJson(name);
        return nameFromJson == _schemeName;
    }
    return false;
@@ -124,16 +125,39 @@ bool ColorScheme::ShouldBeLayered(const Json::Value& json) const
 // <none>
 void ColorScheme::LayerJson(const Json::Value& json)
 {
-    JsonUtils::GetValueForKey(json, NameKey, _schemeName);
-    JsonUtils::GetValueForKey(json, ForegroundKey, _defaultForeground);
-    JsonUtils::GetValueForKey(json, BackgroundKey, _defaultBackground);
-    JsonUtils::GetValueForKey(json, SelectionBackgroundKey, _selectionBackground);
-    JsonUtils::GetValueForKey(json, CursorColorKey, _cursorColor);
+    if (auto name{ json[JsonKey(NameKey)] })
+    {
+        _schemeName = winrt::to_hstring(name.asString());
+    }
+    if (auto fgString{ json[JsonKey(ForegroundKey)] })
+    {
+        const auto color = Utils::ColorFromHexString(fgString.asString());
+        _defaultForeground = color;
+    }
+    if (auto bgString{ json[JsonKey(BackgroundKey)] })
+    {
+        const auto color = Utils::ColorFromHexString(bgString.asString());
+        _defaultBackground = color;
+    }
+    if (auto sbString{ json[JsonKey(SelectionBackgroundKey)] })
+    {
+        const auto color = Utils::ColorFromHexString(sbString.asString());
+        _selectionBackground = color;
+    }
+    if (auto sbString{ json[JsonKey(CursorColorKey)] })
+    {
+        const auto color = Utils::ColorFromHexString(sbString.asString());
+        _cursorColor = color;
+    }

    int i = 0;
    for (const auto& current : TableColors)
    {
-        JsonUtils::GetValueForKey(json, current, _table.at(i));
+        if (auto str{ json[JsonKey(current)] })
+        {
+            const auto color = Utils::ColorFromHexString(str.asString());
+            _table.at(i) = color;
+        }
        i++;
    }
 }
@@ -176,7 +200,11 @@ til::color ColorScheme::GetCursorColor() const noexcept
 // - the name of the color scheme represented by `json` as a std::wstring optional
 //   i.e. the value of the `name` property.
 // - returns std::nullopt if `json` doesn't have the `name` property
-std::optional<std::wstring> ColorScheme::GetNameFromJson(const Json::Value& json)
+std::optional<std::wstring> TerminalApp::ColorScheme::GetNameFromJson(const Json::Value& json)
 {
-    return JsonUtils::GetValueForKey<std::optional<std::wstring>>(json, NameKey);
+    if (const auto name{ json[JsonKey(NameKey)] })
+    {
+        return GetWstringFromJson(name);
+    }
+    return std::nullopt;
 }
--- a/src/cascadia/TerminalApp/ColorScheme.h
+++ b/src/cascadia/TerminalApp/ColorScheme.h
@@ -15,7 +15,8 @@ Author(s):

 --*/
 #pragma once
-#include "TerminalSettings.h"
+#include <winrt/Microsoft.Terminal.Settings.h>
+#include <winrt/Microsoft.Terminal.TerminalControl.h>
 #include "../../inc/conattrs.hpp"

 // fwdecl unittest classes
@@ -37,7 +38,7 @@ public:
    ColorScheme(std::wstring name, til::color defaultFg, til::color defaultBg, til::color cursorColor);
    ~ColorScheme();

-    void ApplyScheme(winrt::TerminalApp::TerminalSettings terminalSettings) const;
+    void ApplyScheme(winrt::Microsoft::Terminal::Settings::TerminalSettings terminalSettings) const;

    static ColorScheme FromJson(const Json::Value& json);
    bool ShouldBeLayered(const Json::Value& json) const;
--- a/src/cascadia/TerminalApp/Command.cpp
+++ b/src/cascadia/TerminalApp/Command.cpp
@@ -7,11 +7,10 @@

 #include "Utils.h"
 #include "ActionAndArgs.h"
-#include "JsonUtils.h"
 #include <LibraryResources.h>

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

 static constexpr std::string_view NameKey{ "name" };
 static constexpr std::string_view IconPathKey{ "iconPath" };
@@ -36,17 +35,25 @@ namespace winrt::TerminalApp::implementation
        {
            if (name.isObject())
            {
-                if (const auto resourceKey{ JsonUtils::GetValueForKey<std::optional<std::wstring>>(name, "key") })
+                try
                {
-                    if (HasLibraryResourceWithName(*resourceKey))
+                    if (const auto keyJson{ name[JsonKey("key")] })
                    {
-                        return GetLibraryResourceString(*resourceKey);
+                        // Make sure the key is present before we try
+                        // loading it. Otherwise we'll crash
+                        const auto resourceKey = GetWstringFromJson(keyJson);
+                        if (HasLibraryResourceWithName(resourceKey))
+                        {
+                            return GetLibraryResourceString(resourceKey);
+                        }
                    }
                }
+                CATCH_LOG();
            }
            else if (name.isString())
            {
-                return JsonUtils::GetValue<winrt::hstring>(name);
+                auto nameStr = name.asString();
+                return winrt::to_hstring(nameStr);
            }
        }

--- a/src/cascadia/TerminalApp/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -5,6 +5,7 @@
 #include "CommandPalette.h"

 #include "CommandPalette.g.cpp"
+#include <winrt/Microsoft.Terminal.Settings.h>

 using namespace winrt;
 using namespace winrt::TerminalApp;
@@ -186,16 +187,14 @@ namespace winrt::TerminalApp::implementation
        {
            const auto actionAndArgs = command.Action();
            _dispatch.DoAction(actionAndArgs);
+            _close();

            TraceLoggingWrite(
                g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
                "CommandPaletteDispatchedAction",
                TraceLoggingDescription("Event emitted when the user selects an action in the Command Palette"),
-                TraceLoggingUInt32(_searchBox().Text().size(), "SearchTextLength", "Number of characters in the search string"),
                TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
                TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
-
-            _close();
        }
    }

@@ -272,17 +271,16 @@ namespace winrt::TerminalApp::implementation
    };

    // Method Description:
-    // - Produce a list of filtered actions to reflect the current contents of
+    // - Update our list of filtered actions to reflect the current contents of
    //   the input box. For more details on which commands will be displayed,
    //   see `_getWeight`.
    // Arguments:
-    // - A collection that will receive the filtered actions
+    // - <none>
    // Return Value:
    // - <none>
-    std::vector<winrt::TerminalApp::Command> CommandPalette::_collectFilteredActions()
+    void CommandPalette::_updateFilteredActions()
    {
-        std::vector<winrt::TerminalApp::Command> actions;
-
+        _filteredActions.Clear();
        auto searchText = _searchBox().Text();
        const bool addAll = searchText.empty();

@@ -305,10 +303,10 @@ namespace winrt::TerminalApp::implementation

            for (auto action : sortedCommands)
            {
-                actions.push_back(action);
+                _filteredActions.Append(action);
            }

-            return actions;
+            return;
        }

        // Here, there was some filter text.
@@ -345,56 +343,7 @@ namespace winrt::TerminalApp::implementation
        {
            auto top = heap.top();
            heap.pop();
-            actions.push_back(top.command);
-        }
-
-        return actions;
-    }
-
-    // Method Description:
-    // - Update our list of filtered actions to reflect the current contents of
-    //   the input box. For more details on which commands will be displayed,
-    //   see `_getWeight`.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void CommandPalette::_updateFilteredActions()
-    {
-        auto actions = _collectFilteredActions();
-
-        // Make _filteredActions look identical to actions, using only Insert and Remove.
-        // This allows WinUI to nicely animate the ListView as it changes.
-        for (uint32_t i = 0; i < _filteredActions.Size() && i < actions.size(); i++)
-        {
-            for (uint32_t j = i; j < _filteredActions.Size(); j++)
-            {
-                if (_filteredActions.GetAt(j) == actions[i])
-                {
-                    for (uint32_t k = i; k < j; k++)
-                    {
-                        _filteredActions.RemoveAt(i);
-                    }
-                    break;
-                }
-            }
-
-            if (_filteredActions.GetAt(i) != actions[i])
-            {
-                _filteredActions.InsertAt(i, actions[i]);
-            }
-        }
-
-        // Remove any extra trailing items from the destination
-        while (_filteredActions.Size() > actions.size())
-        {
-            _filteredActions.RemoveAtEnd();
-        }
-
-        // Add any extra trailing items from the source
-        while (_filteredActions.Size() < actions.size())
-        {
-            _filteredActions.Append(actions[_filteredActions.Size()]);
+            _filteredActions.Append(top.command);
        }
    }

--- a/src/cascadia/TerminalApp/CommandPalette.h
+++ b/src/cascadia/TerminalApp/CommandPalette.h
@@ -37,7 +37,6 @@ namespace winrt::TerminalApp::implementation
        void _selectNextItem(const bool moveDown);

        void _updateFilteredActions();
-        std::vector<winrt::TerminalApp::Command> _collectFilteredActions();
        static int _getWeight(const winrt::hstring& searchText, const winrt::hstring& name);
        void _close();

--- a/src/cascadia/TerminalApp/CommandPalette.xaml
+++ b/src/cascadia/TerminalApp/CommandPalette.xaml
@@ -195,10 +195,9 @@ the MIT License. See LICENSE in the project root for license information. -->
                        <Grid HorizontalAlignment="Stretch"  >

                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="16"/>   <!-- icon -->
-                                <ColumnDefinition Width="Auto"/> <!-- command label -->
-                                <ColumnDefinition Width="*"/>    <!-- key chord -->
-                                <ColumnDefinition Width="16"/>   <!-- gutter for scrollbar -->
+                                <ColumnDefinition Width="16"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
                            </Grid.ColumnDefinitions>

                            <!-- TODO GH#6644: Add Icon to command palette entries, in column 0 -->
--- a/src/cascadia/TerminalApp/GlobalAppSettings.cpp
+++ b/src/cascadia/TerminalApp/GlobalAppSettings.cpp
@@ -7,10 +7,11 @@
 #include "../../inc/DefaultSettings.h"
 #include "Utils.h"
 #include "JsonUtils.h"
-#include "TerminalSettingsSerializationHelpers.h"

 using namespace TerminalApp;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace winrt::TerminalApp;
+using namespace winrt::Windows::Data::Json;
 using namespace winrt::Windows::UI::Xaml;
 using namespace ::Microsoft::Console;
 using namespace winrt::Microsoft::UI::Xaml::Controls;
@@ -43,6 +44,21 @@ static constexpr std::string_view ForceFullRepaintRenderingKey{ "experimental.re
 static constexpr std::string_view SoftwareRenderingKey{ "experimental.rendering.software" };
 static constexpr std::string_view ForceVTInputKey{ "experimental.input.forceVT" };

+// Launch mode values
+static constexpr std::wstring_view DefaultLaunchModeValue{ L"default" };
+static constexpr std::wstring_view MaximizedLaunchModeValue{ L"maximized" };
+static constexpr std::wstring_view FullscreenLaunchModeValue{ L"fullscreen" };
+
+// Tab Width Mode values
+static constexpr std::wstring_view EqualTabWidthModeValue{ L"equal" };
+static constexpr std::wstring_view TitleLengthTabWidthModeValue{ L"titleLength" };
+static constexpr std::wstring_view TitleLengthCompactModeValue{ L"compact" };
+
+// Theme values
+static constexpr std::wstring_view LightThemeValue{ L"light" };
+static constexpr std::wstring_view DarkThemeValue{ L"dark" };
+static constexpr std::wstring_view SystemThemeValue{ L"system" };
+
 #ifdef _DEBUG
 static constexpr bool debugFeaturesDefault{ true };
 #else
@@ -133,51 +149,66 @@ GlobalAppSettings GlobalAppSettings::FromJson(const Json::Value& json)

 void GlobalAppSettings::LayerJson(const Json::Value& json)
 {
-    JsonUtils::GetValueForKey(json, DefaultProfileKey, _unparsedDefaultProfile);
+    if (auto defaultProfile{ json[JsonKey(DefaultProfileKey)] })
+    {
+        _unparsedDefaultProfile.emplace(GetWstringFromJson(defaultProfile));
+    }

-    JsonUtils::GetValueForKey(json, AlwaysShowTabsKey, _AlwaysShowTabs);
+    JsonUtils::GetBool(json, AlwaysShowTabsKey, _AlwaysShowTabs);

-    JsonUtils::GetValueForKey(json, ConfirmCloseAllKey, _ConfirmCloseAllTabs);
+    JsonUtils::GetBool(json, ConfirmCloseAllKey, _ConfirmCloseAllTabs);

-    JsonUtils::GetValueForKey(json, InitialRowsKey, _InitialRows);
+    JsonUtils::GetInt(json, InitialRowsKey, _InitialRows);

-    JsonUtils::GetValueForKey(json, InitialColsKey, _InitialCols);
+    JsonUtils::GetInt(json, InitialColsKey, _InitialCols);

-    JsonUtils::GetValueForKey(json, InitialPositionKey, _InitialPosition);
+    if (auto initialPosition{ json[JsonKey(InitialPositionKey)] })
+    {
+        _ParseInitialPosition(initialPosition.asString(), _InitialPosition);
+    }

-    JsonUtils::GetValueForKey(json, ShowTitleInTitlebarKey, _ShowTitleInTitlebar);
+    JsonUtils::GetBool(json, ShowTitleInTitlebarKey, _ShowTitleInTitlebar);

-    JsonUtils::GetValueForKey(json, ShowTabsInTitlebarKey, _ShowTabsInTitlebar);
+    JsonUtils::GetBool(json, ShowTabsInTitlebarKey, _ShowTabsInTitlebar);

-    JsonUtils::GetValueForKey(json, WordDelimitersKey, _WordDelimiters);
+    JsonUtils::GetWstring(json, WordDelimitersKey, _WordDelimiters);

-    JsonUtils::GetValueForKey(json, CopyOnSelectKey, _CopyOnSelect);
+    JsonUtils::GetBool(json, CopyOnSelectKey, _CopyOnSelect);

-    JsonUtils::GetValueForKey(json, CopyFormattingKey, _CopyFormatting);
+    JsonUtils::GetBool(json, CopyFormattingKey, _CopyFormatting);

-    JsonUtils::GetValueForKey(json, WarnAboutLargePasteKey, _WarnAboutLargePaste);
+    JsonUtils::GetBool(json, WarnAboutLargePasteKey, _WarnAboutLargePaste);

-    JsonUtils::GetValueForKey(json, WarnAboutMultiLinePasteKey, _WarnAboutMultiLinePaste);
+    JsonUtils::GetBool(json, WarnAboutMultiLinePasteKey, _WarnAboutMultiLinePaste);

-    JsonUtils::GetValueForKey(json, LaunchModeKey, _LaunchMode);
+    if (auto launchMode{ json[JsonKey(LaunchModeKey)] })
+    {
+        _LaunchMode = _ParseLaunchMode(GetWstringFromJson(launchMode));
+    }

-    JsonUtils::GetValueForKey(json, ThemeKey, _Theme);
+    if (auto theme{ json[JsonKey(ThemeKey)] })
+    {
+        _Theme = _ParseTheme(GetWstringFromJson(theme));
+    }

-    JsonUtils::GetValueForKey(json, TabWidthModeKey, _TabWidthMode);
+    if (auto tabWidthMode{ json[JsonKey(TabWidthModeKey)] })
+    {
+        _TabWidthMode = _ParseTabWidthMode(GetWstringFromJson(tabWidthMode));
+    }

-    JsonUtils::GetValueForKey(json, SnapToGridOnResizeKey, _SnapToGridOnResize);
+    JsonUtils::GetBool(json, SnapToGridOnResizeKey, _SnapToGridOnResize);

-    // GetValueForKey will only override the current value if the key exists
-    JsonUtils::GetValueForKey(json, DebugFeaturesKey, _DebugFeaturesEnabled);
+    JsonUtils::GetBool(json, ForceFullRepaintRenderingKey, _ForceFullRepaintRendering);

-    JsonUtils::GetValueForKey(json, ForceFullRepaintRenderingKey, _ForceFullRepaintRendering);
+    JsonUtils::GetBool(json, SoftwareRenderingKey, _SoftwareRendering);
+    JsonUtils::GetBool(json, ForceVTInputKey, _ForceVTInput);

-    JsonUtils::GetValueForKey(json, SoftwareRenderingKey, _SoftwareRendering);
-    JsonUtils::GetValueForKey(json, ForceVTInputKey, _ForceVTInput);
+    // GetBool will only override the current value if the key exists
+    JsonUtils::GetBool(json, DebugFeaturesKey, _DebugFeaturesEnabled);

-    JsonUtils::GetValueForKey(json, EnableStartupTaskKey, _StartOnUserLogin);
+    JsonUtils::GetBool(json, EnableStartupTaskKey, _StartOnUserLogin);

-    JsonUtils::GetValueForKey(json, AlwaysOnTopKey, _AlwaysOnTop);
+    JsonUtils::GetBool(json, AlwaysOnTopKey, _AlwaysOnTop);

    // This is a helper lambda to get the keybindings and commands out of both
    // and array of objects. We'll use this twice, once on the legacy
@@ -198,12 +229,123 @@ void GlobalAppSettings::LayerJson(const Json::Value& json)
            warnings = winrt::TerminalApp::implementation::Command::LayerJson(_commands, bindings);
            // It's possible that the user provided commands have some warnings
            // in them, similar to the keybindings.
+            _keybindingsWarnings.insert(_keybindingsWarnings.end(), warnings.begin(), warnings.end());
        }
    };
    parseBindings(LegacyKeybindingsKey);
    parseBindings(BindingsKey);
 }

+// Method Description:
+// - Helper function for converting a user-specified cursor style corresponding
+//   CursorStyle enum value
+// Arguments:
+// - themeString: The string value from the settings file to parse
+// Return Value:
+// - The corresponding enum value which maps to the string provided by the user
+ElementTheme GlobalAppSettings::_ParseTheme(const std::wstring& themeString) noexcept
+{
+    if (themeString == LightThemeValue)
+    {
+        return ElementTheme::Light;
+    }
+    else if (themeString == DarkThemeValue)
+    {
+        return ElementTheme::Dark;
+    }
+    // default behavior for invalid data or SystemThemeValue
+    return ElementTheme::Default;
+}
+
+// Method Description:
+// - Helper function for converting the initial position string into
+//   2 coordinate values. We allow users to only provide one coordinate,
+//   thus, we use comma as the separator:
+//   (100, 100): standard input string
+//   (, 100), (100, ): if a value is missing, we set this value as a default
+//   (,): both x and y are set to default
+//   (abc, 100): if a value is not valid, we treat it as default
+//   (100, 100, 100): we only read the first two values, this is equivalent to (100, 100)
+// Arguments:
+// - initialPosition: the initial position string from json
+//   ret: reference to a struct whose optionals will be populated
+// Return Value:
+// - None
+void GlobalAppSettings::_ParseInitialPosition(const std::string& initialPosition,
+                                              LaunchPosition& ret) noexcept
+{
+    static constexpr char singleCharDelim = ',';
+    std::stringstream tokenStream(initialPosition);
+    std::string token;
+    uint8_t initialPosIndex = 0;
+
+    // Get initial position values till we run out of delimiter separated values in the stream
+    // or we hit max number of allowable values (= 2)
+    // Non-numeral values or empty string will be caught as exception and we do not assign them
+    for (; std::getline(tokenStream, token, singleCharDelim) && (initialPosIndex < 2); initialPosIndex++)
+    {
+        try
+        {
+            int32_t position = std::stoi(token);
+            if (initialPosIndex == 0)
+            {
+                ret.x.emplace(position);
+            }
+
+            if (initialPosIndex == 1)
+            {
+                ret.y.emplace(position);
+            }
+        }
+        catch (...)
+        {
+            // Do nothing
+        }
+    }
+}
+
+// Method Description:
+// - Helper function for converting the user-specified launch mode
+//   to a LaunchMode enum value
+// Arguments:
+// - launchModeString: The string value from the settings file to parse
+// Return Value:
+// - The corresponding enum value which maps to the string provided by the user
+LaunchMode GlobalAppSettings::_ParseLaunchMode(const std::wstring& launchModeString) noexcept
+{
+    if (launchModeString == MaximizedLaunchModeValue)
+    {
+        return LaunchMode::MaximizedMode;
+    }
+    else if (launchModeString == FullscreenLaunchModeValue)
+    {
+        return LaunchMode::FullscreenMode;
+    }
+
+    return LaunchMode::DefaultMode;
+}
+
+// Method Description:
+// - Helper function for converting the user-specified tab width
+//   to a TabViewWidthMode enum value
+// Arguments:
+// - tabWidthModeString: The string value from the settings file to parse
+// Return Value:
+// - The corresponding enum value which maps to the string provided by the user
+TabViewWidthMode GlobalAppSettings::_ParseTabWidthMode(const std::wstring& tabWidthModeString) noexcept
+{
+    if (tabWidthModeString == TitleLengthTabWidthModeValue)
+    {
+        return TabViewWidthMode::SizeToContent;
+    }
+    else if (tabWidthModeString == TitleLengthCompactModeValue)
+    {
+        return TabViewWidthMode::Compact;
+    }
+    // default behavior for invalid data or EqualTabWidthValue
+    return TabViewWidthMode::Equal;
+}
+
 // Method Description:
 // - Adds the given colorscheme to our map of schemes, using its name as the key.
 // Arguments:
--- a/src/cascadia/TerminalApp/GlobalAppSettings.h
+++ b/src/cascadia/TerminalApp/GlobalAppSettings.h
@@ -17,7 +17,6 @@ Author(s):
 #include "AppKeyBindings.h"
 #include "ColorScheme.h"
 #include "Command.h"
-#include "SettingsTypes.h"

 // fwdecl unittest classes
 namespace TerminalAppLocalTests
@@ -29,6 +28,12 @@ namespace TerminalAppLocalTests
 namespace TerminalApp
 {
    class GlobalAppSettings;
+
+    struct LaunchPosition
+    {
+        std::optional<int> x;
+        std::optional<int> y;
+    };
 };

 class TerminalApp::GlobalAppSettings final
@@ -46,7 +51,7 @@ public:
    static GlobalAppSettings FromJson(const Json::Value& json);
    void LayerJson(const Json::Value& json);

-    void ApplyToSettings(winrt::TerminalApp::TerminalSettings& settings) const noexcept;
+    void ApplyToSettings(winrt::Microsoft::Terminal::Settings::TerminalSettings& settings) const noexcept;

    std::vector<TerminalApp::SettingsLoadWarnings> GetKeybindingsWarnings() const;

@@ -91,6 +96,15 @@ private:
    std::unordered_map<std::wstring, ColorScheme> _colorSchemes;
    std::unordered_map<winrt::hstring, winrt::TerminalApp::Command> _commands;

+    static winrt::Windows::UI::Xaml::ElementTheme _ParseTheme(const std::wstring& themeString) noexcept;
+
+    static winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode _ParseTabWidthMode(const std::wstring& tabWidthModeString) noexcept;
+
+    static void _ParseInitialPosition(const std::string& initialPosition,
+                                      LaunchPosition& ret) noexcept;
+
+    static winrt::TerminalApp::LaunchMode _ParseLaunchMode(const std::wstring& launchModeString) noexcept;
+
    friend class TerminalAppLocalTests::SettingsTests;
    friend class TerminalAppLocalTests::ColorSchemeTests;
 };
--- a/src/cascadia/TerminalApp/JsonUtils.cpp
+++ b/src/cascadia/TerminalApp/JsonUtils.cpp
@@ -0,0 +1,125 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "Utils.h"
+#include "JsonUtils.h"
+#include "../../types/inc/Utils.hpp"
+
+void TerminalApp::JsonUtils::GetOptionalColor(const Json::Value& json,
+                                              std::string_view key,
+                                              std::optional<til::color>& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> til::color {
+        return ::Microsoft::Console::Utils::ColorFromHexString(value.asString());
+    };
+    GetOptionalValue(json,
+                     key,
+                     target,
+                     conversionFn);
+}
+
+void TerminalApp::JsonUtils::GetOptionalString(const Json::Value& json,
+                                               std::string_view key,
+                                               std::optional<std::wstring>& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> std::wstring {
+        return GetWstringFromJson(value);
+    };
+    GetOptionalValue(json,
+                     key,
+                     target,
+                     conversionFn);
+}
+
+void TerminalApp::JsonUtils::GetOptionalGuid(const Json::Value& json,
+                                             std::string_view key,
+                                             std::optional<GUID>& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> GUID {
+        return ::Microsoft::Console::Utils::GuidFromString(GetWstringFromJson(value));
+    };
+    GetOptionalValue(json,
+                     key,
+                     target,
+                     conversionFn);
+}
+
+void TerminalApp::JsonUtils::GetOptionalDouble(const Json::Value& json,
+                                               std::string_view key,
+                                               std::optional<double>& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> double {
+        return value.asFloat();
+    };
+    const auto validationFn = [](const Json::Value& value) -> bool {
+        return value.isNumeric();
+    };
+    GetOptionalValue(json,
+                     key,
+                     target,
+                     conversionFn,
+                     validationFn);
+}
+
+void TerminalApp::JsonUtils::GetInt(const Json::Value& json,
+                                    std::string_view key,
+                                    int& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> int {
+        return value.asInt();
+    };
+    const auto validationFn = [](const Json::Value& value) -> bool {
+        return value.isInt();
+    };
+    GetValue(json, key, target, conversionFn, validationFn);
+}
+
+void TerminalApp::JsonUtils::GetUInt(const Json::Value& json,
+                                     std::string_view key,
+                                     uint32_t& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> uint32_t {
+        return value.asUInt();
+    };
+    const auto validationFn = [](const Json::Value& value) -> bool {
+        return value.isUInt();
+    };
+    GetValue(json, key, target, conversionFn, validationFn);
+}
+
+void TerminalApp::JsonUtils::GetDouble(const Json::Value& json,
+                                       std::string_view key,
+                                       double& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> double {
+        return value.asFloat();
+    };
+    const auto validationFn = [](const Json::Value& value) -> bool {
+        return value.isNumeric();
+    };
+    GetValue(json, key, target, conversionFn, validationFn);
+}
+
+void TerminalApp::JsonUtils::GetBool(const Json::Value& json,
+                                     std::string_view key,
+                                     bool& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> bool {
+        return value.asBool();
+    };
+    const auto validationFn = [](const Json::Value& value) -> bool {
+        return value.isBool();
+    };
+    GetValue(json, key, target, conversionFn, validationFn);
+}
+
+void TerminalApp::JsonUtils::GetWstring(const Json::Value& json,
+                                        std::string_view key,
+                                        std::wstring& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> std::wstring {
+        return GetWstringFromJson(value);
+    };
+    GetValue(json, key, target, conversionFn, nullptr);
+}
--- a/src/cascadia/TerminalApp/JsonUtils.h
+++ b/src/cascadia/TerminalApp/JsonUtils.h
@@ -9,483 +9,136 @@ Abstract:
 - Helpers for the TerminalApp project
 Author(s):
 - Mike Griese - August 2019
- Dustin Howett - January 2020
+
 --*/
-
 #pragma once

-#include <json.h>
-
-#include "../types/inc/utils.hpp"
-
-namespace winrt
-{
-    // If we don't use winrt, nobody will include the ConversionTraits for winrt stuff.
-    // If nobody includes it, these forward declarations will suffice.
-    struct guid;
-    struct hstring;
-    namespace Windows::Foundation
-    {
-        template<typename T>
-        struct IReference;
-    }
-}
-
 namespace TerminalApp::JsonUtils
 {
-    namespace Detail
-    {
-        // Function Description:
-        // - Returns a string_view to a Json::Value's internal string storage,
-        //   hopefully without copying it.
-        __declspec(noinline) inline const std::string_view GetStringView(const Json::Value& json)
-        {
-            const char* begin{ nullptr };
-            const char* end{ nullptr };
-            json.getString(&begin, &end);
-            const std::string_view zeroCopyString{ begin, gsl::narrow_cast<size_t>(end - begin) };
-            return zeroCopyString;
-        }
+    void GetOptionalColor(const Json::Value& json,
+                          std::string_view key,
+                          std::optional<til::color>& target);

-        template<typename T>
-        struct DeduceOptional
-        {
-            using Type = typename std::decay<T>::type;
-            static constexpr bool IsOptional = false;
-        };
+    void GetOptionalString(const Json::Value& json,
+                           std::string_view key,
+                           std::optional<std::wstring>& target);

-        template<typename TOpt>
-        struct DeduceOptional<std::optional<TOpt>>
-        {
-            using Type = typename std::decay<TOpt>::type;
-            static constexpr bool IsOptional = true;
-        };
+    void GetOptionalGuid(const Json::Value& json,
+                         std::string_view key,
+                         std::optional<GUID>& target);

-        template<typename TOpt>
-        struct DeduceOptional<::winrt::Windows::Foundation::IReference<TOpt>>
-        {
-            using Type = typename std::decay<TOpt>::type;
-            static constexpr bool IsOptional = true;
-        };
-    }
-
-    // These exceptions cannot use localized messages, as we do not have
-    // guaranteed access to the resource loader.
-    class TypeMismatchException : public std::runtime_error
-    {
-    public:
-        TypeMismatchException() :
-            runtime_error("unexpected data type") {}
-    };
-
-    class KeyedException : public std::runtime_error
-    {
-    public:
-        KeyedException(const std::string_view key, std::exception_ptr exception) :
-            runtime_error(fmt::format("error parsing \"{0}\"", key).c_str()),
-            _key{ key },
-            _innerException{ std::move(exception) } {}
-
-        std::string GetKey() const
-        {
-            return _key;
-        }
-
-        [[noreturn]] void RethrowInner() const
-        {
-            std::rethrow_exception(_innerException);
-        }
-
-    private:
-        std::string _key;
-        std::exception_ptr _innerException;
-    };
-
-    class UnexpectedValueException : public std::runtime_error
-    {
-    public:
-        UnexpectedValueException(const std::string_view value) :
-            runtime_error(fmt::format("unexpected value \"{0}\"", value).c_str()),
-            _value{ value } {}
-
-        std::string GetValue() const
-        {
-            return _value;
-        }
-
-    private:
-        std::string _value;
-    };
-
-    template<typename T>
-    struct ConversionTrait
-    {
-        // Forward-declare these so the linker can pick up specializations from elsewhere!
-        T FromJson(const Json::Value&);
-        bool CanConvert(const Json::Value& json);
-    };
-
-    template<>
-    struct ConversionTrait<std::string>
-    {
-        std::string FromJson(const Json::Value& json)
-        {
-            return json.asString();
-        }
-
-        bool CanConvert(const Json::Value& json)
-        {
-            return json.isString();
-        }
-    };
-
-    template<>
-    struct ConversionTrait<std::wstring>
-    {
-        std::wstring FromJson(const Json::Value& json)
-        {
-            return til::u8u16(Detail::GetStringView(json));
-        }
-
-        bool CanConvert(const Json::Value& json)
-        {
-            return json.isString();
-        }
-    };
-
-#ifdef WINRT_BASE_H
-    template<>
-    struct ConversionTrait<winrt::hstring> : public ConversionTrait<std::wstring>
-    {
-        // Leverage the wstring converter's validation
-        winrt::hstring FromJson(const Json::Value& json)
-        {
-            return winrt::hstring{ til::u8u16(Detail::GetStringView(json)) };
-        }
-    };
-#endif
-
-    template<>
-    struct ConversionTrait<bool>
-    {
-        bool FromJson(const Json::Value& json)
-        {
-            return json.asBool();
-        }
-
-        bool CanConvert(const Json::Value& json)
-        {
-            return json.isBool();
-        }
-    };
-
-    template<>
-    struct ConversionTrait<int>
-    {
-        int FromJson(const Json::Value& json)
-        {
-            return json.asInt();
-        }
-
-        bool CanConvert(const Json::Value& json)
-        {
-            return json.isInt();
-        }
-    };
-
-    template<>
-    struct ConversionTrait<unsigned int>
-    {
-        unsigned int FromJson(const Json::Value& json)
-        {
-            return json.asUInt();
-        }
-
-        bool CanConvert(const Json::Value& json)
-        {
-            return json.isUInt();
-        }
-    };
-
-    template<>
-    struct ConversionTrait<float>
-    {
-        float FromJson(const Json::Value& json)
-        {
-            return json.asFloat();
-        }
-
-        bool CanConvert(const Json::Value& json)
-        {
-            return json.isNumeric();
-        }
-    };
-
-    template<>
-    struct ConversionTrait<double>
-    {
-        double FromJson(const Json::Value& json)
-        {
-            return json.asDouble();
-        }
-
-        bool CanConvert(const Json::Value& json)
-        {
-            return json.isNumeric();
-        }
-    };
-
-    template<>
-    struct ConversionTrait<GUID>
-    {
-        GUID FromJson(const Json::Value& json)
-        {
-            return ::Microsoft::Console::Utils::GuidFromString(til::u8u16(Detail::GetStringView(json)));
-        }
-
-        bool CanConvert(const Json::Value& json)
-        {
-            if (!json.isString())
-            {
-                return false;
-            }
-
-            const auto string{ Detail::GetStringView(json) };
-            return string.length() == 38 && string.front() == '{' && string.back() == '}';
-        }
-    };
-
-    // (GUID and winrt::guid are mutually convertible!)
-    template<>
-    struct ConversionTrait<winrt::guid> : public ConversionTrait<GUID>
-    {
-    };
-
-    template<>
-    struct ConversionTrait<til::color>
-    {
-        til::color FromJson(const Json::Value& json)
-        {
-            return ::Microsoft::Console::Utils::ColorFromHexString(Detail::GetStringView(json));
-        }
-
-        bool CanConvert(const Json::Value& json)
-        {
-            if (!json.isString())
-            {
-                return false;
-            }
-
-            const auto string{ Detail::GetStringView(json) };
-            return (string.length() == 7 || string.length() == 4) && string.front() == '#';
-        }
-    };
-
-    template<typename T, typename TBase>
-    struct EnumMapper
-    {
-        using BaseEnumMapper = EnumMapper<T, TBase>;
-        using ValueType = T;
-        using pair_type = std::pair<std::string_view, T>;
-        T FromJson(const Json::Value& json)
-        {
-            const auto name{ Detail::GetStringView(json) };
-            for (const auto& pair : TBase::mappings)
-            {
-                if (pair.first == name)
-                {
-                    return pair.second;
-                }
-            }
-
-            throw UnexpectedValueException{ name };
-        }
-
-        bool CanConvert(const Json::Value& json)
-        {
-            return json.isString();
-        }
-    };
-
-    // FlagMapper is EnumMapper, but it works for bitfields.
-    // It supports a string (single flag) or an array of strings.
-    // Does an O(n*m) search; meant for small search spaces!
-    //
-    // Cleverly leverage EnumMapper to do the heavy lifting.
-    template<typename T, typename TBase>
-    struct FlagMapper : public EnumMapper<T, TBase>
-    {
-    private:
-        // Hide BaseEnumMapper so FlagMapper's consumers cannot see
-        // it.
-        using BaseEnumMapper = EnumMapper<T, TBase>::BaseEnumMapper;
-
-    public:
-        using BaseFlagMapper = FlagMapper<T, TBase>;
-        static constexpr T AllSet{ static_cast<T>(~0u) };
-        static constexpr T AllClear{ static_cast<T>(0u) };
-
-        T FromJson(const Json::Value& json)
-        {
-            if (json.isString())
-            {
-                return BaseEnumMapper::FromJson(json);
-            }
-            else if (json.isArray())
-            {
-                unsigned int seen{ 0 };
-                T value{};
-                for (const auto& element : json)
-                {
-                    const auto newFlag{ BaseEnumMapper::FromJson(element) };
-                    if (++seen > 1 &&
-                        ((newFlag == AllClear && value != AllClear) ||
-                         (value == AllClear && newFlag != AllClear)))
-                    {
-                        // attempt to combine AllClear (explicitly) with anything else
-                        throw UnexpectedValueException{ element.asString() };
-                    }
-                    value |= newFlag;
-                }
-                return value;
-            }
-
-            // We'll only get here if CanConvert has failed us.
-            return AllClear;
-        }
-
-        bool CanConvert(const Json::Value& json)
-        {
-            return BaseEnumMapper::CanConvert(json) || json.isArray();
-        }
-    };
+    void GetOptionalDouble(const Json::Value& json,
+                           std::string_view key,
+                           std::optional<double>& target);

    // Method Description:
-    // - Helper that will populate a reference with a value converted from a json object.
+    // - Helper that can be used for retrieving an optional value from a json
+    //   object, and parsing it's value to layer on a given target object.
+    //    - If the key we're looking for _doesn't_ exist in the json object,
+    //      we'll leave the target object unmodified.
+    //    - If the key exists in the json object, but is set to `null`, then
+    //      we'll instead set the target back to nullopt.
+    // - Each caller should provide a conversion function that takes a
+    //   Json::Value and returns an object of the same type as target.
    // Arguments:
-    // - json: the json object to convert
-    // - target: the value to populate with the converted result
+    // - json: The json object to search for the given key
+    // - key: The key to look for in the json object
+    // - target: the optional object to receive the value from json
+    // - conversion: a std::function<T(const Json::Value&)> which can be used to
+    //   convert the Json::Value to the appropriate type.
+    // - validation: optional, if provided, will be called first to ensure that
+    //   the json::value is of the correct type before attempting to call
+    //   `conversion`.
    // Return Value:
-    // - a boolean indicating whether the value existed (in this case, was non-null)
-    //
-    // GetValue, type-deduced, manual converter
-    template<typename T, typename Converter>
-    bool GetValue(const Json::Value& json, T& target, Converter&& conv)
+    // - <none>
+    template<typename T, typename F>
+    void GetOptionalValue(const Json::Value& json,
+                          std::string_view key,
+                          std::optional<T>& target,
+                          F&& conversion,
+                          const std::function<bool(const Json::Value&)>& validation = nullptr)
    {
-        if constexpr (Detail::DeduceOptional<T>::IsOptional)
+        if (json.isMember(JsonKey(key)))
        {
-            // FOR OPTION TYPES
-            // - If the json object is set to `null`, then
-            //   we'll instead set the target back to the empty optional.
-            if (json.isNull())
+            if (auto jsonVal{ json[JsonKey(key)] })
            {
-                target = T{}; // zero-construct an empty optional
-                return true;
+                if (validation == nullptr || validation(jsonVal))
+                {
+                    target = conversion(jsonVal);
+                }
+            }
+            else
+            {
+                // This branch is hit when the json object contained the key,
+                // but the key was set to `null`. In this case, explicitly clear
+                // the target.
+                target = std::nullopt;
            }
        }
-
-        if (json)
-        {
-            if (!conv.CanConvert(json))
-            {
-                throw TypeMismatchException{};
-            }
-
-            target = conv.FromJson(json);
-            return true;
-        }
-        return false;
    }

-    // GetValue, forced return type, manual converter
-    template<typename T, typename Converter>
-    std::decay_t<T> GetValue(const Json::Value& json, Converter&& conv)
+    // Method Description:
+    // - Helper that can be used for retrieving a value from a json
+    //   object, and parsing it's value to set on a given target object.
+    //    - If the key we're looking for _doesn't_ exist in the json object,
+    //      we'll leave the target object unmodified.
+    //    - If the key exists in the json object, we'll use the provided
+    //      `validation` function to ensure that the json value is of the
+    //      correct type.
+    //    - If we successfully validate the json value type (or no validation
+    //      function was provided), then we'll use `conversion` to parse the
+    //      value and place the result into `target`
+    // - Each caller should provide a conversion function that takes a
+    //   Json::Value and returns an object of the same type as target.
+    // - Unlike GetOptionalValue, if the key exists but is set to `null`, we'll
+    //   just ignore it.
+    // Arguments:
+    // - json: The json object to search for the given key
+    // - key: The key to look for in the json object
+    // - target: the optional object to receive the value from json
+    // - conversion: a std::function<T(const Json::Value&)> which can be used to
+    //   convert the Json::Value to the appropriate type.
+    // - validation: optional, if provided, will be called first to ensure that
+    //   the json::value is of the correct type before attempting to call
+    //   `conversion`.
+    // Return Value:
+    // - <none>
+    template<typename T, typename F>
+    void GetValue(const Json::Value& json,
+                  std::string_view key,
+                  T& target,
+                  F&& conversion,
+                  const std::function<bool(const Json::Value&)>& validation = nullptr)
    {
-        std::decay_t<T> local{};
-        GetValue(json, local, std::forward<Converter>(conv));
-        return local; // returns zero-initialized or value
-    }
-
-    // GetValueForKey, type-deduced, manual converter
-    template<typename T, typename Converter>
-    bool GetValueForKey(const Json::Value& json, std::string_view key, T& target, Converter&& conv)
-    {
-        if (auto found{ json.find(&*key.cbegin(), (&*key.cbegin()) + key.size()) })
+        if (json.isMember(JsonKey(key)))
        {
-            try
+            if (auto jsonVal{ json[JsonKey(key)] })
            {
-                return GetValue(*found, target, std::forward<Converter>(conv));
-            }
-            catch (...)
-            {
-                // Wrap any caught exceptions in one that preserves context.
-                throw KeyedException(key, std::current_exception());
+                if (validation == nullptr || validation(jsonVal))
+                {
+                    target = conversion(jsonVal);
+                }
            }
        }
-        return false;
    }

-    // GetValueForKey, forced return type, manual converter
-    template<typename T, typename Converter>
-    std::decay_t<T> GetValueForKey(const Json::Value& json, std::string_view key, Converter&& conv)
-    {
-        std::decay_t<T> local{};
-        GetValueForKey(json, key, local, std::forward<Converter>(conv));
-        return local; // returns zero-initialized?
-    }
+    void GetInt(const Json::Value& json,
+                std::string_view key,
+                int& target);

-    // GetValue, type-deduced, with automatic converter
-    template<typename T>
-    bool GetValue(const Json::Value& json, T& target)
-    {
-        return GetValue(json, target, ConversionTrait<typename Detail::DeduceOptional<T>::Type>{});
-    }
+    void GetUInt(const Json::Value& json,
+                 std::string_view key,
+                 uint32_t& target);

-    // GetValue, forced return type, with automatic converter
-    template<typename T>
-    std::decay_t<T> GetValue(const Json::Value& json)
-    {
-        std::decay_t<T> local{};
-        GetValue(json, local, ConversionTrait<typename Detail::DeduceOptional<T>::Type>{});
-        return local; // returns zero-initialized or value
-    }
+    void GetDouble(const Json::Value& json,
+                   std::string_view key,
+                   double& target);

-    // GetValueForKey, type-deduced, with automatic converter
-    template<typename T>
-    bool GetValueForKey(const Json::Value& json, std::string_view key, T& target)
-    {
-        return GetValueForKey(json, key, target, ConversionTrait<typename Detail::DeduceOptional<T>::Type>{});
-    }
+    void GetBool(const Json::Value& json,
+                 std::string_view key,
+                 bool& target);

-    // GetValueForKey, forced return type, with automatic converter
-    template<typename T>
-    std::decay_t<T> GetValueForKey(const Json::Value& json, std::string_view key)
-    {
-        return GetValueForKey<T>(json, key, ConversionTrait<typename Detail::DeduceOptional<T>::Type>{});
-    }
-
-    // Get multiple values for keys (json, k, &v, k, &v, k, &v, ...).
-    // Uses the default converter for each v.
-    // Careful: this can cause a template explosion.
-    constexpr void GetValuesForKeys(const Json::Value& /*json*/) {}
-
-    template<typename T, typename... Args>
-    void GetValuesForKeys(const Json::Value& json, std::string_view key1, T&& val1, Args&&... args)
-    {
-        GetValueForKey(json, key1, val1);
-        GetValuesForKeys(json, std::forward<Args>(args)...);
-    }
+    void GetWstring(const Json::Value& json,
+                    std::string_view key,
+                    std::wstring& target);
 };
-
-#define JSON_ENUM_MAPPER(...)                                       \
-    template<>                                                      \
-    struct ::TerminalApp::JsonUtils::ConversionTrait<__VA_ARGS__> : \
-        public ::TerminalApp::JsonUtils::EnumMapper<__VA_ARGS__, ::TerminalApp::JsonUtils::ConversionTrait<__VA_ARGS__>>
-
-#define JSON_FLAG_MAPPER(...)                                       \
-    template<>                                                      \
-    struct ::TerminalApp::JsonUtils::ConversionTrait<__VA_ARGS__> : \
-        public ::TerminalApp::JsonUtils::FlagMapper<__VA_ARGS__, ::TerminalApp::JsonUtils::ConversionTrait<__VA_ARGS__>>
-
-#define JSON_MAPPINGS(Count) \
-    static constexpr std::array<pair_type, Count> mappings
--- a/src/cascadia/TerminalApp/JsonUtilsNew.h
+++ b/src/cascadia/TerminalApp/JsonUtilsNew.h
@@ -0,0 +1,490 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- JsonUtils.h
+
+Abstract:
+- Helpers for the TerminalApp project
+Author(s):
+- Mike Griese - August 2019
+- Dustin Howett - January 2020
+--*/
+
+#pragma once
+
+#include <json.h>
+
+#include "../types/inc/utils.hpp"
+
+namespace winrt
+{
+    // If we don't use winrt, nobody will include the ConversionTraits for winrt stuff.
+    // If nobody includes it, these forward declarations will suffice.
+    struct guid;
+    struct hstring;
+    namespace Windows::Foundation
+    {
+        template<typename T>
+        struct IReference;
+    }
+}
+
+namespace TerminalApp::JsonUtils
+{
+    namespace Detail
+    {
+        // Function Description:
+        // - Returns a string_view to a Json::Value's internal string storage,
+        //   hopefully without copying it.
+        __declspec(noinline) inline const std::string_view GetStringView(const Json::Value& json)
+        {
+            const char* begin{ nullptr };
+            const char* end{ nullptr };
+            json.getString(&begin, &end);
+            const std::string_view zeroCopyString{ begin, gsl::narrow_cast<size_t>(end - begin) };
+            return zeroCopyString;
+        }
+
+        template<typename T>
+        struct DeduceOptional
+        {
+            using Type = typename std::decay<T>::type;
+            static constexpr bool IsOptional = false;
+        };
+
+        template<typename TOpt>
+        struct DeduceOptional<std::optional<TOpt>>
+        {
+            using Type = typename std::decay<TOpt>::type;
+            static constexpr bool IsOptional = true;
+        };
+
+        template<typename TOpt>
+        struct DeduceOptional<::winrt::Windows::Foundation::IReference<TOpt>>
+        {
+            using Type = typename std::decay<TOpt>::type;
+            static constexpr bool IsOptional = true;
+        };
+    }
+
+    // These exceptions cannot use localized messages, as we do not have
+    // guaranteed access to the resource loader.
+    class TypeMismatchException : public std::runtime_error
+    {
+    public:
+        TypeMismatchException() :
+            runtime_error("unexpected data type") {}
+    };
+
+    class KeyedException : public std::runtime_error
+    {
+    public:
+        KeyedException(const std::string_view key, std::exception_ptr exception) :
+            runtime_error(fmt::format("error parsing \"{0}\"", key).c_str()),
+            _key{ key },
+            _innerException{ std::move(exception) } {}
+
+        std::string GetKey() const
+        {
+            return _key;
+        }
+
+        [[noreturn]] void RethrowInner() const
+        {
+            std::rethrow_exception(_innerException);
+        }
+
+    private:
+        std::string _key;
+        std::exception_ptr _innerException;
+    };
+
+    class UnexpectedValueException : public std::runtime_error
+    {
+    public:
+        UnexpectedValueException(const std::string_view value) :
+            runtime_error(fmt::format("unexpected value \"{0}\"", value).c_str()),
+            _value{ value } {}
+
+        std::string GetValue() const
+        {
+            return _value;
+        }
+
+    private:
+        std::string _value;
+    };
+
+    template<typename T>
+    struct ConversionTrait
+    {
+        // Forward-declare these so the linker can pick up specializations from elsewhere!
+        T FromJson(const Json::Value&);
+        bool CanConvert(const Json::Value& json);
+    };
+
+    template<>
+    struct ConversionTrait<std::string>
+    {
+        std::string FromJson(const Json::Value& json)
+        {
+            return json.asString();
+        }
+
+        bool CanConvert(const Json::Value& json)
+        {
+            return json.isString();
+        }
+    };
+
+    template<>
+    struct ConversionTrait<std::wstring>
+    {
+        std::wstring FromJson(const Json::Value& json)
+        {
+            return til::u8u16(Detail::GetStringView(json));
+        }
+
+        bool CanConvert(const Json::Value& json)
+        {
+            return json.isString();
+        }
+    };
+
+#ifdef WINRT_BASE_H
+    template<>
+    struct ConversionTrait<winrt::hstring> : public ConversionTrait<std::wstring>
+    {
+        // Leverage the wstring converter's validation
+        winrt::hstring FromJson(const Json::Value& json)
+        {
+            return winrt::hstring{ til::u8u16(Detail::GetStringView(json)) };
+        }
+    };
+#endif
+
+    template<>
+    struct ConversionTrait<bool>
+    {
+        bool FromJson(const Json::Value& json)
+        {
+            return json.asBool();
+        }
+
+        bool CanConvert(const Json::Value& json)
+        {
+            return json.isBool();
+        }
+    };
+
+    template<>
+    struct ConversionTrait<int>
+    {
+        int FromJson(const Json::Value& json)
+        {
+            return json.asInt();
+        }
+
+        bool CanConvert(const Json::Value& json)
+        {
+            return json.isInt();
+        }
+    };
+
+    template<>
+    struct ConversionTrait<unsigned int>
+    {
+        unsigned int FromJson(const Json::Value& json)
+        {
+            return json.asUInt();
+        }
+
+        bool CanConvert(const Json::Value& json)
+        {
+            return json.isUInt();
+        }
+    };
+
+    template<>
+    struct ConversionTrait<float>
+    {
+        float FromJson(const Json::Value& json)
+        {
+            return json.asFloat();
+        }
+
+        bool CanConvert(const Json::Value& json)
+        {
+            return json.isNumeric();
+        }
+    };
+
+    template<>
+    struct ConversionTrait<double>
+    {
+        double FromJson(const Json::Value& json)
+        {
+            return json.asDouble();
+        }
+
+        bool CanConvert(const Json::Value& json)
+        {
+            return json.isNumeric();
+        }
+    };
+
+    template<>
+    struct ConversionTrait<GUID>
+    {
+        GUID FromJson(const Json::Value& json)
+        {
+            return ::Microsoft::Console::Utils::GuidFromString(til::u8u16(Detail::GetStringView(json)));
+        }
+
+        bool CanConvert(const Json::Value& json)
+        {
+            if (!json.isString())
+            {
+                return false;
+            }
+
+            const auto string{ Detail::GetStringView(json) };
+            return string.length() == 38 && string.front() == '{' && string.back() == '}';
+        }
+    };
+
+    // (GUID and winrt::guid are mutually convertible!)
+    template<>
+    struct ConversionTrait<winrt::guid> : public ConversionTrait<GUID>
+    {
+    };
+
+    template<>
+    struct ConversionTrait<til::color>
+    {
+        til::color FromJson(const Json::Value& json)
+        {
+            return ::Microsoft::Console::Utils::ColorFromHexString(Detail::GetStringView(json));
+        }
+
+        bool CanConvert(const Json::Value& json)
+        {
+            if (!json.isString())
+            {
+                return false;
+            }
+
+            const auto string{ Detail::GetStringView(json) };
+            return (string.length() == 7 || string.length() == 4) && string.front() == '#';
+        }
+    };
+
+    template<typename T, typename TBase>
+    struct EnumMapper
+    {
+        using BaseEnumMapper = EnumMapper<T, TBase>;
+        using pair_type = std::pair<std::string_view, T>;
+        T FromJson(const Json::Value& json)
+        {
+            const auto name{ Detail::GetStringView(json) };
+            for (const auto& pair : TBase::mappings)
+            {
+                if (pair.first == name)
+                {
+                    return pair.second;
+                }
+            }
+
+            throw UnexpectedValueException{ name };
+        }
+
+        bool CanConvert(const Json::Value& json)
+        {
+            return json.isString();
+        }
+    };
+
+    // FlagMapper is EnumMapper, but it works for bitfields.
+    // It supports a string (single flag) or an array of strings.
+    // Does an O(n*m) search; meant for small search spaces!
+    //
+    // Cleverly leverage EnumMapper to do the heavy lifting.
+    template<typename T, typename TBase>
+    struct FlagMapper : public EnumMapper<T, TBase>
+    {
+    private:
+        // Hide BaseEnumMapper so FlagMapper's consumers cannot see
+        // it.
+        using BaseEnumMapper = EnumMapper<T, TBase>::BaseEnumMapper;
+
+    public:
+        using BaseFlagMapper = FlagMapper<T, TBase>;
+        static constexpr T AllSet{ static_cast<T>(~0u) };
+        static constexpr T AllClear{ static_cast<T>(0u) };
+
+        T FromJson(const Json::Value& json)
+        {
+            if (json.isString())
+            {
+                return BaseEnumMapper::FromJson(json);
+            }
+            else if (json.isArray())
+            {
+                unsigned int seen{ 0 };
+                T value{};
+                for (const auto& element : json)
+                {
+                    const auto newFlag{ BaseEnumMapper::FromJson(element) };
+                    if (++seen > 1 &&
+                        ((newFlag == AllClear && value != AllClear) ||
+                         (value == AllClear && newFlag != AllClear)))
+                    {
+                        // attempt to combine AllClear (explicitly) with anything else
+                        throw UnexpectedValueException{ element.asString() };
+                    }
+                    value |= newFlag;
+                }
+                return value;
+            }
+
+            // We'll only get here if CanConvert has failed us.
+            return AllClear;
+        }
+
+        bool CanConvert(const Json::Value& json)
+        {
+            return BaseEnumMapper::CanConvert(json) || json.isArray();
+        }
+    };
+
+    // Method Description:
+    // - Helper that will populate a reference with a value converted from a json object.
+    // Arguments:
+    // - json: the json object to convert
+    // - target: the value to populate with the converted result
+    // Return Value:
+    // - a boolean indicating whether the value existed (in this case, was non-null)
+    //
+    // GetValue, type-deduced, manual converter
+    template<typename T, typename Converter>
+    bool GetValue(const Json::Value& json, T& target, Converter&& conv)
+    {
+        if constexpr (Detail::DeduceOptional<T>::IsOptional)
+        {
+            // FOR OPTION TYPES
+            // - If the json object is set to `null`, then
+            //   we'll instead set the target back to the empty optional.
+            if (json.isNull())
+            {
+                target = T{}; // zero-construct an empty optional
+                return true;
+            }
+        }
+
+        if (json)
+        {
+            if (!conv.CanConvert(json))
+            {
+                throw TypeMismatchException{};
+            }
+
+            target = conv.FromJson(json);
+            return true;
+        }
+        return false;
+    }
+
+    // GetValue, forced return type, manual converter
+    template<typename T, typename Converter>
+    std::decay_t<T> GetValue(const Json::Value& json, Converter&& conv)
+    {
+        std::decay_t<T> local{};
+        GetValue(json, local, std::forward<Converter>(conv));
+        return local; // returns zero-initialized or value
+    }
+
+    // GetValueForKey, type-deduced, manual converter
+    template<typename T, typename Converter>
+    bool GetValueForKey(const Json::Value& json, std::string_view key, T& target, Converter&& conv)
+    {
+        if (auto found{ json.find(&*key.cbegin(), (&*key.cbegin()) + key.size()) })
+        {
+            try
+            {
+                return GetValue(*found, target, std::forward<Converter>(conv));
+            }
+            catch (...)
+            {
+                // Wrap any caught exceptions in one that preserves context.
+                throw KeyedException(key, std::current_exception());
+            }
+        }
+        return false;
+    }
+
+    // GetValueForKey, forced return type, manual converter
+    template<typename T, typename Converter>
+    std::decay_t<T> GetValueForKey(const Json::Value& json, std::string_view key, Converter&& conv)
+    {
+        std::decay_t<T> local{};
+        GetValueForKey(json, key, local, std::forward<Converter>(conv));
+        return local; // returns zero-initialized?
+    }
+
+    // GetValue, type-deduced, with automatic converter
+    template<typename T>
+    bool GetValue(const Json::Value& json, T& target)
+    {
+        return GetValue(json, target, ConversionTrait<typename Detail::DeduceOptional<T>::Type>{});
+    }
+
+    // GetValue, forced return type, with automatic converter
+    template<typename T>
+    std::decay_t<T> GetValue(const Json::Value& json)
+    {
+        std::decay_t<T> local{};
+        GetValue(json, local, ConversionTrait<typename Detail::DeduceOptional<T>::Type>{});
+        return local; // returns zero-initialized or value
+    }
+
+    // GetValueForKey, type-deduced, with automatic converter
+    template<typename T>
+    bool GetValueForKey(const Json::Value& json, std::string_view key, T& target)
+    {
+        return GetValueForKey(json, key, target, ConversionTrait<typename Detail::DeduceOptional<T>::Type>{});
+    }
+
+    // GetValueForKey, forced return type, with automatic converter
+    template<typename T>
+    std::decay_t<T> GetValueForKey(const Json::Value& json, std::string_view key)
+    {
+        return GetValueForKey<T>(json, key, ConversionTrait<typename Detail::DeduceOptional<T>::Type>{});
+    }
+
+    // Get multiple values for keys (json, k, &v, k, &v, k, &v, ...).
+    // Uses the default converter for each v.
+    // Careful: this can cause a template explosion.
+    constexpr void GetValuesForKeys(const Json::Value& /*json*/) {}
+
+    template<typename T, typename... Args>
+    void GetValuesForKeys(const Json::Value& json, std::string_view key1, T&& val1, Args&&... args)
+    {
+        GetValueForKey(json, key1, val1);
+        GetValuesForKeys(json, std::forward<Args>(args)...);
+    }
+};
+
+#define JSON_ENUM_MAPPER(...)                                       \
+    template<>                                                      \
+    struct ::TerminalApp::JsonUtils::ConversionTrait<__VA_ARGS__> : \
+        public ::TerminalApp::JsonUtils::EnumMapper<__VA_ARGS__, ::TerminalApp::JsonUtils::ConversionTrait<__VA_ARGS__>>
+
+#define JSON_FLAG_MAPPER(...)                                       \
+    template<>                                                      \
+    struct ::TerminalApp::JsonUtils::ConversionTrait<__VA_ARGS__> : \
+        public ::TerminalApp::JsonUtils::FlagMapper<__VA_ARGS__, ::TerminalApp::JsonUtils::ConversionTrait<__VA_ARGS__>>
+
+#define JSON_MAPPINGS(Count) \
+    static constexpr std::array<pair_type, Count> mappings
--- a/src/cascadia/TerminalApp/KeyChordSerialization.cpp
+++ b/src/cascadia/TerminalApp/KeyChordSerialization.cpp
@@ -4,7 +4,7 @@
 #include "pch.h"
 #include "KeyChordSerialization.h"

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

 static constexpr std::wstring_view CTRL_KEY{ L"ctrl" };
 static constexpr std::wstring_view SHIFT_KEY{ L"shift" };
@@ -99,7 +99,7 @@ static const std::unordered_map<std::wstring_view, int32_t> vkeyNamePairs {
 // - hstr: the string to parse into a keychord.
 // Return Value:
 // - a newly constructed KeyChord
-KeyChord KeyChordSerialization::FromString(const winrt::hstring& hstr)
+winrt::Microsoft::Terminal::Settings::KeyChord KeyChordSerialization::FromString(const winrt::hstring& hstr)
 {
    std::wstring wstr{ hstr };

@@ -201,7 +201,7 @@ KeyChord KeyChordSerialization::FromString(const winrt::hstring& hstr)
        }
    }

-    return KeyChord{ modifiers, vkey };
+    return winrt::Microsoft::Terminal::Settings::KeyChord{ modifiers, vkey };
 }

 // Function Description:
--- a/src/cascadia/TerminalApp/KeyChordSerialization.h
+++ b/src/cascadia/TerminalApp/KeyChordSerialization.h
@@ -2,11 +2,11 @@
 // Licensed under the MIT license.

 #pragma once
-#include <winrt/Microsoft.Terminal.TerminalControl.h>
+#include <winrt/Microsoft.Terminal.Settings.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);
+    static winrt::Microsoft::Terminal::Settings::KeyChord FromString(const winrt::hstring& str);
+    static winrt::hstring ToString(const winrt::Microsoft::Terminal::Settings::KeyChord& chord);
 };
--- a/src/cascadia/TerminalApp/Pane.cpp
+++ b/src/cascadia/TerminalApp/Pane.cpp
@@ -7,11 +7,11 @@
 #include "CascadiaSettings.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;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
 using namespace winrt::TerminalApp;
@@ -921,102 +921,6 @@ bool Pane::CanSplit(SplitState splitType)
    return false;
 }

-// Method Description:
-// - This is a helper to determine if a given Pane can be split, but without
-//   using the ActualWidth() and ActualHeight() methods. This is used during
-//   processing of many "split-pane" commands, which could happen _before_ we've
-//   laid out a Pane for the first time. When this happens, the Pane's don't
-//   have an actual size yet. However, we'd still like to figure out if the pane
-//   could be split, once they're all laid out.
-// - This method assumes that the Pane we're attempting to split is `target`,
-//   and this method should be called on the root of a tree of Panes.
-// - We'll walk down the tree attempting to find `target`. As we traverse the
-//   tree, we'll reduce the size passed to each subsequent recursive call. The
-//   size passed to this method represents how much space this Pane _will_ have
-//   to use.
-//   * If this pane is a leaf, and it's the pane we're looking for, use the
-//     available space to calculate which direction to split in.
-//   * If this pane is _any other leaf_, then just return nullopt, to indicate
-//     that the `target` Pane is not down this branch.
-//   * If this pane is a parent, calculate how much space our children will be
-//     able to use, and recurse into them.
-// Arguments:
-// - target: The Pane we're attempting to split.
-// - splitType: The direction we're attempting to split in.
-// - availableSpace: The theoretical space that's available for this pane to be able to split.
-// Return Value:
-// - nullopt if `target` is not this pane or a child of this pane, otherwise
-//   true iff we could split this pane, given `availableSpace`
-// Note:
-// - This method is highly similar to Pane::PreCalculateAutoSplit
-std::optional<bool> Pane::PreCalculateCanSplit(const std::shared_ptr<Pane> target,
-                                               SplitState splitType,
-                                               const winrt::Windows::Foundation::Size availableSpace) const
-{
-    if (_IsLeaf())
-    {
-        if (target.get() == this)
-        {
-            // If this pane is a leaf, and it's the pane we're looking for, use
-            // the available space to calculate which direction to split in.
-            const Size minSize = _GetMinSize();
-
-            if (splitType == SplitState::None)
-            {
-                return { false };
-            }
-
-            else if (splitType == SplitState::Vertical)
-            {
-                const auto widthMinusSeparator = availableSpace.Width - CombinedPaneBorderSize;
-                const auto newWidth = widthMinusSeparator * Half;
-
-                return { newWidth > minSize.Width };
-            }
-
-            else if (splitType == SplitState::Horizontal)
-            {
-                const auto heightMinusSeparator = availableSpace.Height - CombinedPaneBorderSize;
-                const auto newHeight = heightMinusSeparator * Half;
-
-                return { newHeight > minSize.Height };
-            }
-        }
-        else
-        {
-            // If this pane is _any other leaf_, then just return nullopt, to
-            // indicate that the `target` Pane is not down this branch.
-            return std::nullopt;
-        }
-    }
-    else
-    {
-        // If this pane is a parent, calculate how much space our children will
-        // be able to use, and recurse into them.
-
-        const bool isVerticalSplit = _splitState == SplitState::Vertical;
-        const float firstWidth = isVerticalSplit ?
-                                     (availableSpace.Width * _desiredSplitPosition) - PaneBorderSize :
-                                     availableSpace.Width;
-        const float secondWidth = isVerticalSplit ?
-                                      (availableSpace.Width - firstWidth) - PaneBorderSize :
-                                      availableSpace.Width;
-        const float firstHeight = !isVerticalSplit ?
-                                      (availableSpace.Height * _desiredSplitPosition) - PaneBorderSize :
-                                      availableSpace.Height;
-        const float secondHeight = !isVerticalSplit ?
-                                       (availableSpace.Height - firstHeight) - PaneBorderSize :
-                                       availableSpace.Height;
-
-        const auto firstResult = _firstChild->PreCalculateCanSplit(target, splitType, { firstWidth, firstHeight });
-        return firstResult.has_value() ? firstResult : _secondChild->PreCalculateCanSplit(target, splitType, { secondWidth, secondHeight });
-    }
-
-    // We should not possibly be getting here - both the above branches should
-    // return a value.
-    FAIL_FAST();
-}
-
 // Method Description:
 // - Split the focused pane in our tree of panes, and place the given
 //   TermControl into the newly created pane. If we're the focused pane, then
--- a/src/cascadia/TerminalApp/Pane.h
+++ b/src/cascadia/TerminalApp/Pane.h
@@ -51,7 +51,7 @@ public:
    void ClearActive();
    void SetActive();

-    void UpdateSettings(const winrt::TerminalApp::TerminalSettings& settings,
+    void UpdateSettings(const winrt::Microsoft::Terminal::Settings::TerminalSettings& settings,
                        const GUID& profile);
    void ResizeContent(const winrt::Windows::Foundation::Size& newSize);
    void Relayout();
@@ -64,9 +64,7 @@ public:
                                                                  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<bool> PreCalculateCanSplit(const std::shared_ptr<Pane> target,
-                                             winrt::TerminalApp::SplitState splitType,
-                                             const winrt::Windows::Foundation::Size availableSpace) const;
+
    void Shutdown();
    void Close();

--- a/src/cascadia/TerminalApp/Profile.cpp
+++ b/src/cascadia/TerminalApp/Profile.cpp
@@ -9,11 +9,9 @@
 #include <DefaultSettings.h>

 #include "LegacyProfileGeneratorNamespaces.h"
-#include "TerminalSettingsSerializationHelpers.h"

 using namespace TerminalApp;
-using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace winrt::Windows::UI::Xaml;
 using namespace ::Microsoft::Console;

@@ -54,6 +52,57 @@ static constexpr std::string_view BackgroundImageAlignmentKey{ "backgroundImageA
 static constexpr std::string_view RetroTerminalEffectKey{ "experimental.retroTerminalEffect" };
 static constexpr std::string_view AntialiasingModeKey{ "antialiasingMode" };

+// Possible values for closeOnExit
+static constexpr std::string_view CloseOnExitAlways{ "always" };
+static constexpr std::string_view CloseOnExitGraceful{ "graceful" };
+static constexpr std::string_view CloseOnExitNever{ "never" };
+
+// Possible values for Scrollbar state
+static constexpr std::wstring_view AlwaysVisible{ L"visible" };
+static constexpr std::wstring_view AlwaysHide{ L"hidden" };
+
+// Possible values for Cursor Shape
+static constexpr std::wstring_view CursorShapeVintage{ L"vintage" };
+static constexpr std::wstring_view CursorShapeBar{ L"bar" };
+static constexpr std::wstring_view CursorShapeUnderscore{ L"underscore" };
+static constexpr std::wstring_view CursorShapeFilledbox{ L"filledBox" };
+static constexpr std::wstring_view CursorShapeEmptybox{ L"emptyBox" };
+
+// Possible values for Font Weight
+static constexpr std::string_view FontWeightThin{ "thin" };
+static constexpr std::string_view FontWeightExtraLight{ "extra-light" };
+static constexpr std::string_view FontWeightLight{ "light" };
+static constexpr std::string_view FontWeightSemiLight{ "semi-light" };
+static constexpr std::string_view FontWeightNormal{ "normal" };
+static constexpr std::string_view FontWeightMedium{ "medium" };
+static constexpr std::string_view FontWeightSemiBold{ "semi-bold" };
+static constexpr std::string_view FontWeightBold{ "bold" };
+static constexpr std::string_view FontWeightExtraBold{ "extra-bold" };
+static constexpr std::string_view FontWeightBlack{ "black" };
+static constexpr std::string_view FontWeightExtraBlack{ "extra-black" };
+
+// Possible values for Image Stretch Mode
+static constexpr std::string_view ImageStretchModeNone{ "none" };
+static constexpr std::string_view ImageStretchModeFill{ "fill" };
+static constexpr std::string_view ImageStretchModeUniform{ "uniform" };
+static constexpr std::string_view ImageStretchModeUniformTofill{ "uniformToFill" };
+
+// Possible values for Image Alignment
+static constexpr std::string_view ImageAlignmentCenter{ "center" };
+static constexpr std::string_view ImageAlignmentLeft{ "left" };
+static constexpr std::string_view ImageAlignmentTop{ "top" };
+static constexpr std::string_view ImageAlignmentRight{ "right" };
+static constexpr std::string_view ImageAlignmentBottom{ "bottom" };
+static constexpr std::string_view ImageAlignmentTopLeft{ "topLeft" };
+static constexpr std::string_view ImageAlignmentTopRight{ "topRight" };
+static constexpr std::string_view ImageAlignmentBottomLeft{ "bottomLeft" };
+static constexpr std::string_view ImageAlignmentBottomRight{ "bottomRight" };
+
+// Possible values for TextAntialiasingMode
+static constexpr std::wstring_view AntialiasingModeGrayscale{ L"grayscale" };
+static constexpr std::wstring_view AntialiasingModeCleartype{ L"cleartype" };
+static constexpr std::wstring_view AntialiasingModeAliased{ L"aliased" };
+
 Profile::Profile() :
    Profile(std::nullopt)
 {
@@ -199,7 +248,8 @@ TerminalSettings Profile::CreateTerminalSettings(const std::unordered_map<std::w

    if (_scrollbarState)
    {
-        terminalSettings.ScrollState(_scrollbarState.value());
+        ScrollbarState result = ParseScrollbarState(_scrollbarState.value());
+        terminalSettings.ScrollState(result);
    }

    if (HasBackgroundImage())
@@ -300,9 +350,11 @@ bool Profile::ShouldBeLayered(const Json::Value& json) const

    // First, check that GUIDs match. This is easy. If they don't match, they
    // should _definitely_ not layer.
-    if (const auto otherGuid{ JsonUtils::GetValueForKey<std::optional<GUID>>(json, GuidKey) })
+    if (json.isMember(JsonKey(GuidKey)))
    {
-        if (otherGuid != _guid) // optional compare takes care of this
+        const auto guid{ json[JsonKey(GuidKey)] };
+        const auto otherGuid = Utils::GuidFromString(GetWstringFromJson(guid));
+        if (_guid.value() != otherGuid)
        {
            return false;
        }
@@ -316,17 +368,16 @@ bool Profile::ShouldBeLayered(const Json::Value& json) const
        return false;
    }

-    std::optional<std::wstring> otherSource;
-    bool otherHadSource = JsonUtils::GetValueForKey(json, SourceKey, otherSource);
+    const auto& otherSource = json.isMember(JsonKey(SourceKey)) ? json[JsonKey(SourceKey)] : Json::Value::null;

    // For profiles with a `source`, also check the `source` property.
    bool sourceMatches = false;
    if (_source.has_value())
    {
-        if (otherHadSource)
+        if (json.isMember(JsonKey(SourceKey)))
        {
-            // If we have a source and the other has a source, compare them!
-            sourceMatches = otherSource == _source;
+            const auto otherSourceString = GetWstringFromJson(otherSource);
+            sourceMatches = otherSourceString == _source.value();
        }
        else
        {
@@ -344,13 +395,52 @@ bool Profile::ShouldBeLayered(const Json::Value& json) const
    }
    else
    {
-        // We do not have a source. The only way we match is if source is unset or set to "".
-        sourceMatches = (!otherSource.has_value() || otherSource.value() == L"");
+        // We do not have a source. The only way we match is if source is set to null or "".
+        if (otherSource.isNull() || (otherSource.isString() && otherSource == ""))
+        {
+            sourceMatches = true;
+        }
    }

    return sourceMatches;
 }

+// Method Description:
+// - Helper function to convert a json value into a value of the Stretch enum.
+//   Calls into ParseImageStretchMode. Used with JsonUtils::GetOptionalValue.
+// Arguments:
+// - json: the Json::Value object to parse.
+// Return Value:
+// - An appropriate value from Windows.UI.Xaml.Media.Stretch
+Media::Stretch Profile::_ConvertJsonToStretchMode(const Json::Value& json)
+{
+    return Profile::ParseImageStretchMode(json.asString());
+}
+
+// Method Description:
+// - Helper function to convert a json value into a value of the Stretch enum.
+//   Calls into ParseImageAlignment. Used with JsonUtils::GetOptionalValue.
+// Arguments:
+// - json: the Json::Value object to parse.
+// Return Value:
+// - A pair of HorizontalAlignment and VerticalAlignment
+std::tuple<HorizontalAlignment, VerticalAlignment> Profile::_ConvertJsonToAlignment(const Json::Value& json)
+{
+    return Profile::ParseImageAlignment(json.asString());
+}
+
+// Method Description:
+// - Helper function to convert a json value into a bool.
+//   Used with JsonUtils::GetOptionalValue.
+// Arguments:
+// - json: the Json::Value object to parse.
+// Return Value:
+// - A bool
+bool Profile::_ConvertJsonToBool(const Json::Value& json)
+{
+    return json.asBool();
+}
+
 // Method Description:
 // - Layer values from the given json object on top of the existing properties
 //   of this object. For any keys we're expecting to be able to parse in the
@@ -366,45 +456,89 @@ bool Profile::ShouldBeLayered(const Json::Value& json) const
 void Profile::LayerJson(const Json::Value& json)
 {
    // Profile-specific Settings
-    JsonUtils::GetValueForKey(json, NameKey, _name);
-    JsonUtils::GetValueForKey(json, GuidKey, _guid);
-    JsonUtils::GetValueForKey(json, HiddenKey, _hidden);
+    JsonUtils::GetWstring(json, NameKey, _name);
+
+    JsonUtils::GetOptionalGuid(json, GuidKey, _guid);
+
+    JsonUtils::GetBool(json, HiddenKey, _hidden);

    // Core Settings
-    JsonUtils::GetValueForKey(json, ForegroundKey, _defaultForeground);
-    JsonUtils::GetValueForKey(json, BackgroundKey, _defaultBackground);
-    JsonUtils::GetValueForKey(json, SelectionBackgroundKey, _selectionBackground);
-    JsonUtils::GetValueForKey(json, CursorColorKey, _cursorColor);
-    JsonUtils::GetValueForKey(json, ColorSchemeKey, _schemeName);
+    JsonUtils::GetOptionalColor(json, ForegroundKey, _defaultForeground);
+
+    JsonUtils::GetOptionalColor(json, BackgroundKey, _defaultBackground);
+
+    JsonUtils::GetOptionalColor(json, SelectionBackgroundKey, _selectionBackground);
+
+    JsonUtils::GetOptionalColor(json, CursorColorKey, _cursorColor);
+
+    JsonUtils::GetOptionalString(json, ColorSchemeKey, _schemeName);

    // TODO:MSFT:20642297 - Use a sentinel value (-1) for "Infinite scrollback"
-    JsonUtils::GetValueForKey(json, HistorySizeKey, _historySize);
-    JsonUtils::GetValueForKey(json, SnapOnInputKey, _snapOnInput);
-    JsonUtils::GetValueForKey(json, AltGrAliasingKey, _altGrAliasing);
-    JsonUtils::GetValueForKey(json, CursorHeightKey, _cursorHeight);
-    JsonUtils::GetValueForKey(json, CursorShapeKey, _cursorShape);
-    JsonUtils::GetValueForKey(json, TabTitleKey, _tabTitle);
+    JsonUtils::GetInt(json, HistorySizeKey, _historySize);
+
+    JsonUtils::GetBool(json, SnapOnInputKey, _snapOnInput);
+
+    JsonUtils::GetBool(json, AltGrAliasingKey, _altGrAliasing);
+
+    JsonUtils::GetUInt(json, CursorHeightKey, _cursorHeight);
+
+    if (json.isMember(JsonKey(CursorShapeKey)))
+    {
+        auto cursorShape{ json[JsonKey(CursorShapeKey)] };
+        _cursorShape = _ParseCursorShape(GetWstringFromJson(cursorShape));
+    }
+    JsonUtils::GetOptionalString(json, TabTitleKey, _tabTitle);

    // Control Settings
-    JsonUtils::GetValueForKey(json, FontWeightKey, _fontWeight);
-    JsonUtils::GetValueForKey(json, ConnectionTypeKey, _connectionType);
-    JsonUtils::GetValueForKey(json, CommandlineKey, _commandline);
-    JsonUtils::GetValueForKey(json, FontFaceKey, _fontFace);
-    JsonUtils::GetValueForKey(json, FontSizeKey, _fontSize);
-    JsonUtils::GetValueForKey(json, AcrylicTransparencyKey, _acrylicTransparency);
-    JsonUtils::GetValueForKey(json, UseAcrylicKey, _useAcrylic);
-    JsonUtils::GetValueForKey(json, SuppressApplicationTitleKey, _suppressApplicationTitle);
-    JsonUtils::GetValueForKey(json, CloseOnExitKey, _closeOnExitMode);
-    JsonUtils::GetValueForKey(json, PaddingKey, _padding);
-    JsonUtils::GetValueForKey(json, ScrollbarStateKey, _scrollbarState);
-    JsonUtils::GetValueForKey(json, StartingDirectoryKey, _startingDirectory);
-    JsonUtils::GetValueForKey(json, IconKey, _icon);
-    JsonUtils::GetValueForKey(json, BackgroundImageKey, _backgroundImage);
-    JsonUtils::GetValueForKey(json, BackgroundImageOpacityKey, _backgroundImageOpacity);
-    JsonUtils::GetValueForKey(json, BackgroundImageStretchModeKey, _backgroundImageStretchMode);
-    JsonUtils::GetValueForKey(json, BackgroundImageAlignmentKey, _backgroundImageAlignment);
-    JsonUtils::GetValueForKey(json, RetroTerminalEffectKey, _retroTerminalEffect);
-    JsonUtils::GetValueForKey(json, AntialiasingModeKey, _antialiasingMode);
+    JsonUtils::GetOptionalGuid(json, ConnectionTypeKey, _connectionType);
+
+    JsonUtils::GetWstring(json, CommandlineKey, _commandline);
+
+    JsonUtils::GetWstring(json, FontFaceKey, _fontFace);
+
+    JsonUtils::GetInt(json, FontSizeKey, _fontSize);
+
+    if (json.isMember(JsonKey(FontWeightKey)))
+    {
+        auto fontWeight{ json[JsonKey(FontWeightKey)] };
+        _fontWeight = _ParseFontWeight(fontWeight);
+    }
+
+    JsonUtils::GetDouble(json, AcrylicTransparencyKey, _acrylicTransparency);
+
+    JsonUtils::GetBool(json, UseAcrylicKey, _useAcrylic);
+
+    JsonUtils::GetBool(json, SuppressApplicationTitleKey, _suppressApplicationTitle);
+
+    if (json.isMember(JsonKey(CloseOnExitKey)))
+    {
+        auto closeOnExit{ json[JsonKey(CloseOnExitKey)] };
+        _closeOnExitMode = ParseCloseOnExitMode(closeOnExit);
+    }
+
+    JsonUtils::GetWstring(json, PaddingKey, _padding);
+
+    JsonUtils::GetOptionalString(json, ScrollbarStateKey, _scrollbarState);
+
+    JsonUtils::GetOptionalString(json, StartingDirectoryKey, _startingDirectory);
+
+    JsonUtils::GetOptionalString(json, IconKey, _icon);
+
+    JsonUtils::GetOptionalString(json, BackgroundImageKey, _backgroundImage);
+
+    JsonUtils::GetOptionalDouble(json, BackgroundImageOpacityKey, _backgroundImageOpacity);
+
+    JsonUtils::GetOptionalValue(json, BackgroundImageStretchModeKey, _backgroundImageStretchMode, &Profile::_ConvertJsonToStretchMode);
+
+    JsonUtils::GetOptionalValue(json, BackgroundImageAlignmentKey, _backgroundImageAlignment, &Profile::_ConvertJsonToAlignment);
+
+    JsonUtils::GetOptionalValue(json, RetroTerminalEffectKey, _retroTerminalEffect, Profile::_ConvertJsonToBool);
+
+    if (json.isMember(JsonKey(AntialiasingModeKey)))
+    {
+        auto antialiasingMode{ json[JsonKey(AntialiasingModeKey)] };
+        _antialiasingMode = ParseTextAntialiasingMode(GetWstringFromJson(antialiasingMode));
+    }
 }

 void Profile::SetFontFace(std::wstring fontFace) noexcept
@@ -636,6 +770,249 @@ std::wstring Profile::EvaluateStartingDirectory(const std::wstring& directory)
    }
 }

+// Method Description:
+// - Helper function for converting a user-specified font weight value to its corresponding enum
+// Arguments:
+// - The value from the settings.json file
+// Return Value:
+// - The corresponding value which maps to the string provided by the user
+winrt::Windows::UI::Text::FontWeight Profile::_ParseFontWeight(const Json::Value& json)
+{
+    if (json.isUInt())
+    {
+        winrt::Windows::UI::Text::FontWeight weight;
+        weight.Weight = static_cast<uint16_t>(json.asUInt());
+
+        // We're only accepting variable values between 100 and 990 so we don't go too crazy.
+        if (weight.Weight >= 100 && weight.Weight <= 990)
+        {
+            return weight;
+        }
+    }
+
+    if (json.isString())
+    {
+        auto fontWeight = json.asString();
+        if (fontWeight == FontWeightThin)
+        {
+            return winrt::Windows::UI::Text::FontWeights::Thin();
+        }
+        else if (fontWeight == FontWeightExtraLight)
+        {
+            return winrt::Windows::UI::Text::FontWeights::ExtraLight();
+        }
+        else if (fontWeight == FontWeightLight)
+        {
+            return winrt::Windows::UI::Text::FontWeights::Light();
+        }
+        else if (fontWeight == FontWeightSemiLight)
+        {
+            return winrt::Windows::UI::Text::FontWeights::SemiLight();
+        }
+        else if (fontWeight == FontWeightNormal)
+        {
+            return winrt::Windows::UI::Text::FontWeights::Normal();
+        }
+        else if (fontWeight == FontWeightMedium)
+        {
+            return winrt::Windows::UI::Text::FontWeights::Medium();
+        }
+        else if (fontWeight == FontWeightSemiBold)
+        {
+            return winrt::Windows::UI::Text::FontWeights::SemiBold();
+        }
+        else if (fontWeight == FontWeightBold)
+        {
+            return winrt::Windows::UI::Text::FontWeights::Bold();
+        }
+        else if (fontWeight == FontWeightExtraBold)
+        {
+            return winrt::Windows::UI::Text::FontWeights::ExtraBold();
+        }
+        else if (fontWeight == FontWeightBlack)
+        {
+            return winrt::Windows::UI::Text::FontWeights::Black();
+        }
+        else if (fontWeight == FontWeightExtraBlack)
+        {
+            return winrt::Windows::UI::Text::FontWeights::ExtraBlack();
+        }
+    }
+
+    return winrt::Windows::UI::Text::FontWeights::Normal();
+}
+
+// Method Description:
+// - Helper function for converting a user-specified closeOnExit value to its corresponding enum
+// Arguments:
+// - The value from the settings.json file
+// Return Value:
+// - The corresponding enum value which maps to the string provided by the user
+CloseOnExitMode Profile::ParseCloseOnExitMode(const Json::Value& json)
+{
+    if (json.isBool())
+    {
+        return json.asBool() ? CloseOnExitMode::Graceful : CloseOnExitMode::Never;
+    }
+
+    if (json.isString())
+    {
+        auto closeOnExit = json.asString();
+        if (closeOnExit == CloseOnExitAlways)
+        {
+            return CloseOnExitMode::Always;
+        }
+        else if (closeOnExit == CloseOnExitGraceful)
+        {
+            return CloseOnExitMode::Graceful;
+        }
+        else if (closeOnExit == CloseOnExitNever)
+        {
+            return CloseOnExitMode::Never;
+        }
+    }
+
+    return CloseOnExitMode::Graceful;
+}
+
+// Method Description:
+// - Helper function for converting a user-specified scrollbar state to its corresponding enum
+// Arguments:
+// - The value from the settings.json file
+// Return Value:
+// - The corresponding enum value which maps to the string provided by the user
+ScrollbarState Profile::ParseScrollbarState(const std::wstring& scrollbarState)
+{
+    if (scrollbarState == AlwaysVisible)
+    {
+        return ScrollbarState::Visible;
+    }
+    else if (scrollbarState == AlwaysHide)
+    {
+        return ScrollbarState::Hidden;
+    }
+    else
+    {
+        return ScrollbarState::Visible;
+    }
+}
+
+// Method Description:
+// - Helper function for converting a user-specified image stretch mode
+//   to the appropriate enum value
+// Arguments:
+// - The value from the settings.json file
+// Return Value:
+// - The corresponding enum value which maps to the string provided by the user
+Media::Stretch Profile::ParseImageStretchMode(const std::string_view imageStretchMode)
+{
+    if (imageStretchMode == ImageStretchModeNone)
+    {
+        return Media::Stretch::None;
+    }
+    else if (imageStretchMode == ImageStretchModeFill)
+    {
+        return Media::Stretch::Fill;
+    }
+    else if (imageStretchMode == ImageStretchModeUniform)
+    {
+        return Media::Stretch::Uniform;
+    }
+    else // Fall through to default behavior
+    {
+        return Media::Stretch::UniformToFill;
+    }
+}
+
+// Method Description:
+// - Helper function for converting a user-specified image horizontal and vertical
+//   alignment to the appropriate enum values tuple
+// Arguments:
+// - The value from the settings.json file
+// Return Value:
+// - The corresponding enum values tuple which maps to the string provided by the user
+std::tuple<HorizontalAlignment, VerticalAlignment> Profile::ParseImageAlignment(const std::string_view imageAlignment)
+{
+    if (imageAlignment == ImageAlignmentTopLeft)
+    {
+        return std::make_tuple(HorizontalAlignment::Left,
+                               VerticalAlignment::Top);
+    }
+    else if (imageAlignment == ImageAlignmentBottomLeft)
+    {
+        return std::make_tuple(HorizontalAlignment::Left,
+                               VerticalAlignment::Bottom);
+    }
+    else if (imageAlignment == ImageAlignmentLeft)
+    {
+        return std::make_tuple(HorizontalAlignment::Left,
+                               VerticalAlignment::Center);
+    }
+    else if (imageAlignment == ImageAlignmentTopRight)
+    {
+        return std::make_tuple(HorizontalAlignment::Right,
+                               VerticalAlignment::Top);
+    }
+    else if (imageAlignment == ImageAlignmentBottomRight)
+    {
+        return std::make_tuple(HorizontalAlignment::Right,
+                               VerticalAlignment::Bottom);
+    }
+    else if (imageAlignment == ImageAlignmentRight)
+    {
+        return std::make_tuple(HorizontalAlignment::Right,
+                               VerticalAlignment::Center);
+    }
+    else if (imageAlignment == ImageAlignmentTop)
+    {
+        return std::make_tuple(HorizontalAlignment::Center,
+                               VerticalAlignment::Top);
+    }
+    else if (imageAlignment == ImageAlignmentBottom)
+    {
+        return std::make_tuple(HorizontalAlignment::Center,
+                               VerticalAlignment::Bottom);
+    }
+    else // Fall through to default alignment
+    {
+        return std::make_tuple(HorizontalAlignment::Center,
+                               VerticalAlignment::Center);
+    }
+}
+
+// Method Description:
+// - Helper function for converting a user-specified cursor style corresponding
+//   CursorStyle enum value
+// Arguments:
+// - cursorShapeString: The string value from the settings file to parse
+// Return Value:
+// - The corresponding enum value which maps to the string provided by the user
+CursorStyle Profile::_ParseCursorShape(const std::wstring& cursorShapeString)
+{
+    if (cursorShapeString == CursorShapeVintage)
+    {
+        return CursorStyle::Vintage;
+    }
+    else if (cursorShapeString == CursorShapeBar)
+    {
+        return CursorStyle::Bar;
+    }
+    else if (cursorShapeString == CursorShapeUnderscore)
+    {
+        return CursorStyle::Underscore;
+    }
+    else if (cursorShapeString == CursorShapeFilledbox)
+    {
+        return CursorStyle::FilledBox;
+    }
+    else if (cursorShapeString == CursorShapeEmptybox)
+    {
+        return CursorStyle::EmptyBox;
+    }
+    // default behavior for invalid data
+    return CursorStyle::Bar;
+}
+
 // Method Description:
 // - If this profile never had a GUID set for it, generate a runtime GUID for
 //   the profile. If a profile had their guid manually set to {0}, this method
@@ -701,13 +1078,17 @@ GUID Profile::_GenerateGuidForProfile(const std::wstring& name, const std::optio
 // - The json's `guid`, or a guid synthesized for it.
 GUID Profile::GetGuidOrGenerateForJson(const Json::Value& json) noexcept
 {
-    if (const auto guid{ JsonUtils::GetValueForKey<std::optional<GUID>>(json, GuidKey) })
+    std::optional<GUID> guid{ std::nullopt };
+
+    JsonUtils::GetOptionalGuid(json, GuidKey, guid);
+    if (guid)
    {
        return guid.value();
    }

-    const auto name{ JsonUtils::GetValueForKey<std::wstring>(json, NameKey) };
-    const auto source{ JsonUtils::GetValueForKey<std::optional<std::wstring>>(json, SourceKey) };
+    const auto name = GetWstringFromJson(json[JsonKey(NameKey)]);
+    std::optional<std::wstring> source{ std::nullopt };
+    JsonUtils::GetOptionalString(json, SourceKey, source);

    return Profile::_GenerateGuidForProfile(name, source);
 }
@@ -716,3 +1097,28 @@ void Profile::SetRetroTerminalEffect(bool value) noexcept
 {
    _retroTerminalEffect = value;
 }
+
+// Method Description:
+// - Helper function for converting a user-specified antialiasing mode
+//   corresponding TextAntialiasingMode enum value
+// Arguments:
+// - antialiasingMode: The string value from the settings file to parse
+// Return Value:
+// - The corresponding enum value which maps to the string provided by the user
+TextAntialiasingMode Profile::ParseTextAntialiasingMode(const std::wstring& antialiasingMode)
+{
+    if (antialiasingMode == AntialiasingModeCleartype)
+    {
+        return TextAntialiasingMode::Cleartype;
+    }
+    else if (antialiasingMode == AntialiasingModeAliased)
+    {
+        return TextAntialiasingMode::Aliased;
+    }
+    else if (antialiasingMode == AntialiasingModeGrayscale)
+    {
+        return TextAntialiasingMode::Grayscale;
+    }
+    // default behavior for invalid data
+    return TextAntialiasingMode::Grayscale;
+}
--- a/src/cascadia/TerminalApp/Profile.h
+++ b/src/cascadia/TerminalApp/Profile.h
@@ -15,7 +15,6 @@ Author(s):
 --*/
 #pragma once
 #include "ColorScheme.h"
-#include "SettingsTypes.h"

 // fwdecl unittest classes
 namespace TerminalAppLocalTests
@@ -36,7 +35,14 @@ constexpr GUID RUNTIME_GENERATED_PROFILE_NAMESPACE_GUID = { 0xf65ddb7e, 0x706b,
 namespace TerminalApp
 {
    class Profile;
-}
+
+    enum class CloseOnExitMode
+    {
+        Never = 0,
+        Graceful,
+        Always
+    };
+};

 class TerminalApp::Profile final
 {
@@ -46,7 +52,7 @@ public:

    ~Profile();

-    winrt::TerminalApp::TerminalSettings CreateTerminalSettings(const std::unordered_map<std::wstring, ColorScheme>& schemes) const;
+    winrt::Microsoft::Terminal::Settings::TerminalSettings CreateTerminalSettings(const std::unordered_map<std::wstring, ColorScheme>& schemes) const;

    Json::Value GenerateStub() const;
    static Profile FromJson(const Json::Value& json);
@@ -101,8 +107,24 @@ public:
 private:
    static std::wstring EvaluateStartingDirectory(const std::wstring& directory);

+    static winrt::Microsoft::Terminal::Settings::ScrollbarState ParseScrollbarState(const std::wstring& scrollbarState);
+    static winrt::Windows::UI::Xaml::Media::Stretch ParseImageStretchMode(const std::string_view imageStretchMode);
+    static winrt::Windows::UI::Xaml::Media::Stretch _ConvertJsonToStretchMode(const Json::Value& json);
+    static std::tuple<winrt::Windows::UI::Xaml::HorizontalAlignment, winrt::Windows::UI::Xaml::VerticalAlignment> ParseImageAlignment(const std::string_view imageAlignment);
+    static std::tuple<winrt::Windows::UI::Xaml::HorizontalAlignment, winrt::Windows::UI::Xaml::VerticalAlignment> _ConvertJsonToAlignment(const Json::Value& json);
+
+    static winrt::Windows::UI::Text::FontWeight _ParseFontWeight(const Json::Value& json);
+
+    static CloseOnExitMode ParseCloseOnExitMode(const Json::Value& json);
+
+    static winrt::Microsoft::Terminal::Settings::CursorStyle _ParseCursorShape(const std::wstring& cursorShapeString);
+
+    static winrt::Microsoft::Terminal::Settings::TextAntialiasingMode ParseTextAntialiasingMode(const std::wstring& antialiasingMode);
+
    static GUID _GenerateGuidForProfile(const std::wstring& name, const std::optional<std::wstring>& source) noexcept;

+    static bool _ConvertJsonToBool(const Json::Value& json);
+
    std::optional<GUID> _guid{ std::nullopt };
    std::optional<std::wstring> _source{ std::nullopt };
    std::wstring _name;
@@ -122,7 +144,7 @@ private:
    bool _snapOnInput;
    bool _altGrAliasing;
    uint32_t _cursorHeight;
-    winrt::Microsoft::Terminal::TerminalControl::CursorStyle _cursorShape;
+    winrt::Microsoft::Terminal::Settings::CursorStyle _cursorShape;

    std::wstring _commandline;
    std::wstring _fontFace;
@@ -137,13 +159,13 @@ private:
    std::optional<winrt::Windows::UI::Xaml::Media::Stretch> _backgroundImageStretchMode;
    std::optional<std::tuple<winrt::Windows::UI::Xaml::HorizontalAlignment, winrt::Windows::UI::Xaml::VerticalAlignment>> _backgroundImageAlignment;

-    std::optional<::winrt::Microsoft::Terminal::TerminalControl::ScrollbarState> _scrollbarState;
+    std::optional<std::wstring> _scrollbarState;
    CloseOnExitMode _closeOnExitMode;
    std::wstring _padding;

    std::optional<std::wstring> _icon;

-    winrt::Microsoft::Terminal::TerminalControl::TextAntialiasingMode _antialiasingMode;
+    winrt::Microsoft::Terminal::Settings::TextAntialiasingMode _antialiasingMode;

    friend class TerminalAppLocalTests::SettingsTests;
    friend class TerminalAppLocalTests::ProfileTests;
--- a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
@@ -538,23 +538,11 @@
  </data>
  <data name="RenameTabCommandKey" xml:space="preserve">
    <value>Rename tab to "{0}"</value>
-    <comment>{0} will be replaced with a user-defined string</comment>
+    <comment>{0} will be replaced with 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="CrimsonColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Crimson</value>
  </data>
--- a/src/cascadia/TerminalApp/SettingsTypes.h
+++ b/src/cascadia/TerminalApp/SettingsTypes.h
@@ -1,28 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
- SettingsTypes.h
-
-Abstract:
- Types used in the settings model (non-exported)
--*/
-
-#pragma once
-
-namespace TerminalApp
-{
-    enum class CloseOnExitMode
-    {
-        Never = 0,
-        Graceful,
-        Always
-    };
-
-    struct LaunchPosition
-    {
-        std::optional<int> x;
-        std::optional<int> y;
-    };
-};
--- a/src/cascadia/TerminalApp/ShortcutActionDispatch.cpp
+++ b/src/cascadia/TerminalApp/ShortcutActionDispatch.cpp
@@ -194,21 +194,6 @@ namespace winrt::TerminalApp::implementation
            _RenameTabHandlers(*this, *eventArgs);
            break;
        }
-        case ShortcutAction::ExecuteCommandline:
-        {
-            _ExecuteCommandlineHandlers(*this, *eventArgs);
-            break;
-        }
-        case ShortcutAction::CloseOtherTabs:
-        {
-            _CloseOtherTabsHandlers(*this, *eventArgs);
-            break;
-        }
-        case ShortcutAction::CloseTabsAfter:
-        {
-            _CloseTabsAfterHandlers(*this, *eventArgs);
-            break;
-        }
        default:
            return false;
        }
--- a/src/cascadia/TerminalApp/ShortcutActionDispatch.h
+++ b/src/cascadia/TerminalApp/ShortcutActionDispatch.h
@@ -54,9 +54,6 @@ namespace winrt::TerminalApp::implementation
        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);
        // clang-format on

    private:
--- a/src/cascadia/TerminalApp/ShortcutActionDispatch.idl
+++ b/src/cascadia/TerminalApp/ShortcutActionDispatch.idl
@@ -35,14 +35,11 @@ namespace TerminalApp
        ToggleFocusMode,
        ToggleFullscreen,
        ToggleAlwaysOnTop,
-        OpenSettings,
        SetTabColor,
        OpenTabColorPicker,
+        OpenSettings,
        RenameTab,
-        ExecuteCommandline,
-        ToggleCommandPalette,
-        CloseOtherTabs,
-        CloseTabsAfter
+        ToggleCommandPalette
    };

    [default_interface] runtimeclass ActionAndArgs {
@@ -87,8 +84,5 @@ namespace TerminalApp
        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;
    }
 }
--- a/src/cascadia/TerminalApp/Tab.cpp
+++ b/src/cascadia/TerminalApp/Tab.cpp
@@ -12,6 +12,7 @@
 using namespace winrt;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Core;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Windows::System;

@@ -874,10 +875,6 @@ namespace winrt::TerminalApp::implementation
        return _rootPane->PreCalculateAutoSplit(_activePane, availableSpace).value_or(SplitState::Vertical);
    }

-    bool Tab::PreCalculateCanSplit(SplitState splitType, winrt::Windows::Foundation::Size availableSpace) const
-    {
-        return _rootPane->PreCalculateCanSplit(_activePane, splitType, availableSpace).value_or(false);
-    }
    DEFINE_EVENT(Tab, ActivePaneChanged, _ActivePaneChangedHandlers, winrt::delegate<>);
    DEFINE_EVENT(Tab, ColorSelected, _colorSelected, winrt::delegate<winrt::Windows::UI::Color>);
    DEFINE_EVENT(Tab, ColorCleared, _colorCleared, winrt::delegate<>);
--- a/src/cascadia/TerminalApp/Tab.h
+++ b/src/cascadia/TerminalApp/Tab.h
@@ -40,13 +40,12 @@ namespace winrt::TerminalApp::implementation

        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;

        void ResizeContent(const winrt::Windows::Foundation::Size& newSize);
        void ResizePane(const winrt::TerminalApp::Direction& direction);
        void NavigateFocus(const winrt::TerminalApp::Direction& direction);

-        void UpdateSettings(const winrt::TerminalApp::TerminalSettings& settings, const GUID& profile);
+        void UpdateSettings(const winrt::Microsoft::Terminal::Settings::TerminalSettings& settings, const GUID& profile);
        winrt::hstring GetActiveTitle() const;

        void Shutdown();
--- a/src/cascadia/TerminalApp/TerminalApp.vcxproj
+++ b/src/cascadia/TerminalApp/TerminalApp.vcxproj
@@ -67,6 +67,7 @@
    <!-- The midl compiler however, _will_ aggregate our winmd dependencies
    somehow. So make sure to only include top-level dependencies here (don't
    include Settings and Connection, since Control will include them for us) -->
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettings\TerminalSettings.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
    <!-- Reference TerminalAppLib here, so we can use it's TerminalApp.winmd as
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -32,6 +32,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;
 using namespace ::TerminalApp;
 using namespace ::Microsoft::Console;

@@ -45,8 +46,7 @@ namespace winrt
 namespace winrt::TerminalApp::implementation
 {
    TerminalPage::TerminalPage() :
-        _tabs{ winrt::single_threaded_observable_vector<TerminalApp::Tab>() },
-        _startupActions{ winrt::single_threaded_vector<winrt::TerminalApp::ActionAndArgs>() }
+        _tabs{ winrt::single_threaded_observable_vector<TerminalApp::Tab>() }
    {
        InitializeComponent();
    }
@@ -166,28 +166,7 @@ namespace winrt::TerminalApp::implementation
        _newTabButton.Click([weakThis{ get_weak() }](auto&&, auto&&) {
            if (auto page{ weakThis.get() })
            {
-                // if alt is pressed, open a pane
-                const CoreWindow window = CoreWindow::GetForCurrentThread();
-                const auto rAltState = window.GetKeyState(VirtualKey::RightMenu);
-                const auto lAltState = window.GetKeyState(VirtualKey::LeftMenu);
-                const bool altPressed = WI_IsFlagSet(lAltState, CoreVirtualKeyStates::Down) ||
-                                        WI_IsFlagSet(rAltState, CoreVirtualKeyStates::Down);
-
-                // Check for DebugTap
-                bool debugTap = page->_settings->GlobalSettings().DebugFeaturesEnabled() &&
-                                WI_IsFlagSet(lAltState, CoreVirtualKeyStates::Down) &&
-                                WI_IsFlagSet(rAltState, CoreVirtualKeyStates::Down);
-
-                if (altPressed && !debugTap)
-                {
-                    page->_SplitPane(TerminalApp::SplitState::Automatic,
-                                     TerminalApp::SplitType::Manual,
-                                     nullptr);
-                }
-                else
-                {
-                    page->_OpenNewTab(nullptr);
-                }
+                page->_OpenNewTab(nullptr);
            }
        });
        _tabView.SelectionChanged({ this, &TerminalPage::_OnTabSelectionChanged });
@@ -244,7 +223,7 @@ namespace winrt::TerminalApp::implementation
        if (_startupState == StartupState::NotInitialized)
        {
            _startupState = StartupState::InStartup;
-            if (_startupActions.Size() == 0)
+            if (_startupActions.empty())
            {
                _OpenNewTab(nullptr);

@@ -252,27 +231,22 @@ namespace winrt::TerminalApp::implementation
            }
            else
            {
-                _ProcessStartupActions(_startupActions, true);
+                _ProcessStartupActions();
            }
        }
    }

    // Method Description:
-    // - Process all the startup actions in the provided list of startup
-    //   actions. We'll do this all at once here.
+    // - Process all the startup actions in our list of startup actions. We'll
+    //   do this all at once here.
    // Arguments:
-    // - actions: a winrt vector of actions to process. Note that this must NOT
-    //   be an IVector&, because we need the collection to be accessible on the
-    //   other side of the co_await.
-    // - initial: if true, we're parsing these args during startup, and we
-    //   should fire an Initialized event.
+    // - <none>
    // Return Value:
    // - <none>
-    winrt::fire_and_forget TerminalPage::_ProcessStartupActions(Windows::Foundation::Collections::IVector<winrt::TerminalApp::ActionAndArgs> actions,
-                                                                const bool initial)
+    winrt::fire_and_forget TerminalPage::_ProcessStartupActions()
    {
        // If there are no actions left, do nothing.
-        if (actions.Size() == 0)
+        if (_startupActions.empty())
        {
            return;
        }
@@ -282,20 +256,11 @@ namespace winrt::TerminalApp::implementation
        co_await winrt::resume_foreground(Dispatcher(), CoreDispatcherPriority::Normal);
        if (auto page{ weakThis.get() })
        {
-            for (const auto& action : actions)
+            for (const auto& action : _startupActions)
            {
-                if (auto page{ weakThis.get() })
-                {
-                    _actionDispatch->DoAction(action);
-                }
-                else
-                {
-                    return;
-                }
+                _actionDispatch->DoAction(action);
            }
-        }
-        if (initial)
-        {
+
            _CompleteInitialization();
        }
    }
@@ -625,7 +590,7 @@ namespace winrt::TerminalApp::implementation
    //      currently displayed, it will be shown.
    // Arguments:
    // - settings: the TerminalSettings object to use to create the TerminalControl with.
-    void TerminalPage::_CreateNewTabFromSettings(GUID profileGuid, TerminalApp::TerminalSettings settings)
+    void TerminalPage::_CreateNewTabFromSettings(GUID profileGuid, TerminalSettings settings)
    {
        // Initialize the new tab

@@ -726,7 +691,7 @@ namespace winrt::TerminalApp::implementation
    // Return value:
    // - the desired connection
    TerminalConnection::ITerminalConnection TerminalPage::_CreateConnectionFromSettings(GUID profileGuid,
-                                                                                        TerminalApp::TerminalSettings settings)
+                                                                                        winrt::Microsoft::Terminal::Settings::TerminalSettings settings)
    {
        const auto* const profile = _settings->FindProfile(profileGuid);

@@ -892,9 +857,6 @@ namespace winrt::TerminalApp::implementation
        _actionDispatch->SetTabColor({ this, &TerminalPage::_HandleSetTabColor });
        _actionDispatch->OpenTabColorPicker({ this, &TerminalPage::_HandleOpenTabColorPicker });
        _actionDispatch->RenameTab({ this, &TerminalPage::_HandleRenameTab });
-        _actionDispatch->ExecuteCommandline({ this, &TerminalPage::_HandleExecuteCommandline });
-        _actionDispatch->CloseOtherTabs({ this, &TerminalPage::_HandleCloseOtherTabs });
-        _actionDispatch->CloseTabsAfter({ this, &TerminalPage::_HandleCloseTabsAfter });
    }

    // Method Description:
@@ -1206,7 +1168,7 @@ namespace winrt::TerminalApp::implementation
        }
    }

-    TermControl TerminalPage::_GetActiveControl()
+    winrt::Microsoft::Terminal::TerminalControl::TermControl TerminalPage::_GetActiveControl()
    {
        if (auto index{ _GetFocusedTabIndex() })
        {
@@ -1369,7 +1331,7 @@ namespace winrt::TerminalApp::implementation
        try
        {
            auto focusedTab = _GetStrongTabImpl(*indexOpt);
-            TerminalApp::TerminalSettings controlSettings;
+            winrt::Microsoft::Terminal::Settings::TerminalSettings controlSettings;
            GUID realGuid;
            bool profileFound = false;

@@ -1402,22 +1364,21 @@ namespace winrt::TerminalApp::implementation

            const auto controlConnection = _CreateConnectionFromSettings(realGuid, controlSettings);

-            const float contentWidth = ::base::saturated_cast<float>(_tabContent.ActualWidth());
-            const float contentHeight = ::base::saturated_cast<float>(_tabContent.ActualHeight());
-            const winrt::Windows::Foundation::Size availableSpace{ contentWidth, contentHeight };
+            const auto canSplit = focusedTab->CanSplitPane(splitType);

-            auto realSplitType = splitType;
-            if (realSplitType == SplitState::Automatic)
-            {
-                realSplitType = focusedTab->PreCalculateAutoSplit(availableSpace);
-            }
-
-            const auto canSplit = focusedTab->PreCalculateCanSplit(realSplitType, availableSpace);
-            if (!canSplit)
+            if (!canSplit && _startupState == StartupState::Initialized)
            {
                return;
            }

+            auto realSplitType = splitType;
+            if (realSplitType == SplitState::Automatic && _startupState < StartupState::Initialized)
+            {
+                float contentWidth = gsl::narrow_cast<float>(_tabContent.ActualWidth());
+                float contentHeight = gsl::narrow_cast<float>(_tabContent.ActualHeight());
+                realSplitType = focusedTab->PreCalculateAutoSplit({ contentWidth, contentHeight });
+            }
+
            TermControl newControl{ controlSettings, controlConnection };

            // Hookup our event handlers to the new terminal
@@ -1503,21 +1464,21 @@ namespace winrt::TerminalApp::implementation
    // Return Value:
    // - a string representation of the key modifiers for the shortcut
    //NOTE: This needs to be localized with https://github.com/microsoft/terminal/issues/794 if XAML framework issue not resolved before then
-    static std::wstring _FormatOverrideShortcutText(KeyModifiers modifiers)
+    static std::wstring _FormatOverrideShortcutText(Settings::KeyModifiers modifiers)
    {
        std::wstring buffer{ L"" };

-        if (WI_IsFlagSet(modifiers, KeyModifiers::Ctrl))
+        if (WI_IsFlagSet(modifiers, Settings::KeyModifiers::Ctrl))
        {
            buffer += L"Ctrl+";
        }

-        if (WI_IsFlagSet(modifiers, KeyModifiers::Shift))
+        if (WI_IsFlagSet(modifiers, Settings::KeyModifiers::Shift))
        {
            buffer += L"Shift+";
        }

-        if (WI_IsFlagSet(modifiers, KeyModifiers::Alt))
+        if (WI_IsFlagSet(modifiers, Settings::KeyModifiers::Alt))
        {
            buffer += L"Alt+";
        }
@@ -1531,7 +1492,7 @@ namespace winrt::TerminalApp::implementation
    // Arguments:
    // - MenuFlyoutItem that will be displayed, and a KeyChord to map an accelerator
    void TerminalPage::_SetAcceleratorForMenuItem(WUX::Controls::MenuFlyoutItem& menuItem,
-                                                  const KeyChord& keyChord)
+                                                  const winrt::Microsoft::Terminal::Settings::KeyChord& keyChord)
    {
 #ifdef DEP_MICROSOFT_UI_XAML_708_FIXED
        // work around https://github.com/microsoft/microsoft-ui-xaml/issues/708 in case of VK_OEM_COMMA
@@ -1590,7 +1551,7 @@ namespace winrt::TerminalApp::implementation
    // Arguments:
    // - copiedData: the new string content to place on the clipboard.
    winrt::fire_and_forget TerminalPage::_CopyToClipboardHandler(const IInspectable /*sender*/,
-                                                                 const CopyToClipboardEventArgs copiedData)
+                                                                 const winrt::Microsoft::Terminal::TerminalControl::CopyToClipboardEventArgs copiedData)
    {
        co_await winrt::resume_foreground(Dispatcher(), CoreDispatcherPriority::High);

@@ -1817,7 +1778,7 @@ namespace winrt::TerminalApp::implementation
                tab->SetFocused(true);

                // Raise an event that our title changed
-                _titleChangeHandlers(*this, tab->GetActiveTitle());
+                _titleChangeHandlers(*this, Title());

                // Raise an event that our titlebar color changed
                std::optional<Windows::UI::Color> color = tab->GetTabColor();
@@ -1969,13 +1930,9 @@ 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::deque<winrt::TerminalApp::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 = actions;
    }

    winrt::TerminalApp::IDialogPresenter TerminalPage::DialogPresenter() const
@@ -2235,49 +2192,6 @@ namespace winrt::TerminalApp::implementation
        // TODO GH#3327: Look at what to do with the NC area when we have XAML theming
    }

-    // Function Description:
-    // - This is a helper method to get the commandline out of a
-    //   ExecuteCommandline action, break it into subcommands, and attempt to
-    //   parse it into actions. This is used by _HandleExecuteCommandline for
-    //   processing commandlines in the current WT window.
-    // Arguments:
-    // - 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)
-    {
-        if (!args || args.Commandline().empty())
-        {
-            return {};
-        }
-        // Convert the commandline into an array of args with
-        // CommandLineToArgvW, similar to how the app typically does when
-        // called from the commandline.
-        int argc = 0;
-        wil::unique_any<LPWSTR*, decltype(&::LocalFree), ::LocalFree> argv{ CommandLineToArgvW(args.Commandline().c_str(), &argc) };
-        if (argv)
-        {
-            std::vector<winrt::hstring> args;
-
-            // Make sure the first argument is wt.exe, because ParseArgs will
-            // always skip the program name. The particular value of this first
-            // string doesn't terribly matter.
-            args.emplace_back(L"wt.exe");
-            for (auto& elem : wil::make_range(argv.get(), argc))
-            {
-                args.emplace_back(elem);
-            }
-            winrt::array_view<const winrt::hstring> argsView{ args };
-
-            ::TerminalApp::AppCommandlineArgs appArgs;
-            if (appArgs.ParseArgs(argsView) == 0)
-            {
-                return appArgs.GetStartupActions();
-            }
-        }
-        return {};
-    }
-
    void TerminalPage::_CommandPaletteClosed(const IInspectable& /*sender*/,
                                             const RoutedEventArgs& /*eventArgs*/)
    {
--- a/src/cascadia/TerminalApp/TerminalPage.h
+++ b/src/cascadia/TerminalApp/TerminalPage.h
@@ -56,8 +56,7 @@ 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::deque<winrt::TerminalApp::ActionAndArgs>& actions);

        winrt::TerminalApp::IDialogPresenter DialogPresenter() const;
        void DialogPresenter(winrt::TerminalApp::IDialogPresenter dialogPresenter);
@@ -107,8 +106,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);
+        std::deque<winrt::TerminalApp::ActionAndArgs> _startupActions;
+        winrt::fire_and_forget _ProcessStartupActions();

        void _ShowAboutDialog();
        void _ShowCloseWarningDialog();
@@ -118,8 +117,8 @@ namespace winrt::TerminalApp::implementation
        void _CreateNewTabFlyout();
        void _OpenNewTabDropdown();
        void _OpenNewTab(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs);
-        void _CreateNewTabFromSettings(GUID profileGuid, TerminalApp::TerminalSettings settings);
-        winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection _CreateConnectionFromSettings(GUID profileGuid, TerminalApp::TerminalSettings settings);
+        void _CreateNewTabFromSettings(GUID profileGuid, winrt::Microsoft::Terminal::Settings::TerminalSettings settings);
+        winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection _CreateConnectionFromSettings(GUID profileGuid, winrt::Microsoft::Terminal::Settings::TerminalSettings settings);

        void _SettingsButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
        void _FeedbackButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
@@ -160,7 +159,7 @@ namespace winrt::TerminalApp::implementation
        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 _ScrollPage(int delta);
-        void _SetAcceleratorForMenuItem(Windows::UI::Xaml::Controls::MenuFlyoutItem& menuItem, const winrt::Microsoft::Terminal::TerminalControl::KeyChord& keyChord);
+        void _SetAcceleratorForMenuItem(Windows::UI::Xaml::Controls::MenuFlyoutItem& menuItem, const winrt::Microsoft::Terminal::Settings::KeyChord& keyChord);

        winrt::fire_and_forget _CopyToClipboardHandler(const IInspectable sender, const winrt::Microsoft::Terminal::TerminalControl::CopyToClipboardEventArgs copiedData);
        winrt::fire_and_forget _PasteFromClipboardHandler(const IInspectable sender,
@@ -222,10 +221,7 @@ namespace winrt::TerminalApp::implementation
        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);
        // Make sure to hook new actions up in _RegisterActionCallbacks!
 #pragma endregion

--- a/src/cascadia/TerminalApp/TerminalSettingsSerializationHelpers.h
+++ b/src/cascadia/TerminalApp/TerminalSettingsSerializationHelpers.h
@@ -1,272 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
- TerminalSettingsSerializationHelpers.h
-
-Abstract:
- Specializations of the JsonUtils helpers for things that might end up in a
-  settings document.
-
--*/
-
-#pragma once
-
-#include "pch.h"
-
-#include "JsonUtils.h"
-#include "SettingsTypes.h"
-
-#include <winrt/Microsoft.Terminal.TerminalControl.h>
-#include <winrt/TerminalApp.h>
-
-JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::TerminalControl::CursorStyle)
-{
-    static constexpr std::array<pair_type, 5> mappings = {
-        pair_type{ "bar", ValueType::Bar },
-        pair_type{ "vintage", ValueType::Vintage },
-        pair_type{ "underscore", ValueType::Underscore },
-        pair_type{ "filledBox", ValueType::FilledBox },
-        pair_type{ "emptyBox", ValueType::EmptyBox }
-    };
-};
-
-JSON_ENUM_MAPPER(::winrt::Windows::UI::Xaml::Media::Stretch)
-{
-    static constexpr std::array<pair_type, 4> mappings = {
-        pair_type{ "uniformToFill", ValueType::UniformToFill },
-        pair_type{ "none", ValueType::None },
-        pair_type{ "fill", ValueType::Fill },
-        pair_type{ "uniform", ValueType::Uniform }
-    };
-};
-
-JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::TerminalControl::ScrollbarState)
-{
-    static constexpr std::array<pair_type, 2> mappings = {
-        pair_type{ "visible", ValueType::Visible },
-        pair_type{ "hidden", ValueType::Hidden }
-    };
-};
-
-JSON_ENUM_MAPPER(std::tuple<::winrt::Windows::UI::Xaml::HorizontalAlignment, ::winrt::Windows::UI::Xaml::VerticalAlignment>)
-{
-    // reduce repetition
-    using HA = ::winrt::Windows::UI::Xaml::HorizontalAlignment;
-    using VA = ::winrt::Windows::UI::Xaml::VerticalAlignment;
-    static constexpr std::array<pair_type, 9> mappings = {
-        pair_type{ "center", std::make_tuple(HA::Center, VA::Center) },
-        pair_type{ "topLeft", std::make_tuple(HA::Left, VA::Top) },
-        pair_type{ "bottomLeft", std::make_tuple(HA::Left, VA::Bottom) },
-        pair_type{ "left", std::make_tuple(HA::Left, VA::Center) },
-        pair_type{ "topRight", std::make_tuple(HA::Right, VA::Top) },
-        pair_type{ "bottomRight", std::make_tuple(HA::Right, VA::Bottom) },
-        pair_type{ "right", std::make_tuple(HA::Right, VA::Center) },
-        pair_type{ "top", std::make_tuple(HA::Center, VA::Top) },
-        pair_type{ "bottom", std::make_tuple(HA::Center, VA::Bottom) }
-    };
-};
-
-JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::TerminalControl::TextAntialiasingMode)
-{
-    static constexpr std::array<pair_type, 3> mappings = {
-        pair_type{ "grayscale", ValueType::Grayscale },
-        pair_type{ "cleartype", ValueType::Cleartype },
-        pair_type{ "aliased", ValueType::Aliased }
-    };
-};
-
-// Type Description:
-// - Helper for converting a user-specified closeOnExit value to its corresponding enum
-JSON_ENUM_MAPPER(::TerminalApp::CloseOnExitMode)
-{
-    JSON_MAPPINGS(3) = {
-        pair_type{ "always", ValueType::Always },
-        pair_type{ "graceful", ValueType::Graceful },
-        pair_type{ "never", ValueType::Never },
-    };
-
-    // Override mapping parser to add boolean parsing
-    CloseOnExitMode FromJson(const Json::Value& json)
-    {
-        if (json.isBool())
-        {
-            return json.asBool() ? ValueType::Graceful : ValueType::Never;
-        }
-        return EnumMapper::FromJson(json);
-    }
-
-    bool CanConvert(const Json::Value& json)
-    {
-        return EnumMapper::CanConvert(json) || json.isBool();
-    }
-};
-
-// This specialization isn't using JSON_ENUM_MAPPER because we need to have a different
-// value type (unsinged int) and return type (FontWeight struct). JSON_ENUM_MAPPER
-// expects that the value type _is_ the return type.
-template<>
-struct ::TerminalApp::JsonUtils::ConversionTrait<::winrt::Windows::UI::Text::FontWeight> :
-    public ::TerminalApp::JsonUtils::EnumMapper<
-        unsigned int,
-        ::TerminalApp::JsonUtils::ConversionTrait<::winrt::Windows::UI::Text::FontWeight>>
-{
-    // The original parser used the font weight getters Bold(), Normal(), etc.
-    // They were both cumbersome and *not constant expressions*
-    JSON_MAPPINGS(11) = {
-        pair_type{ "thin", 100u },
-        pair_type{ "extra-light", 200u },
-        pair_type{ "light", 300u },
-        pair_type{ "semi-light", 350u },
-        pair_type{ "normal", 400u },
-        pair_type{ "medium", 500u },
-        pair_type{ "semi-bold", 600u },
-        pair_type{ "bold", 700u },
-        pair_type{ "extra-bold", 800u },
-        pair_type{ "black", 900u },
-        pair_type{ "extra-black", 950u },
-    };
-
-    // Override mapping parser to add boolean parsing
-    auto FromJson(const Json::Value& json)
-    {
-        unsigned int value{ 400 };
-        if (json.isUInt())
-        {
-            value = json.asUInt();
-        }
-        else
-        {
-            value = BaseEnumMapper::FromJson(json);
-        }
-
-        ::winrt::Windows::UI::Text::FontWeight weight{
-            static_cast<uint16_t>(std::clamp(value, 100u, 990u))
-        };
-        return weight;
-    }
-
-    bool CanConvert(const Json::Value& json)
-    {
-        return BaseEnumMapper::CanConvert(json) || json.isUInt();
-    }
-};
-
-JSON_ENUM_MAPPER(::winrt::Windows::UI::Xaml::ElementTheme)
-{
-    JSON_MAPPINGS(3) = {
-        pair_type{ "system", ValueType::Default },
-        pair_type{ "light", ValueType::Light },
-        pair_type{ "dark", ValueType::Dark },
-    };
-};
-
-JSON_ENUM_MAPPER(::winrt::TerminalApp::LaunchMode)
-{
-    JSON_MAPPINGS(3) = {
-        pair_type{ "default", ValueType::DefaultMode },
-        pair_type{ "maximized", ValueType::MaximizedMode },
-        pair_type{ "fullscreen", ValueType::FullscreenMode },
-    };
-};
-
-JSON_ENUM_MAPPER(::winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode)
-{
-    JSON_MAPPINGS(3) = {
-        pair_type{ "equal", ValueType::Equal },
-        pair_type{ "titleLength", ValueType::SizeToContent },
-        pair_type{ "compact", ValueType::Compact },
-    };
-};
-
-// Type Description:
-// - Helper for converting the initial position string into
-//   2 coordinate values. We allow users to only provide one coordinate,
-//   thus, we use comma as the separator:
-//   (100, 100): standard input string
-//   (, 100), (100, ): if a value is missing, we set this value as a default
-//   (,): both x and y are set to default
-//   (abc, 100): if a value is not valid, we treat it as default
-//   (100, 100, 100): we only read the first two values, this is equivalent to (100, 100)
-template<>
-struct ::TerminalApp::JsonUtils::ConversionTrait<::TerminalApp::LaunchPosition>
-{
-    ::TerminalApp::LaunchPosition FromJson(const Json::Value& json)
-    {
-        ::TerminalApp::LaunchPosition ret;
-        std::string initialPosition{ json.asString() };
-        static constexpr char singleCharDelim = ',';
-        std::stringstream tokenStream(initialPosition);
-        std::string token;
-        uint8_t initialPosIndex = 0;
-
-        // Get initial position values till we run out of delimiter separated values in the stream
-        // or we hit max number of allowable values (= 2)
-        // Non-numeral values or empty string will be caught as exception and we do not assign them
-        for (; std::getline(tokenStream, token, singleCharDelim) && (initialPosIndex < 2); initialPosIndex++)
-        {
-            try
-            {
-                int32_t position = std::stoi(token);
-                if (initialPosIndex == 0)
-                {
-                    ret.x.emplace(position);
-                }
-
-                if (initialPosIndex == 1)
-                {
-                    ret.y.emplace(position);
-                }
-            }
-            catch (...)
-            {
-                // Do nothing
-            }
-        }
-        return ret;
-    }
-
-    bool CanConvert(const Json::Value& json)
-    {
-        return json.isString();
-    }
-};
-
-// Possible Direction values
-JSON_ENUM_MAPPER(::winrt::TerminalApp::Direction)
-{
-    JSON_MAPPINGS(4) = {
-        pair_type{ "left", ValueType::Left },
-        pair_type{ "right", ValueType::Right },
-        pair_type{ "up", ValueType::Up },
-        pair_type{ "down", ValueType::Down },
-    };
-};
-
-// Possible SplitState values
-JSON_ENUM_MAPPER(::winrt::TerminalApp::SplitState)
-{
-    JSON_MAPPINGS(3) = {
-        pair_type{ "vertical", ValueType::Vertical },
-        pair_type{ "horizontal", ValueType::Horizontal },
-        pair_type{ "auto", ValueType::Automatic },
-    };
-};
-
-// Possible SplitType values
-JSON_ENUM_MAPPER(::winrt::TerminalApp::SplitType)
-{
-    JSON_MAPPINGS(1) = {
-        pair_type{ "duplicate", ValueType::Duplicate },
-    };
-};
-
-JSON_ENUM_MAPPER(::winrt::TerminalApp::SettingsTarget)
-{
-    JSON_MAPPINGS(3) = {
-        pair_type{ "settingsFile", ValueType::SettingsFile },
-        pair_type{ "defaultsFile", ValueType::DefaultsFile },
-        pair_type{ "allFiles", ValueType::AllFiles },
-    };
-};
--- a/src/cascadia/TerminalApp/Utils.cpp
+++ b/src/cascadia/TerminalApp/Utils.cpp
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "Utils.h"
+
+// Method Description:
+// - Constructs a wstring from a given Json::Value object. Reads the object as
+//   a std::string using asString, then builds an hstring from that std::string,
+//   then converts that hstring into a std::wstring.
+// Arguments:
+// - json: the Json::Value to parse as a string
+// Return Value:
+// - the wstring equivalent of the value in json
+std::wstring GetWstringFromJson(const Json::Value& json)
+{
+    return winrt::to_hstring(json.asString()).c_str();
+}
--- a/src/cascadia/TerminalApp/Utils.h
+++ b/src/cascadia/TerminalApp/Utils.h
@@ -13,6 +13,8 @@ Author(s):
 --*/
 #pragma once

+std::wstring GetWstringFromJson(const Json::Value& json);
+
 // 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
--- a/src/cascadia/TerminalApp/defaults.json
+++ b/src/cascadia/TerminalApp/defaults.json
@@ -187,7 +187,7 @@
            "foreground": "#839496",
            "background": "#002B36",
            "cursorColor": "#FFFFFF",
-            "black": "#002B36",
+            "black": "#073642",
            "red": "#DC322F",
            "green": "#859900",
            "yellow": "#B58900",
@@ -195,7 +195,7 @@
            "purple": "#D33682",
            "cyan": "#2AA198",
            "white": "#EEE8D5",
-            "brightBlack": "#073642",
+            "brightBlack": "#002B36",
            "brightRed": "#CB4B16",
            "brightGreen": "#586E75",
            "brightYellow": "#657B83",
@@ -209,7 +209,7 @@
            "foreground": "#657B83",
            "background": "#FDF6E3",
            "cursorColor": "#002B36",
-            "black": "#002B36",
+            "black": "#073642",
            "red": "#DC322F",
            "green": "#859900",
            "yellow": "#B58900",
@@ -217,7 +217,7 @@
            "purple": "#D33682",
            "cyan": "#2AA198",
            "white": "#EEE8D5",
-            "brightBlack": "#073642",
+            "brightBlack": "#002B36",
            "brightRed": "#CB4B16",
            "brightGreen": "#586E75",
            "brightYellow": "#657B83",
--- a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj
+++ b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj
@@ -109,7 +109,6 @@
    <ClInclude Include="../JsonUtils.h" />
    <ClInclude Include="../Utils.h" />
    <ClInclude Include="../DefaultProfileUtils.h" />
-    <ClInclude Include="../TerminalSettingsSerializationHelpers.h" />
    <ClInclude Include="../TerminalWarnings.h" />
    <ClInclude Include="../IDynamicProfileGenerator.h" />
    <ClInclude Include="../PowershellCoreProfileGenerator.h" />
@@ -117,9 +116,6 @@
    <ClInclude Include="../AzureCloudShellGenerator.h" />
    <ClInclude Include="../TelnetGenerator.h" />
    <ClInclude Include="../ColorHelper.h" />
-    <ClInclude Include="../TerminalSettings.h">
-      <DependentUpon>../TerminalSettings.idl</DependentUpon>
-    </ClInclude>
    <ClInclude Include="pch.h" />
    <ClInclude Include="../ShortcutActionDispatch.h">
      <DependentUpon>../ShortcutActionDispatch.idl</DependentUpon>
@@ -182,6 +178,8 @@
    <ClCompile Include="../CascadiaSettingsSerialization.cpp" />
    <ClCompile Include="../AppKeyBindingsSerialization.cpp" />
    <ClCompile Include="../KeyChordSerialization.cpp" />
+    <ClCompile Include="../JsonUtils.cpp" />
+    <ClCompile Include="../Utils.cpp" />
    <ClCompile Include="../DefaultProfileUtils.cpp" />
    <ClCompile Include="../PowershellCoreProfileGenerator.cpp" />
    <ClCompile Include="../WslDistroGenerator.cpp" />
@@ -189,9 +187,6 @@
    <ClCompile Include="../Pane.LayoutSizeNode.cpp" />
    <ClCompile Include="../ColorHelper.cpp" />
    <ClCompile Include="../DebugTapConnection.cpp" />
-    <ClCompile Include="../TerminalSettings.cpp">
-      <DependentUpon>../TerminalSettings.idl</DependentUpon>
-    </ClCompile>
    <ClCompile Include="pch.cpp">
      <PrecompiledHeader>Create</PrecompiledHeader>
    </ClCompile>
@@ -262,7 +257,6 @@
    <Midl Include="../Command.idl" />
    <Midl Include="../CommandKeyChordVisibilityConverter.idl" />
    <Midl Include="../Tab.idl" />
-    <Midl Include="../TerminalSettings.idl" />
  </ItemGroup>
  <!-- ========================= Misc Files ======================== -->
  <ItemGroup>
@@ -302,6 +296,12 @@
    private=false and CopyLocalSatelliteAssemblies=false, so that we don't
    propagate them upwards (which can make referencing this project result in
    duplicate type definitions)-->
+    <Reference Include="Microsoft.Terminal.Settings">
+      <HintPath>$(_BinRoot)TerminalSettings\Microsoft.Terminal.Settings.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
    <Reference Include="Microsoft.Terminal.TerminalConnection">
      <HintPath>$(_BinRoot)TerminalConnection\Microsoft.Terminal.TerminalConnection.winmd</HintPath>
      <IsWinMDFile>true</IsWinMDFile>
--- a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj.filters
+++ b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj.filters
@@ -8,6 +8,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="../init.cpp" />
+    <ClCompile Include="../Utils.cpp" />
    <ClCompile Include="pch.cpp" />
    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
    <ClCompile Include="../AzureCloudShellGenerator.cpp">
@@ -49,6 +50,9 @@
    <ClCompile Include="$(OpenConsoleDir)\dep\jsoncpp\jsoncpp.cpp">
      <Filter>json</Filter>
    </ClCompile>
+    <ClCompile Include="../JsonUtils.cpp">
+      <Filter>json</Filter>
+    </ClCompile>
    <ClCompile Include="../Tab.cpp">
      <Filter>tab</Filter>
    </ClCompile>
@@ -59,7 +63,7 @@
    <ClCompile Include="../Commandline.cpp" />
    <ClCompile Include="../ColorHelper.cpp" />
    <ClCompile Include="../DebugTapConnection.cpp" />
-    <ClCompile Include="../TerminalSettings.cpp">
+    <ClCompile Include="../CommandSerialization.cpp">
      <Filter>settings</Filter>
    </ClCompile>
  </ItemGroup>
@@ -88,9 +92,6 @@
    <ClInclude Include="../GlobalAppSettings.h">
      <Filter>settings</Filter>
    </ClInclude>
-    <ClInclude Include="../TerminalSettingsSerializationHelpers.h">
-      <Filter>settings</Filter>
-    </ClInclude>
    <ClInclude Include="../KeyChordSerialization.h">
      <Filter>settings</Filter>
    </ClInclude>
@@ -119,7 +120,7 @@
    <ClInclude Include="../TelnetGenerator.h">
      <Filter>profileGeneration</Filter>
    </ClInclude>
-    <ClInclude Include="../TerminalSettings.h">
+    <ClInclude Include="../CommandSerialization.h">
      <Filter>settings</Filter>
    </ClInclude>
  </ItemGroup>
@@ -139,14 +140,10 @@
    <Midl Include="../Tab.idl">
      <Filter>tab</Filter>
    </Midl>
+    <Midl Include="../IF7Listener.idl" />
    <Midl Include="../Command.idl">
      <Filter>commandPalette</Filter>
    </Midl>
-    <Midl Include="../IDirectKeyListener.idl" />
-    <Midl Include="../CommandKeyChordVisibilityConverter.idl" />
-    <Midl Include="../TerminalSettings.idl">
-      <Filter>settings</Filter>
-    </Midl>
  </ItemGroup>
  <ItemGroup>
    <None Include="../packages.config" />
--- a/src/cascadia/TerminalApp/lib/pch.h
+++ b/src/cascadia/TerminalApp/lib/pch.h
@@ -29,7 +29,6 @@
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.Foundation.Metadata.h>
-#include <winrt/Windows.Graphics.Display.h>
 #include <winrt/windows.ui.core.h>
 #include <winrt/Windows.ui.input.h>
 #include <winrt/Windows.UI.Text.h>
--- a/src/cascadia/TerminalControl/IControlSettings.idl
+++ b/src/cascadia/TerminalControl/IControlSettings.idl
@@ -1,61 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import "IKeyBindings.idl";
-
-namespace Microsoft.Terminal.TerminalControl
-{
-    enum ScrollbarState
-    {
-        Visible = 0,
-        Hidden
-    };
-
-    enum TextAntialiasingMode
-    {
-        Grayscale = 0,
-        Cleartype,
-        Aliased
-    };
-
-    // Class Description:
-    // TerminalSettings encapsulates all settings that control the
-    //      TermControl's behavior. In these settings there is both the entirety
-    //      of the Core ITerminalSettings interface, and any additional settings
-    //      for specifically the control.
-    interface IControlSettings requires ICoreSettings
-    {
-        String ProfileName { get; };
-
-        Boolean UseAcrylic { get; };
-        Double TintOpacity { get; };
-        ScrollbarState ScrollState { get; };
-
-        String FontFace { get; };
-        Int32 FontSize { get; };
-        Windows.UI.Text.FontWeight FontWeight { get; };
-        String Padding { get; };
-
-        Microsoft.Terminal.TerminalControl.IKeyBindings KeyBindings { get; };
-
-        Boolean CopyOnSelect { get; };
-
-        String Commandline { get; };
-        String StartingDirectory { get; };
-        String EnvironmentVariables { get; };
-
-        String BackgroundImage { get; };
-        Double BackgroundImageOpacity { get; };
-        Windows.UI.Xaml.Media.Stretch BackgroundImageStretchMode { get; };
-        Windows.UI.Xaml.HorizontalAlignment BackgroundImageHorizontalAlignment { get; };
-        Windows.UI.Xaml.VerticalAlignment BackgroundImageVerticalAlignment { get; };
-
-        UInt32 SelectionBackground { get; };
-
-        TextAntialiasingMode AntialiasingMode { get; };
-
-        Boolean RetroTerminalEffect { get; };
-        Boolean ForceFullRepaintRendering { get; };
-        Boolean SoftwareRendering { get; };
-    };
-}
--- a/src/cascadia/TerminalControl/TSFInputControl.cpp
+++ b/src/cascadia/TerminalControl/TSFInputControl.cpp
@@ -31,14 +31,14 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
        InitializeComponent();

        // Create a CoreTextEditingContext for since we are acting like a custom edit control
-        auto manager = CoreTextServicesManager::GetForCurrentView();
+        auto manager = Core::CoreTextServicesManager::GetForCurrentView();
        _editContext = manager.CreateEditContext();

        // InputPane is manually shown inside of TermControl.
-        _editContext.InputPaneDisplayPolicy(CoreTextInputPaneDisplayPolicy::Manual);
+        _editContext.InputPaneDisplayPolicy(Core::CoreTextInputPaneDisplayPolicy::Manual);

        // set the input scope to Text because this control is for any text.
-        _editContext.InputScope(CoreTextInputScope::Text);
+        _editContext.InputScope(Core::CoreTextInputScope::Text);

        _textRequestedRevoker = _editContext.TextRequested(winrt::auto_revoke, { this, &TSFInputControl::_textRequestedHandler });

--- a/src/cascadia/TerminalControl/TermControl.cpp
+++ b/src/cascadia/TerminalControl/TermControl.cpp
@@ -17,7 +17,6 @@

 using namespace ::Microsoft::Console::Types;
 using namespace ::Microsoft::Terminal::Core;
-using namespace winrt::Windows::Graphics::Display;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Xaml::Input;
 using namespace winrt::Windows::UI::Xaml::Automation::Peers;
@@ -25,6 +24,7 @@ using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::UI::ViewManagement;
 using namespace winrt::Windows::UI::Input;
 using namespace winrt::Windows::System;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace winrt::Windows::ApplicationModel::DataTransfer;

 // The minimum delay between updates to the scroll bar's values.
@@ -55,7 +55,12 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
        return initialized;
    }

-    TermControl::TermControl(IControlSettings settings, TerminalConnection::ITerminalConnection connection) :
+    TermControl::TermControl() :
+        TermControl(Settings::TerminalSettings{}, TerminalConnection::ITerminalConnection{ nullptr })
+    {
+    }
+
+    TermControl::TermControl(Settings::IControlSettings settings, TerminalConnection::ITerminalConnection connection) :
        _connection{ connection },
        _initializedTerminal{ false },
        _settings{ settings },
@@ -236,7 +241,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
    // - newSettings: New settings values for the profile in this terminal.
    // Return Value:
    // - <none>
-    winrt::fire_and_forget TermControl::UpdateSettings(IControlSettings newSettings)
+    winrt::fire_and_forget TermControl::UpdateSettings(Settings::IControlSettings newSettings)
    {
        _settings = newSettings;
        auto weakThis{ get_weak() };
@@ -549,21 +554,21 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
        // This event is only registered during terminal initialization,
        // so we don't need to check _initializedTerminal.
        // We also don't lock for things that come back from the renderer.
-        auto chain = _renderEngine->GetSwapChain();
+        auto chainHandle = _renderEngine->GetSwapChainHandle();
        auto weakThis{ get_weak() };

        co_await winrt::resume_foreground(Dispatcher());

        if (auto control{ weakThis.get() })
        {
-            _AttachDxgiSwapChainToXaml(chain.Get());
+            _AttachDxgiSwapChainToXaml(chainHandle);
        }
    }

-    void TermControl::_AttachDxgiSwapChainToXaml(IDXGISwapChain1* swapChain)
+    void TermControl::_AttachDxgiSwapChainToXaml(HANDLE swapChainHandle)
    {
-        auto nativePanel = SwapChainPanel().as<ISwapChainPanelNative>();
-        nativePanel->SetSwapChain(swapChain);
+        auto nativePanel = SwapChainPanel().as<ISwapChainPanelNative2>();
+        nativePanel->SetSwapChainHandle(swapChainHandle);
    }

    bool TermControl::_InitializeTerminal()
@@ -623,7 +628,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
            // Then, using the font, get the number of characters that can fit.
            // Resize our terminal connection to match that size, and initialize the terminal with that size.
            const auto viewInPixels = Viewport::FromDimensions({ 0, 0 }, windowSize);
-            LOG_IF_FAILED(dxEngine->SetWindowSize({ viewInPixels.Width(), viewInPixels.Height() }));
+            THROW_IF_FAILED(dxEngine->SetWindowSize({ viewInPixels.Width(), viewInPixels.Height() }));

            // Update DxEngine's SelectionBackground
            dxEngine->SetSelectionBackground(_settings.SelectionBackground());
@@ -667,7 +672,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
            THROW_IF_FAILED(dxEngine->Enable());
            _renderEngine = std::move(dxEngine);

-            _AttachDxgiSwapChainToXaml(_renderEngine->GetSwapChain().Get());
+            _AttachDxgiSwapChainToXaml(_renderEngine->GetSwapChainHandle());

            // Tell the DX Engine to notify us when the swap chain changes.
            // We do this after we initially set the swapchain so as to avoid unnecessary callbacks (and locking problems)
@@ -732,11 +737,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation

        const auto ch = e.Character();
        const auto scanCode = gsl::narrow_cast<WORD>(e.KeyStatus().ScanCode);
-        auto modifiers = _GetPressedModifierKeys();
-        if (e.KeyStatus().IsExtendedKey)
-        {
-            modifiers |= ControlKeyStates::EnhancedKey;
-        }
+        const auto modifiers = _GetPressedModifierKeys();
        const bool handled = _terminal->SendCharEvent(ch, scanCode, modifiers);
        e.Handled(handled);
    }
@@ -825,13 +826,9 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
            return;
        }

-        auto modifiers = _GetPressedModifierKeys();
+        const auto modifiers = _GetPressedModifierKeys();
        const auto vkey = gsl::narrow_cast<WORD>(e.OriginalKey());
        const auto scanCode = gsl::narrow_cast<WORD>(e.KeyStatus().ScanCode);
-        if (e.KeyStatus().IsExtendedKey)
-        {
-            modifiers |= ControlKeyStates::EnhancedKey;
-        }

        // Alt-Numpad# input will send us a character once the user releases
        // Alt, so we should be ignoring the individual keydowns. The character
@@ -2277,65 +2274,28 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
    //   as font size, scrollbar and other control scaling, etc. Make sure the
    //   caller knows what monitor the control is about to appear on.
    // Return Value:
-    // - a size containing the requested dimensions in pixels.
-    winrt::Windows::Foundation::Size TermControl::GetProposedDimensions(IControlSettings const& settings, const uint32_t dpi)
+    // - a point containing the requested dimensions in pixels.
+    winrt::Windows::Foundation::Point TermControl::GetProposedDimensions(IControlSettings const& settings, const uint32_t dpi)
    {
-        // If the settings have negative or zero row or column counts, ignore those counts.
-        // (The lower TerminalCore layer also has upper bounds as well, but at this layer
-        //  we may eventually impose different ones depending on how many pixels we can address.)
-        const auto cols = ::base::saturated_cast<float>(std::max(settings.InitialCols(), 1));
-        const auto rows = ::base::saturated_cast<float>(std::max(settings.InitialRows(), 1));
-
-        const winrt::Windows::Foundation::Size initialSize{ cols, rows };
-
-        return GetProposedDimensions(initialSize,
-                                     settings.FontSize(),
-                                     settings.FontWeight(),
-                                     settings.FontFace(),
-                                     settings.ScrollState(),
-                                     settings.Padding(),
-                                     dpi);
-    }
-
-    // Function Description:
-    // - Determines how much space (in pixels) an app would need to reserve to
-    //   create a control with the settings stored in the settings param. This
-    //   accounts for things like the font size and face, the initialRows and
-    //   initialCols, and scrollbar visibility. The returned sized is based upon
-    //   the provided DPI value
-    // Arguments:
-    // - initialSizeInChars: The size to get the proposed dimensions for.
-    // - fontHeight: The font height to use to calculate the proposed size for.
-    // - fontWeight: The font weight to use to calculate the proposed size for.
-    // - fontFace: The font name to use to calculate the proposed size for.
-    // - scrollState: The ScrollbarState to use to calculate the proposed size for.
-    // - padding: The padding to use to calculate the proposed size for.
-    // - dpi: The DPI we should create the terminal at. This affects things such
-    //   as font size, scrollbar and other control scaling, etc. Make sure the
-    //   caller knows what monitor the control is about to appear on.
-    // Return Value:
-    // - a size containing the requested dimensions in pixels.
-    winrt::Windows::Foundation::Size TermControl::GetProposedDimensions(const winrt::Windows::Foundation::Size& initialSizeInChars,
-                                                                        const int32_t& fontHeight,
-                                                                        const winrt::Windows::UI::Text::FontWeight& fontWeight,
-                                                                        const winrt::hstring& fontFace,
-                                                                        const ScrollbarState& scrollState,
-                                                                        const winrt::hstring& padding,
-                                                                        const uint32_t dpi)
-    {
-        const auto cols = ::base::saturated_cast<int>(initialSizeInChars.Width);
-        const auto rows = ::base::saturated_cast<int>(initialSizeInChars.Height);
-
        // Initialize our font information.
+        const auto fontFace = settings.FontFace();
+        const short fontHeight = gsl::narrow_cast<short>(settings.FontSize());
+        const auto fontWeight = settings.FontWeight();
        // The font width doesn't terribly matter, we'll only be using the
        //      height to look it up
        // The other params here also largely don't matter.
        //      The family is only used to determine if the font is truetype or
        //      not, but DX doesn't use that info at all.
        //      The Codepage is additionally not actually used by the DX engine at all.
-        FontInfo actualFont = { fontFace, 0, fontWeight.Weight, { 0, gsl::narrow_cast<short>(fontHeight) }, CP_UTF8, false };
+        FontInfo actualFont = { fontFace, 0, fontWeight.Weight, { 0, fontHeight }, CP_UTF8, false };
        FontInfoDesired desiredFont = { actualFont };

+        // If the settings have negative or zero row or column counts, ignore those counts.
+        // (The lower TerminalCore layer also has upper bounds as well, but at this layer
+        //  we may eventually impose different ones depending on how many pixels we can address.)
+        const auto cols = std::max(settings.InitialCols(), 1);
+        const auto rows = std::max(settings.InitialRows(), 1);
+
        // Create a DX engine and initialize it with our font and DPI. We'll
        // then use it to measure how much space the requested rows and columns
        // will take up.
@@ -2355,13 +2315,13 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
        double width = cols * fontSize.X;

        // Reserve additional space if scrollbar is intended to be visible
-        if (scrollState == ScrollbarState::Visible)
+        if (settings.ScrollState() == ScrollbarState::Visible)
        {
            width += scrollbarSize;
        }

        double height = rows * fontSize.Y;
-        auto thickness = _ParseThicknessFromPadding(padding);
+        auto thickness = _ParseThicknessFromPadding(settings.Padding());
        // GH#2061 - make sure to account for the size the padding _will be_ scaled to
        width += scale * (thickness.Left + thickness.Right);
        height += scale * (thickness.Top + thickness.Bottom);
@@ -2394,41 +2354,21 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
    //   have a visible character.
    winrt::Windows::Foundation::Size TermControl::MinimumSize()
    {
-        if (_initializedTerminal)
+        const auto fontSize = _actualFont.GetSize();
+        double width = fontSize.X;
+        double height = fontSize.Y;
+        // Reserve additional space if scrollbar is intended to be visible
+        if (_settings.ScrollState() == ScrollbarState::Visible)
        {
-            const auto fontSize = _actualFont.GetSize();
-            double width = fontSize.X;
-            double height = fontSize.Y;
-            // Reserve additional space if scrollbar is intended to be visible
-            if (_settings.ScrollState() == ScrollbarState::Visible)
-            {
-                width += ScrollBar().ActualWidth();
-            }
-
-            // Account for the size of any padding
-            const auto padding = GetPadding();
-            width += padding.Left + padding.Right;
-            height += padding.Top + padding.Bottom;
-
-            return { gsl::narrow_cast<float>(width), gsl::narrow_cast<float>(height) };
-        }
-        else
-        {
-            // If the terminal hasn't been initialized yet, then the font size will
-            // have dimensions {1, fontSize.Y}, which can mess with consumers of
-            // this method. In that case, we'll need to pre-calculate the font
-            // width, before we actually have a renderer or swapchain.
-            const winrt::Windows::Foundation::Size minSize{ 1, 1 };
-            const double scaleFactor = DisplayInformation::GetForCurrentView().RawPixelsPerViewPixel();
-            const auto dpi = ::base::saturated_cast<uint32_t>(USER_DEFAULT_SCREEN_DPI * scaleFactor);
-            return GetProposedDimensions(minSize,
-                                         _settings.FontSize(),
-                                         _settings.FontWeight(),
-                                         _settings.FontFace(),
-                                         _settings.ScrollState(),
-                                         _settings.Padding(),
-                                         dpi);
+            width += ScrollBar().ActualWidth();
        }
+
+        // Account for the size of any padding
+        const auto padding = GetPadding();
+        width += padding.Left + padding.Right;
+        height += padding.Top + padding.Bottom;
+
+        return { gsl::narrow_cast<float>(width), gsl::narrow_cast<float>(height) };
    }

    // Method Description:
--- a/src/cascadia/TerminalControl/TermControl.h
+++ b/src/cascadia/TerminalControl/TermControl.h
@@ -7,6 +7,7 @@
 #include "CopyToClipboardEventArgs.g.h"
 #include "PasteFromClipboardEventArgs.g.h"
 #include <winrt/Microsoft.Terminal.TerminalConnection.h>
+#include <winrt/Microsoft.Terminal.Settings.h>
 #include "../../renderer/base/Renderer.hpp"
 #include "../../renderer/dx/DxRenderer.hpp"
 #include "../../renderer/uia/UiaRenderer.hpp"
@@ -55,9 +56,10 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation

    struct TermControl : TermControlT<TermControl>
    {
-        TermControl(IControlSettings settings, TerminalConnection::ITerminalConnection connection);
+        TermControl();
+        TermControl(Settings::IControlSettings settings, TerminalConnection::ITerminalConnection connection);

-        winrt::fire_and_forget UpdateSettings(IControlSettings newSettings);
+        winrt::fire_and_forget UpdateSettings(Settings::IControlSettings newSettings);

        hstring Title();
        hstring GetProfileName() const;
@@ -79,7 +81,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
        void ToggleRetroEffect();

        winrt::fire_and_forget RenderEngineSwapChainChanged();
-        void _AttachDxgiSwapChainToXaml(IDXGISwapChain1* swapChain);
+        void _AttachDxgiSwapChainToXaml(HANDLE swapChainHandle);
        winrt::fire_and_forget _RendererEnteredErrorState();
        void _RenderRetryButton_Click(IInspectable const& button, IInspectable const& args);

@@ -98,14 +100,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation

        TerminalConnection::ConnectionState ConnectionState() const;

-        static Windows::Foundation::Size GetProposedDimensions(IControlSettings const& settings, const uint32_t dpi);
-        static Windows::Foundation::Size GetProposedDimensions(const winrt::Windows::Foundation::Size& initialSizeInChars,
-                                                               const int32_t& fontSize,
-                                                               const winrt::Windows::UI::Text::FontWeight& fontWeight,
-                                                               const winrt::hstring& fontFace,
-                                                               const ScrollbarState& scrollState,
-                                                               const winrt::hstring& padding,
-                                                               const uint32_t dpi);
+        static Windows::Foundation::Point GetProposedDimensions(Microsoft::Terminal::Settings::IControlSettings const& settings, const uint32_t dpi);

        // clang-format off
        // -------------------------------- WinRT Events ---------------------------------
@@ -136,7 +131,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
        std::unique_ptr<::Microsoft::Console::Render::DxEngine> _renderEngine;
        std::unique_ptr<::Microsoft::Console::Render::UiaEngine> _uiaEngine;

-        IControlSettings _settings;
+        Settings::IControlSettings _settings;
        bool _focused;
        std::atomic<bool> _closing;

--- a/src/cascadia/TerminalControl/TermControl.idl
+++ b/src/cascadia/TerminalControl/TermControl.idl
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.

 import "IMouseWheelListener.idl";
-import "IControlSettings.idl";

 namespace Microsoft.Terminal.TerminalControl
 {
@@ -33,11 +32,12 @@ namespace Microsoft.Terminal.TerminalControl

    [default_interface] runtimeclass TermControl : Windows.UI.Xaml.Controls.UserControl, IDirectKeyListener, IMouseWheelListener
    {
-        TermControl(Microsoft.Terminal.TerminalControl.IControlSettings settings, Microsoft.Terminal.TerminalConnection.ITerminalConnection connection);
+        TermControl();
+        TermControl(Microsoft.Terminal.Settings.IControlSettings settings, Microsoft.Terminal.TerminalConnection.ITerminalConnection connection);

-        static Windows.Foundation.Size GetProposedDimensions(Microsoft.Terminal.TerminalControl.IControlSettings settings, UInt32 dpi);
+        static Windows.Foundation.Point GetProposedDimensions(Microsoft.Terminal.Settings.IControlSettings settings, UInt32 dpi);

-        void UpdateSettings(Microsoft.Terminal.TerminalControl.IControlSettings newSettings);
+        void UpdateSettings(Microsoft.Terminal.Settings.IControlSettings newSettings);

        event TitleChangedEventArgs TitleChanged;
        event FontSizeChangedEventArgs FontSizeChanged;
--- a/src/cascadia/TerminalControl/TerminalControl.vcxproj
+++ b/src/cascadia/TerminalControl/TerminalControl.vcxproj
@@ -19,6 +19,7 @@
         projects compile properly when they depend on this "Microsoft.winmd."
    -->
    <CppWinRTNamespaceMergeDepth>3</CppWinRTNamespaceMergeDepth>
+
    <!--
      DON'T REDIRECT OUR OUTPUT.
      Setting this will tell cppwinrt.build.post.props to copy our output from
@@ -27,13 +28,12 @@
    <NoOutputRedirection>true</NoOutputRedirection>
    <XamlComponentResourceLocation>nested</XamlComponentResourceLocation>
  </PropertyGroup>
+
  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
+
  <ItemGroup>
    <ClInclude Include="pch.h" />
-    <ClInclude Include="KeyChord.h">
-      <DependentUpon>KeyChord.idl</DependentUpon>
-    </ClInclude>
    <ClInclude Include="SearchBoxControl.h">
      <DependentUpon>SearchBoxControl.xaml</DependentUpon>
    </ClInclude>
@@ -54,9 +54,6 @@
      <PrecompiledHeader>Create</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="init.cpp" />
-    <ClCompile Include="KeyChord.cpp">
-      <DependentUpon>KeyChord.idl</DependentUpon>
-    </ClCompile>
    <ClCompile Include="SearchBoxControl.cpp">
      <DependentUpon>SearchBoxControl.xaml</DependentUpon>
    </ClCompile>
@@ -74,9 +71,6 @@
    <ClCompile Include="XamlUiaTextRange.cpp" />
  </ItemGroup>
  <ItemGroup>
-    <Midl Include="KeyChord.idl" />
-    <Midl Include="IKeyBindings.idl" />
-    <Midl Include="IControlSettings.idl" />
    <Midl Include="SearchBoxControl.idl">
      <DependentUpon>SearchBoxControl.xaml</DependentUpon>
    </Midl>
@@ -106,6 +100,10 @@
    <ProjectReference Include="..\..\renderer\uia\lib\uia.vcxproj" />
    <ProjectReference Include="..\..\terminal\parser\lib\parser.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\terminal\input\lib\terminalinput.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettings\TerminalSettings.vcxproj">
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </ProjectReference>
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalCore\lib\TerminalCore-lib.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj">
      <Private>false</Private>
@@ -127,7 +125,9 @@
      <SubType>Designer</SubType>
    </Page>
  </ItemGroup>
+
  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
+
  <ItemDefinitionGroup>
    <Link>
      <AdditionalDependencies>dwrite.lib;dxgi.lib;d2d1.lib;d3d11.lib;shcore.lib;winmm.lib;pathcch.lib;propsys.lib;uiautomationcore.lib;Shlwapi.lib;ntdll.lib;user32.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -136,41 +136,6 @@
      <AdditionalIncludeDirectories>$(OpenConsoleDir)src\cascadia\inc;$(OpenConsoleDir)src\types\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
-  <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />

-  <!--
-    We're linking a static library that has the same root namespace as us. Unfortunately,
-    if we allow a winmd that contains our namespace into the to-be-XamlCompiled reference list
-    the xaml compiler will become upset with us and fail to find any types defined in _this_
-    version of the namespace. Therefore, we have to strip them out.
-    Because ReferencePath is an important item group in MSBuild, we're going to make sure to
-    restore it the moment Xaml is done with it.
-    We have to use a static library with the _same_ namespace as ours because there's a weird
-    invariant somewhere in WinRT that every library project produce a single namespace. We're
-    going to let TerminalCore (static lib) contribute to our namespace, but when we do that
-    we get the xaml compiler complaining.
-  -->
-  <PropertyGroup>
-    <MarkupCompilePass1DependsOn>$(MarkupCompilePass1DependsOn);OpenConsoleStripDuplicateWinmdFromReferencesBeforePass1</MarkupCompilePass1DependsOn>
-    <MarkupCompilePass2DependsOn>$(MarkupCompilePass2DependsOn);OpenConsoleStripDuplicateWinmdFromReferencesBeforePass2</MarkupCompilePass2DependsOn>
-  </PropertyGroup>
-  <Target Name="OpenConsoleStripDuplicateWinmdFromReferencesBeforePass1">
-    <ItemGroup>
-      <!-- Back up the references we're about to delete -->
-      <OCReferencePathToRestore Include="@(ReferencePath)" Condition="'%(Filename)' == '$(RootNamespace)'"/>
-      <ReferencePath Remove="@(OCReferencePathToRestore)"/>
-    </ItemGroup>
-  </Target>
-  <Target Name="OpenConsoleRestoreDuplicateWinmdToReferences" AfterTargets="MarkupCompilePass2">
-    <ItemGroup>
-      <!-- Put them back. -->
-      <ReferencePath Include="@(OCReferencePathToRestore)"/>
-    </ItemGroup>
-  </Target>
-  <Target Name="OpenConsoleStripDuplicateWinmdFromReferencesBeforePass2">
-    <ItemGroup>
-      <!-- Nobody else uses this item group, it's safe to never restore. -->
-      <WinMDReferenceToCompile Remove="@(WinMDReferenceToCompile)" Condition="'%(Filename)' == '$(RootNamespace)'"/>
-    </ItemGroup>
-  </Target>
+  <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
 </Project>
--- a/src/cascadia/TerminalControl/TerminalControl.vcxproj.filters
+++ b/src/cascadia/TerminalControl/TerminalControl.vcxproj.filters
@@ -15,6 +15,8 @@
    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
    <ClCompile Include="TermControlAutomationPeer.cpp" />
    <ClCompile Include="XamlUiaTextRange.cpp" />
+    <ClCompile Include="TermControlUiaProvider.cpp" />
+    <ClCompile Include="UiaTextRange.cpp" />
    <ClCompile Include="SearchBoxControl.cpp" />
    <ClCompile Include="init.cpp" />
    <ClCompile Include="ThrottledFunc.cpp" />
@@ -24,15 +26,15 @@
    <ClInclude Include="TermControl.h" />
    <ClInclude Include="TermControlAutomationPeer.h" />
    <ClInclude Include="XamlUiaTextRange.h" />
+    <ClInclude Include="TermControlUiaProvider.hpp" />
    <ClInclude Include="ThrottledFunc.h" />
+    <ClInclude Include="UiaTextRange.hpp" />
  </ItemGroup>
  <ItemGroup>
    <Midl Include="TermControl.idl" />
    <Midl Include="TermControlAutomationPeer.idl" />
    <Midl Include="SearchBoxControl.idl" />
    <Midl Include="TSFInputControl.idl" />
-    <Midl Include="IMouseWheelListener.idl" />
-    <Midl Include="IControlSettings.idl" />
  </ItemGroup>
  <ItemGroup>
    <None Include="TerminalControl.def" />
@@ -40,8 +42,6 @@
  </ItemGroup>
  <ItemGroup>
    <Page Include="SearchBoxControl.xaml" />
-    <Page Include="TermControl.xaml" />
-    <Page Include="TSFInputControl.xaml" />
  </ItemGroup>
  <ItemGroup>
    <Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
@@ -51,4 +51,4 @@
      <Filter>Resources</Filter>
    </PRIResource>
  </ItemGroup>
-</Project>
+</Project>
--- a/src/cascadia/TerminalControl/ThrottledFunc.cpp
+++ b/src/cascadia/TerminalControl/ThrottledFunc.cpp
@@ -29,7 +29,7 @@ ThrottledFunc<>::ThrottledFunc(ThrottledFunc::Func func, TimeSpan delay, CoreDis
 // - <none>
 void ThrottledFunc<>::Run()
 {
-    if (_isRunPending.test_and_set(std::memory_order_acquire))
+    if (_isRunPending.test_and_set())
    {
        // already pending
        return;
@@ -44,7 +44,7 @@ void ThrottledFunc<>::Run()
                if (auto self{ weakThis.lock() })
                {
                    timer.Stop();
-                    self->_isRunPending.clear(std::memory_order_release);
+                    self->_isRunPending.clear();
                    self->_func();
                }
            });
--- a/src/cascadia/TerminalCore/ICoreSettings.idl
+++ b/src/cascadia/TerminalCore/ICoreSettings.idl
@@ -1,39 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.TerminalControl
-{
-    enum CursorStyle
-    {
-        Vintage,
-        Bar,
-        Underscore,
-        FilledBox,
-        EmptyBox
-    };
-
-    interface ICoreSettings
-    {
-        UInt32 DefaultForeground { get; };
-        UInt32 DefaultBackground { get; };
-        UInt32 GetColorTableEntry(Int32 index);
-        void SetColorTableEntry(Int32 index, UInt32 value);
-        // TODO:MSFT:20642297 - define a sentinel for Infinite Scrollback
-        Int32 HistorySize { get; };
-        Int32 InitialRows { get; };
-        Int32 InitialCols { get; };
-
-        Boolean SnapOnInput { get; };
-        Boolean AltGrAliasing { get; };
-
-        UInt32 CursorColor { get; };
-        CursorStyle CursorShape { get; };
-        UInt32 CursorHeight { get; };
-        String StartingTitle { get; };
-        Boolean SuppressApplicationTitle { get; };
-        String WordDelimiters { get; };
-
-        Boolean ForceVTInput { get; };
-    };
-
-}
--- a/src/cascadia/TerminalCore/ITerminalApi.hpp
+++ b/src/cascadia/TerminalCore/ITerminalApi.hpp
@@ -39,7 +39,6 @@ namespace Microsoft::Terminal::Core
        virtual bool SetColorTableEntry(const size_t tableIndex, const DWORD color) noexcept = 0;

        virtual bool SetCursorStyle(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle cursorStyle) noexcept = 0;
-        virtual bool SetCursorColor(const DWORD color) noexcept = 0;

        virtual bool SetDefaultForeground(const DWORD color) noexcept = 0;
        virtual bool SetDefaultBackground(const DWORD color) noexcept = 0;
--- a/src/cascadia/TerminalCore/Terminal.cpp
+++ b/src/cascadia/TerminalCore/Terminal.cpp
@@ -10,9 +10,9 @@
 #include "../../inc/argb.h"
 #include "../../types/inc/utils.hpp"

-#include <winrt/Microsoft.Terminal.TerminalControl.h>
+#include "winrt/Microsoft.Terminal.Settings.h"

-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace Microsoft::Terminal::Core;
 using namespace Microsoft::Console;
 using namespace Microsoft::Console::Render;
@@ -84,8 +84,8 @@ void Terminal::Create(COORD viewportSize, SHORT scrollbackLines, IRenderTarget&
 // Arguments:
 // - settings: the set of CoreSettings we need to use to initialize the terminal
 // - renderTarget: A render target the terminal can use for paint invalidation.
-void Terminal::CreateFromSettings(ICoreSettings settings,
-                                  IRenderTarget& renderTarget)
+void Terminal::CreateFromSettings(winrt::Microsoft::Terminal::Settings::ICoreSettings settings,
+                                  Microsoft::Console::Render::IRenderTarget& renderTarget)
 {
    const COORD viewportSize{ Utils::ClampToShortMax(settings.InitialCols(), 1),
                              Utils::ClampToShortMax(settings.InitialRows(), 1) };
@@ -101,7 +101,7 @@ void Terminal::CreateFromSettings(ICoreSettings settings,
 //   CoreSettings object.
 // Arguments:
 // - settings: an ICoreSettings with new settings values for us to use.
-void Terminal::UpdateSettings(ICoreSettings settings)
+void Terminal::UpdateSettings(winrt::Microsoft::Terminal::Settings::ICoreSettings settings)
 {
    _defaultFg = settings.DefaultForeground();
    _defaultBg = settings.DefaultBackground();
@@ -344,7 +344,7 @@ void Terminal::UpdateSettings(ICoreSettings settings)

    // If the old scrolloffset was 0, then we weren't scrolled back at all
    // before, and shouldn't be now either.
-    _scrollOffset = originalOffsetWasZero ? 0 : static_cast<int>(::base::ClampSub(_mutableViewport.Top(), newVisibleTop));
+    _scrollOffset = originalOffsetWasZero ? 0 : ::base::ClampSub(_mutableViewport.Top(), newVisibleTop);

    // GH#5029 - make sure to InvalidateAll here, so that we'll paint the entire visible viewport.
    try
@@ -430,19 +430,6 @@ bool Terminal::SendKeyEvent(const WORD vkey,

    _StoreKeyEvent(vkey, scanCode);

-    // 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 || scanCode == 0)
-    {
-        return false;
-    }
-
    const auto isAltOnlyPressed = states.IsAltPressed() && !states.IsCtrlPressed();
    const auto isSuppressedAltGrAlias = !_altGrAliasing && states.IsAltPressed() && states.IsCtrlPressed();

@@ -499,14 +486,14 @@ bool Terminal::SendKeyEvent(const WORD vkey,
 // - false if we did not translate the key, and it should be processed into a character.
 bool Terminal::SendMouseEvent(const COORD viewportPos, const unsigned int uiButton, const ControlKeyStates states, const short wheelDelta)
 {
-    // GH#6401: VT applications should be able to receive mouse events from outside the
-    // terminal buffer. This is likely to happen when the user drags the cursor offscreen.
-    // We shouldn't throw away perfectly good events when they're offscreen, so we just
-    // clamp them to be within the range [(0, 0), (W, H)].
-#pragma warning(suppress : 26496) // analysis can't tell we're assigning through a reference below
-    auto clampedPos{ viewportPos };
-    _mutableViewport.ToOrigin().Clamp(clampedPos);
-    return _terminalInput->HandleMouse(clampedPos, uiButton, GET_KEYSTATE_WPARAM(states.Value()), wheelDelta);
+    // viewportPos must be within the dimensions of the viewport
+    const auto viewportDimensions = _mutableViewport.Dimensions();
+    if (viewportPos.X < 0 || viewportPos.X >= viewportDimensions.X || viewportPos.Y < 0 || viewportPos.Y >= viewportDimensions.Y)
+    {
+        return false;
+    }
+
+    return _terminalInput->HandleMouse(viewportPos, uiButton, GET_KEYSTATE_WPARAM(states.Value()), wheelDelta);
 }

 // Method Description:
--- a/src/cascadia/TerminalCore/Terminal.hpp
+++ b/src/cascadia/TerminalCore/Terminal.hpp
@@ -19,7 +19,7 @@
 // You have to forward decl the ICoreSettings here, instead of including the header.
 // If you include the header, there will be compilation errors with other
 //      headers that include Terminal.hpp
-namespace winrt::Microsoft::Terminal::TerminalControl
+namespace winrt::Microsoft::Terminal::Settings
 {
    struct ICoreSettings;
 }
@@ -58,10 +58,10 @@ public:
                SHORT scrollbackLines,
                Microsoft::Console::Render::IRenderTarget& renderTarget);

-    void CreateFromSettings(winrt::Microsoft::Terminal::TerminalControl::ICoreSettings settings,
+    void CreateFromSettings(winrt::Microsoft::Terminal::Settings::ICoreSettings settings,
                            Microsoft::Console::Render::IRenderTarget& renderTarget);

-    void UpdateSettings(winrt::Microsoft::Terminal::TerminalControl::ICoreSettings settings);
+    void UpdateSettings(winrt::Microsoft::Terminal::Settings::ICoreSettings settings);

    // Write goes through the parser
    void Write(std::wstring_view stringView);
@@ -93,7 +93,6 @@ public:
    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;
-    bool SetCursorColor(const COLORREF color) noexcept override;
    bool SetDefaultForeground(const COLORREF color) noexcept override;
    bool SetDefaultBackground(const COLORREF color) noexcept override;

--- a/src/cascadia/TerminalCore/TerminalApi.cpp
+++ b/src/cascadia/TerminalCore/TerminalApi.cpp
@@ -64,14 +64,6 @@ COORD Terminal::GetCursorPosition() noexcept
    return newPos;
 }

-bool Terminal::SetCursorColor(const COLORREF color) noexcept
-try
-{
-    _buffer->GetCursor().SetColor(color);
-    return true;
-}
-CATCH_LOG_RETURN_FALSE()
-
 // Method Description:
 // - Moves the cursor down one line, and possibly also to the leftmost column.
 // Arguments:
--- a/src/cascadia/TerminalCore/TerminalDispatch.cpp
+++ b/src/cascadia/TerminalCore/TerminalDispatch.cpp
@@ -146,13 +146,6 @@ try
 }
 CATCH_LOG_RETURN_FALSE()

-bool TerminalDispatch::SetCursorColor(const DWORD color) noexcept
-try
-{
-    return _terminalApi.SetCursorColor(color);
-}
-CATCH_LOG_RETURN_FALSE()
-
 bool TerminalDispatch::SetClipboard(std::wstring_view content) noexcept
 try
 {
--- a/src/cascadia/TerminalCore/TerminalDispatch.hpp
+++ b/src/cascadia/TerminalCore/TerminalDispatch.hpp
@@ -35,7 +35,6 @@ public:

    bool SetColorTableEntry(const size_t tableIndex, const DWORD color) noexcept override;
    bool SetCursorStyle(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle cursorStyle) noexcept override;
-    bool SetCursorColor(const DWORD color) noexcept override;

    bool SetClipboard(std::wstring_view content) noexcept override;

--- a/src/cascadia/TerminalCore/TerminalDispatchGraphics.cpp
+++ b/src/cascadia/TerminalCore/TerminalDispatchGraphics.cpp
@@ -126,10 +126,10 @@ bool TerminalDispatch::SetGraphicsRendition(const gsl::span<const DispatchTypes:
            attr.SetFaint(false);
            break;
        case Italics:
-            attr.SetItalic(true);
+            attr.SetItalics(true);
            break;
        case NotItalics:
-            attr.SetItalic(false);
+            attr.SetItalics(false);
            break;
        case BlinkOrXterm256Index:
            attr.SetBlinking(true);
@@ -156,16 +156,16 @@ bool TerminalDispatch::SetGraphicsRendition(const gsl::span<const DispatchTypes:
            attr.SetReverseVideo(false);
            break;
        case Underline:
-            attr.SetUnderlined(true);
+            attr.SetUnderline(true);
            break;
        case NoUnderline:
-            attr.SetUnderlined(false);
+            attr.SetUnderline(false);
            break;
        case Overline:
-            attr.SetOverlined(true);
+            attr.SetOverline(true);
            break;
        case NoOverline:
-            attr.SetOverlined(false);
+            attr.SetOverline(false);
            break;
        case ForegroundBlack:
            attr.SetIndexedForeground(DARK_BLACK);
--- a/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj
+++ b/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj
@@ -7,22 +7,16 @@
    <TargetName>TerminalCore</TargetName>
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
-    <RootNamespace>Microsoft.Terminal.TerminalControl</RootNamespace>
-    <!--
-      DON'T REDIRECT OUR OUTPUT.
-      Setting this will tell cppwinrt.build.post.props to copy our output from
-      the default OutDir up one level, so the wapproj will be able to find it.
-     -->
-    <NoOutputRedirection>true</NoOutputRedirection>
+    <RootNamespace>Microsoft.Terminal.Core</RootNamespace>
  </PropertyGroup>

  <!-- Imported WinRT generated files must go up here to get excluded from Audit correctly. -->
  <PropertyGroup Condition="'$(Configuration)'=='AuditMode'">
-    <CAExcludePath>"$(SolutionDir)\src\cascadia\TerminalCore\Generated Files\winrt";$(SolutionDir)src\cascadia\TerminalCore;$(CAExcludePath)</CAExcludePath>
+    <CAExcludePath>"$(SolutionDir)\src\cascadia\TerminalSettings\Generated Files\winrt";$(SolutionDir)src\cascadia\TerminalSettings;$(CAExcludePath)</CAExcludePath>
  </PropertyGroup>
-
+    
  <Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
+  <Import Project="$(SolutionDir)src\common.build.pre.props" />

  <!-- DONT ADD NEW FILES HERE, ADD THEM TO terminalcore-common.vcxitems -->
  <Import Project="$(OpenConsoleDir)src\cascadia\TerminalCore\terminalcore-common.vcxitems" />
@@ -46,23 +40,20 @@
    </ProjectReference>
  </ItemGroup>

-  <ItemGroup>
-    <Midl Include="..\ICoreSettings.idl" />
-  </ItemGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
      <!-- WinRT_IncludePath is the SDK winrt path.
           cppwinrt is a sibling directory to it. This is needed for the
           #include <winrt/base>
-           from TerminalCore's header to be able to be found.
+           from TerminalSettings's header to be able to be found.
           Also manually include the generated header's path, because
           adding a project reference will confuse msbuild.
      -->
-      <AdditionalIncludeDirectories>$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)src\cascadia\TerminalCore\Generated Files";%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)src\cascadia\TerminalSettings\Generated Files";%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>

-  <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
-  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
+    <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
+  <Import Project="$(SolutionDir)src\common.build.post.props" />
 </Project>
--- a/src/cascadia/TerminalSettings/IControlSettings.idl
+++ b/src/cascadia/TerminalSettings/IControlSettings.idl
@@ -0,0 +1,62 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import "IKeyBindings.idl";
+import "ICoreSettings.idl";
+
+namespace Microsoft.Terminal.Settings
+{
+    enum ScrollbarState
+    {
+        Visible = 0,
+        Hidden
+    };
+
+    enum TextAntialiasingMode
+    {
+        Grayscale = 0,
+        Cleartype,
+        Aliased
+    };
+
+    // Class Description:
+    // TerminalSettings encapsulates all settings that control the
+    //      TermControl's behavior. In these settings there is both the entirety
+    //      of the Core ITerminalSettings interface, and any additional settings
+    //      for specifically the control.
+    interface IControlSettings requires Microsoft.Terminal.Settings.ICoreSettings
+    {
+        String ProfileName;
+
+        Boolean UseAcrylic;
+        Double TintOpacity;
+        ScrollbarState ScrollState;
+
+        String FontFace;
+        Int32 FontSize;
+        Windows.UI.Text.FontWeight FontWeight;
+        String Padding;
+
+        IKeyBindings KeyBindings;
+
+        Boolean CopyOnSelect;
+
+        String Commandline;
+        String StartingDirectory;
+        String EnvironmentVariables;
+
+        String BackgroundImage;
+        Double BackgroundImageOpacity;
+        Windows.UI.Xaml.Media.Stretch BackgroundImageStretchMode;
+        Windows.UI.Xaml.HorizontalAlignment BackgroundImageHorizontalAlignment;
+        Windows.UI.Xaml.VerticalAlignment BackgroundImageVerticalAlignment;
+
+        UInt32 SelectionBackground;
+
+        TextAntialiasingMode AntialiasingMode;
+
+        Boolean RetroTerminalEffect;
+        Boolean ForceFullRepaintRendering;
+        Boolean SoftwareRendering;
+    };
+}
--- a/src/cascadia/TerminalSettings/ICoreSettings.idl
+++ b/src/cascadia/TerminalSettings/ICoreSettings.idl
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace Microsoft.Terminal.Settings
+{
+    enum CursorStyle
+    {
+        Vintage,
+        Bar,
+        Underscore,
+        FilledBox,
+        EmptyBox
+    };
+
+    interface ICoreSettings
+    {
+        UInt32 DefaultForeground;
+        UInt32 DefaultBackground;
+        UInt32 GetColorTableEntry(Int32 index);
+        void SetColorTableEntry(Int32 index, UInt32 value);
+        // TODO:MSFT:20642297 - define a sentinel for Infinite Scrollback
+        Int32 HistorySize;
+        Int32 InitialRows;
+        Int32 InitialCols;
+
+        Boolean SnapOnInput;
+        Boolean AltGrAliasing;
+
+        UInt32 CursorColor;
+        CursorStyle CursorShape;
+        UInt32 CursorHeight;
+        String StartingTitle;
+        Boolean SuppressApplicationTitle;
+        String WordDelimiters;
+
+        Boolean ForceVTInput;
+    };
+
+}
--- a/src/cascadia/TerminalSettings/IKeyBindings.idl
+++ b/src/cascadia/TerminalSettings/IKeyBindings.idl
@@ -3,7 +3,7 @@

 import "KeyChord.idl";

-namespace Microsoft.Terminal.TerminalControl
+namespace Microsoft.Terminal.Settings
 {
    // [default_interface]
    interface IKeyBindings
--- a/src/cascadia/TerminalSettings/KeyChord.cpp
+++ b/src/cascadia/TerminalSettings/KeyChord.cpp
@@ -6,7 +6,7 @@

 #include "KeyChord.g.cpp"

-namespace winrt::Microsoft::Terminal::TerminalControl::implementation
+namespace winrt::Microsoft::Terminal::Settings::implementation
 {
    KeyChord::KeyChord() noexcept :
        _modifiers{ 0 },
@@ -15,25 +15,25 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
    }

    KeyChord::KeyChord(bool ctrl, bool alt, bool shift, int32_t vkey) noexcept :
-        _modifiers{ (ctrl ? TerminalControl::KeyModifiers::Ctrl : TerminalControl::KeyModifiers::None) |
-                    (alt ? TerminalControl::KeyModifiers::Alt : TerminalControl::KeyModifiers::None) |
-                    (shift ? TerminalControl::KeyModifiers::Shift : TerminalControl::KeyModifiers::None) },
+        _modifiers{ (ctrl ? Settings::KeyModifiers::Ctrl : Settings::KeyModifiers::None) |
+                    (alt ? Settings::KeyModifiers::Alt : Settings::KeyModifiers::None) |
+                    (shift ? Settings::KeyModifiers::Shift : Settings::KeyModifiers::None) },
        _vkey{ vkey }
    {
    }

-    KeyChord::KeyChord(TerminalControl::KeyModifiers const& modifiers, int32_t vkey) noexcept :
+    KeyChord::KeyChord(Settings::KeyModifiers const& modifiers, int32_t vkey) noexcept :
        _modifiers{ modifiers },
        _vkey{ vkey }
    {
    }

-    TerminalControl::KeyModifiers KeyChord::Modifiers() noexcept
+    Settings::KeyModifiers KeyChord::Modifiers() noexcept
    {
        return _modifiers;
    }

-    void KeyChord::Modifiers(TerminalControl::KeyModifiers const& value) noexcept
+    void KeyChord::Modifiers(Settings::KeyModifiers const& value) noexcept
    {
        _modifiers = value;
    }
--- a/src/cascadia/TerminalSettings/KeyChord.h
+++ b/src/cascadia/TerminalSettings/KeyChord.h
@@ -5,26 +5,26 @@

 #include "KeyChord.g.h"

-namespace winrt::Microsoft::Terminal::TerminalControl::implementation
+namespace winrt::Microsoft::Terminal::Settings::implementation
 {
    struct KeyChord : KeyChordT<KeyChord>
    {
        KeyChord() noexcept;
-        KeyChord(TerminalControl::KeyModifiers const& modifiers, int32_t vkey) noexcept;
+        KeyChord(Settings::KeyModifiers const& modifiers, int32_t vkey) noexcept;
        KeyChord(bool ctrl, bool alt, bool shift, int32_t vkey) noexcept;

-        TerminalControl::KeyModifiers Modifiers() noexcept;
-        void Modifiers(TerminalControl::KeyModifiers const& value) noexcept;
+        Settings::KeyModifiers Modifiers() noexcept;
+        void Modifiers(Settings::KeyModifiers const& value) noexcept;
        int32_t Vkey() noexcept;
        void Vkey(int32_t value) noexcept;

    private:
-        TerminalControl::KeyModifiers _modifiers;
+        Settings::KeyModifiers _modifiers;
        int32_t _vkey;
    };
 }

-namespace winrt::Microsoft::Terminal::TerminalControl::factory_implementation
+namespace winrt::Microsoft::Terminal::Settings::factory_implementation
 {
    struct KeyChord : KeyChordT<KeyChord, implementation::KeyChord>
    {
--- a/src/cascadia/TerminalSettings/KeyChord.idl
+++ b/src/cascadia/TerminalSettings/KeyChord.idl
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

-namespace Microsoft.Terminal.TerminalControl
+namespace Microsoft.Terminal.Settings
 {
    [flags]
    enum KeyModifiers
--- a/src/cascadia/TerminalSettings/TerminalSettings.cpp
+++ b/src/cascadia/TerminalSettings/TerminalSettings.cpp
@@ -6,7 +6,7 @@

 #include "TerminalSettings.g.cpp"

-namespace winrt::TerminalApp::implementation
+namespace winrt::Microsoft::Terminal::Settings::implementation
 {
    uint32_t TerminalSettings::GetColorTableEntry(int32_t index) const noexcept
    {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dustin L. Howett	b713f1eaf2	Migrate spelling-0.0.21 changes from main	2020-07-16 09:38:08 -07:00
Dustin L. Howett	ffb67bc5a2	Migrate spelling-0.0.19 changes from main	2020-07-16 09:38:08 -07:00
Michael Niksa	0639c13d60	Use DComp surface handle for Swap Chain management.	2020-07-16 09:38:08 -07:00