@j4james mentioned this in #3093 , but the Terminal still needs to implement cursor hiding, so this isn't really helpful by itself

Apply audit mode to TerminalConnection/Core/Settings and WinCon… (#4016 )
## Summary of the Pull Request - Enables auditing of some Terminal libraries (Connection, Core, Settings) - Also audit WinConPTY.LIB since Connection depends on it ## PR Checklist * [x] Rolls audit out to more things * [x] I work here * [x] Tests should still pass * [x] Am core contributor ## Detailed Description of the Pull Request / Additional comments This is turning on the auditing of these projects (as enabled by the heavier lifting in the other refactor) and then cleaning up the remaining warnings. ## Validation Steps Performed - [x] Built it - [x] Ran the tests
2026-04-06 14:19:45 +00:00 · 2020-01-06 08:01:45 -06:00 · 2020-01-03 10:44:27 -08:00 · 2020-01-03 14:25:21 +00:00 · 2020-01-02 17:52:17 +00:00 · 2020-01-01 02:51:08 +00:00
543 changed files with 15327 additions and 9396 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -261,6 +261,9 @@ build*.rec
 build*.wrn
 build*.metadata

+# MS Build binary logs
+*.binlog
+
 # .razzlerc.cmd file - used by dev environment
 tools/.razzlerc.*
 # .PowershellModules - if one needs a powershell module dependency, one
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -47,3 +47,33 @@ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
+
+## telnetpp
+
+**Source**: https://github.com/KazDragon/telnetpp
+
+### License 
+
+```
+The MIT License (MIT)
+
+Copyright (c) 2015-2017 Matthew Chaplain a.k.a KazDragon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+```
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -176,6 +176,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalControl", "src\casc
 		{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
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminal", "src\cascadia\WindowsTerminal\WindowsTerminal.vcxproj", "{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}"
@@ -250,6 +251,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererUia", "src\renderer
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinRTUtils", "src\cascadia\WinRTUtils\WinRTUtils.vcxproj", "{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminalUniversal", "src\cascadia\WindowsTerminalUniversal\WindowsTerminalUniversal.vcxproj", "{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winconpty.LIB", "src\winconpty\lib\winconptylib.vcxproj", "{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winconpty.DLL", "src\winconpty\dll\winconptydll.vcxproj", "{A22EC5F6-7851-4B88-AC52-47249D437A52}"
@@ -350,8 +353,8 @@ Global
 		{2FD12FBB-1DDB-46D8-B818-1023C624CACA}.Release|x86.Build.0 = Release|Win32
 		{3AE13314-1939-4DFA-9C14-38CA0834050C}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{3AE13314-1939-4DFA-9C14-38CA0834050C}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{3AE13314-1939-4DFA-9C14-38CA0834050C}.AuditMode|x64.ActiveCfg = Release|x64
-		{3AE13314-1939-4DFA-9C14-38CA0834050C}.AuditMode|x64.Build.0 = Release|x64
+		{3AE13314-1939-4DFA-9C14-38CA0834050C}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{3AE13314-1939-4DFA-9C14-38CA0834050C}.AuditMode|x64.Build.0 = AuditMode|x64
 		{3AE13314-1939-4DFA-9C14-38CA0834050C}.AuditMode|x86.ActiveCfg = Release|Win32
 		{3AE13314-1939-4DFA-9C14-38CA0834050C}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{3AE13314-1939-4DFA-9C14-38CA0834050C}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -369,7 +372,8 @@ Global
 		{3AE13314-1939-4DFA-9C14-38CA0834050C}.Release|x86.Build.0 = Release|Win32
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{DCF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|x64.ActiveCfg = Release|x64
+		{DCF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{DCF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|x64.Build.0 = AuditMode|x64
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|x86.ActiveCfg = Release|Win32
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -387,8 +391,8 @@ Global
 		{DCF55140-EF6A-4736-A403-957E4F7430BB}.Release|x86.Build.0 = Release|Win32
 		{1CF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{1CF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{1CF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|x64.ActiveCfg = Release|x64
-		{1CF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|x64.Build.0 = Release|x64
+		{1CF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{1CF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|x64.Build.0 = AuditMode|x64
 		{1CF55140-EF6A-4736-A403-957E4F7430BB}.AuditMode|x86.ActiveCfg = Release|Win32
 		{1CF55140-EF6A-4736-A403-957E4F7430BB}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{1CF55140-EF6A-4736-A403-957E4F7430BB}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -950,7 +954,8 @@ Global
 		{48D21369-3D7B-4431-9967-24E81292CF62}.Release|x86.Build.0 = Release|Win32
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}.AuditMode|Any CPU.ActiveCfg = Debug|Win32
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}.AuditMode|x64.ActiveCfg = Release|x64
+		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}.AuditMode|x64.Build.0 = AuditMode|x64
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}.AuditMode|x86.ActiveCfg = Release|Win32
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -968,8 +973,8 @@ Global
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}.Release|x86.Build.0 = Release|Win32
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{CA5CAD1A-ABCD-429C-B551-8562EC954746}.AuditMode|x64.ActiveCfg = Release|x64
-		{CA5CAD1A-ABCD-429C-B551-8562EC954746}.AuditMode|x64.Build.0 = Release|x64
+		{CA5CAD1A-ABCD-429C-B551-8562EC954746}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{CA5CAD1A-ABCD-429C-B551-8562EC954746}.AuditMode|x64.Build.0 = AuditMode|x64
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746}.AuditMode|x86.ActiveCfg = Release|Win32
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -1041,8 +1046,8 @@ Global
 		{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|x64.ActiveCfg = Release|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x64.Build.0 = Release|x64
+		{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
@@ -1227,7 +1232,8 @@ Global
 		{48D21369-3D7B-4431-9967-24E81292CF63}.Release|x86.Build.0 = Release|Win32
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.AuditMode|Any CPU.ActiveCfg = Release|x64
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.AuditMode|x64.ActiveCfg = Release|x64
+		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.AuditMode|x64.Build.0 = AuditMode|x64
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.AuditMode|x86.ActiveCfg = Release|Win32
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -1243,10 +1249,39 @@ Global
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.Release|x64.Build.0 = Release|x64
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.Release|x86.ActiveCfg = Release|Win32
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.Release|x86.Build.0 = Release|Win32
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.AuditMode|Any CPU.ActiveCfg = Release|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.AuditMode|Any CPU.Build.0 = Release|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.AuditMode|Any CPU.Deploy.0 = Release|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.AuditMode|ARM64.ActiveCfg = Release|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.AuditMode|ARM64.Build.0 = Release|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.AuditMode|ARM64.Deploy.0 = Release|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.AuditMode|x64.ActiveCfg = Release|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.AuditMode|x86.ActiveCfg = Release|Win32
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.AuditMode|x86.Build.0 = Release|Win32
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.AuditMode|x86.Deploy.0 = Release|Win32
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Debug|ARM64.ActiveCfg = Debug|Win32
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Debug|x64.ActiveCfg = Debug|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Debug|x64.Build.0 = Debug|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Debug|x64.Deploy.0 = Debug|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Debug|x86.ActiveCfg = Debug|Win32
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Debug|x86.Build.0 = Debug|Win32
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Debug|x86.Deploy.0 = Debug|Win32
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Release|Any CPU.ActiveCfg = Release|Win32
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Release|ARM64.Build.0 = Release|ARM64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Release|ARM64.Deploy.0 = Release|ARM64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Release|x64.ActiveCfg = Release|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Release|x64.Build.0 = Release|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Release|x64.Deploy.0 = Release|x64
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Release|x86.ActiveCfg = Release|Win32
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Release|x86.Build.0 = Release|Win32
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1}.Release|x86.Deploy.0 = Release|Win32
 		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
 		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|x64.ActiveCfg = Release|x64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|x64.Build.0 = AuditMode|x64
 		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|x86.ActiveCfg = AuditMode|Win32
 		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|x86.Build.0 = AuditMode|Win32
 		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|Any CPU.ActiveCfg = Debug|Win32
@@ -1347,6 +1382,7 @@ Global
 		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506} = {59840756-302F-44DF-AA47-441A9D673202}
 		{48D21369-3D7B-4431-9967-24E81292CF63} = {05500DEF-2294-41E3-AF9A-24E580B82836}
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE} = {59840756-302F-44DF-AA47-441A9D673202}
+		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1} = {59840756-302F-44DF-AA47-441A9D673202}
 		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 		{A22EC5F6-7851-4B88-AC52-47249D437A52} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 	EndGlobalSection
--- a/README.md
+++ b/README.md
@@ -147,6 +147,7 @@ If you would like to ask a question that you feel doesn't warrant an issue (yet)
 * Michael Niksa, Senior Developer: [@michaelniksa](https://twitter.com/MichaelNiksa)
 * Mike Griese, Developer: [@zadjii](https://twitter.com/zadjii)
 * Carlos Zamora, Developer: [@cazamor_msft](https://twitter.com/cazamor_msft)
+* Leon Liang, Developer: [@leonmsft](https://twitter.com/leonmsft)

 ## Developer Guidance

@@ -187,15 +188,13 @@ Invoke-OpenConsoleBuild
 bcz
 ```

-## Debugging Terminal
+## Running & Debugging

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

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

-### Debugging
-
-* To debug in VS, right click on CascadiaPackage (from VS Solution Explorer) and go to properties, in the Debug menu, change "Application process" and "Background task process" to "Native Only".
+> 👉 You will _not_ be able to launch the Terminal directly by running the WindowsTerminal.exe. For more details on why, see [#926](https://github.com/microsoft/terminal/issues/926), [#4043](https://github.com/microsoft/terminal/issues/4043)

 ### Coding Guidance

--- a/build/config/SignConfig.NuGet.xml
+++ b/build/config/SignConfig.NuGet.xml
@@ -0,0 +1,5 @@
+<SignConfigXML>
+  <job platform="" configuration="" dest="__INPATHROOT__" jobname="EngFunSimpleSign" approvers="">
+   <file src="__INPATHROOT__\Microsoft.Terminal*.nupkg" signType="NuGet" /> 
+  </job>
+</SignConfigXML>
--- a/build/config/SignConfig.WindowsTerminal.xml
+++ b/build/config/SignConfig.WindowsTerminal.xml
@@ -1,5 +1,6 @@
 <SignConfigXML>
  <job platform="" configuration="" certSubject="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" jobname="EngFunSimpleSign" approvers="">
   <file src="__INPATHROOT__\Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle" signType="136020001" dest="__OUTPATHROOT__\Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle" /> 
+   <file src="__INPATHROOT__\Microsoft.WindowsTerminalUniversal_8wekyb3d8bbwe.msixbundle" signType="136020001" dest="__OUTPATHROOT__\Microsoft.WindowsTerminalUniversal_8wekyb3d8bbwe.msixbundle" /> 
  </job>
 </SignConfigXML>
--- a/build/pipelines/templates/build-console-steps.yml
+++ b/build/pipelines/templates/build-console-steps.yml
@@ -36,33 +36,16 @@ steps:
    restoreDirectory: '$(Build.SourcesDirectory)/packages'

 - task: VSBuild@1
-  displayName: 'Build solution **\OpenConsole.sln (no packages)'
+  displayName: 'Build solution **\OpenConsole.sln'
  inputs:
    solution: '**\OpenConsole.sln'
    vsVersion: 16.0
    platform: '$(BuildPlatform)'
    configuration: '$(BuildConfiguration)'
-    # Until there is a servicing release of Visual Studio 2019 Update 3, we must force the values of:
-    # BuildingInsideVisualStudio
-    # _WapBuildingInsideVisualStudio
-    # GenerateAppxPackageOnBuild
-    # because otherwise, they will cause a build instability where MSBuild considers all projects
-    # to always be out-of-date.
-    msbuildArgs: "${{ parameters.additionalBuildArguments }} /p:BuildingInsideVisualStudio=false;_WapBuildingInsideVisualStudio=false;GenerateAppxPackageOnBuild=false"
+    msbuildArgs: "${{ parameters.additionalBuildArguments }}"
    clean: true
    maximumCpuCount: true

- task: VSBuild@1
-  displayName: 'Build solution **\OpenConsole.sln (CascadiaPackage only)'
-  inputs:
-    solution: '**\OpenConsole.sln'
-    vsVersion: 16.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: "${{ parameters.additionalBuildArguments }} /p:BuildingInsideVisualStudio=false;_WapBuildingInsideVisualStudio=false;GenerateAppxPackageOnBuild=true /t:Terminal\\CascadiaPackage"
-    clean: false # we're relying on build output fropm the previous run
-    maximumCpuCount: true
-
 - task: PowerShell@2
  displayName: 'Check MSIX for common regressions'
  inputs:
--- a/custom.props
+++ b/custom.props
@@ -5,7 +5,7 @@
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
    <XesBaseYearForStoreVersion>2019</XesBaseYearForStoreVersion>
    <VersionMajor>0</VersionMajor>
-    <VersionMinor>7</VersionMinor>
+    <VersionMinor>8</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
  </PropertyGroup>
 </Project>
--- a/doc/ORGANIZATION.md
+++ b/doc/ORGANIZATION.md
@@ -24,6 +24,16 @@
 * `/ipch` – not checked in is where intellisense data will be generated if you use Visual Studio 2015
 * `/obj` – not checked in is where objects will be generated by the MSBuild system
 * `/src` – This is the fun one. In the root is common build system data.
+	* `/src/cascadia` - This directory contains all the code specific to the Windows Terminal
+		* `/src/cascadia/TerminalConnection` - This DLL is responsible for the various different ways a terminal instance can communicate with different terminal backends. Examples include the `ConptyConnection` (for communicating with Windows Console processes), or the `AzureCloudShellConnection` for communicating with Azure.
+		* `/src/cascadia/TerminalSettings` - This is the DLL responsible for abstracting the settings for both the TerminalCore and the TerminalControl. This provides consumers of the TerminalControl a common interface for supplying settings to the Terminal.
+		* `/src/cascadia/TerminalCore` - This LIB is responsible for the core implementation of a terminal instance. This defines one important class `Terminal` which is a complete terminal instance, with buffer, colors table, VT parsing, input handling, etc. It does _not_ prescribe any sort of UI implementation - it should be connected to code that can handle rendering its contents, and provide input to it.
+		* `/src/cascadia/TerminalControl` - This DLL provides the UWP-XAML implementation of a `TermControl`, which can be embedded within an application to provide a terminal instance within the application. It contains a DX renderer for drawing text to the screen, and translates input to send to the core Terminal. It also recieves settings to apply to both itself and the core Terminal.
+		* `/src/cascadia/TerminalApp` - This DLL represents the implementation of the Windows Terminal application. This includes parsing settings, hosting tabs & panes with Terminals in them, and displaying other UI elements. This DLL is almost entirely UWP-like code, and shouldn't be doing any Win32-like UI work.
+		* `/src/cascadia/WindowsTerminal` - This EXE provides Win32 hosting for the TerminalApp. It will set up XAML islands, and is responsible for drawing the window, either as a standard window or with content in the titlebar (non-client area).
+		* `/src/cascadia/CasadiaPackage` - This is a project for packaging the Windows Terminal and its dependencies into an .appx/.msix for deploying to the machine.
+		* `/src/cascadia/PublicTerminalCore` - This is a DLL wrapper for the TerminalCore and Renderer, similar to `TermControl`, which exposes some exported functions that so the Terminal can be used from C#.
+		* `/src/cascadia/WpfTerminalControl` - A DLL implementing a WPF version of the Terminal Control.
 	* `/src/host` – The meat of the windows console host. This includes buffer, input, output, windowing, server management, clipboard, and most interactions with the console host window that aren’t stated anywhere else. We’re trying to pull things out that are reusable into other libraries, but it’s a work in progress
 		* `/src/host/lib` – Builds the reusable LIB copy of the host
 		* `/src/host/dll` – Packages LIB into conhostv2.dll to be put into the OS C:\windows\system32\
@@ -42,7 +52,7 @@
 		* `/src/renderer/base` – Base interface layer providing non-engine-specific rendering things like choosing the data from the console buffer, deciding how to lay out or transform that data, then dispatching commands to a specific final display engine
 		* `/src/renderer/gdi` – The GDI implementation of rendering to the screen. Takes commands to “draw a line” or “fill the background” or “select a region” from the base and turns them into GDI calls to the screen. Extracted from original console host code.
 		* `/src/renderer/inc` – Interface definitions for all renderer communication
-	* `/src/terminal` – Virtual terminal support for the console. This is the sequences that are found in-band with other text on STDIN/STDOUT that command the display to do things. This is the *nix way of controlling a console.
+	* `/src/terminal` – Virtual terminal support for the console. This is the sequences that are found in-band with other text on STDIN/STDOUT that command the display to do things. This is the \*nix way of controlling a console.
 		* `/src/terminal/parser` – This contains a state machine and sorting engine for feeding in individual characters from STDOUT or STDIN and decoding them into the appropriate verbs that should be performed
 		* `/src/terminal/adapter` – This converts the verbs from the interface into calls on the console API. It doesn’t actually call through the API (for performance reasons since it lives inside the same binary), but it tries to remain as close to an API call as possible. There are some private extensions to the API for behaviors that didn’t exist before this was written that we’ve not made public. We don’t know if we will yet or force people to use VT to get at them.
 	* `/src/tsf` – Text Services Foundation. This provides IME input services to the console. This was historically used for only Chinese, Japanese, and Korean IMEs specifically on OS installations with those as the primary language. It was in the summer of 2016 unrestricted to be able to be used on any OS installation with any IME (whether or not it will display correctly is a different story). It also was unrestricted to allow things like Pen and Touch input (which are routed via IME messages) to display properly inside the console from the TabTip window (the little popup that helps you insert pen/touch writing/keyboard candidates into an application)
@@ -90,7 +100,7 @@
 * Assorted utilities and stuff
 	* `Misc.cpp` (left for us by previous eras of random console devs)
 	* `Util.cpp` (created in our era)
-* Custom zeroing and non-throwing allocator 
+* Custom zeroing and non-throwing allocator
 	* `Newdelete.cpp`
 * Related to inserting text into the TextInfo buffer
 	* `Output.cpp`
--- a/doc/cascadia/SettingsSchema.md
+++ b/doc/cascadia/SettingsSchema.md
@@ -1,184 +1,194 @@
-# Profiles.json Documentation
-
-## Globals
-Properties listed below affect the entire window, regardless of the profile settings.
-
-| Property | Necessity | Type | Default | Description |
-| -------- | --------- | ---- | ------- | ----------- |
-| `alwaysShowTabs` | _Required_ | Boolean | `true` | When set to `true`, tabs are always displayed. When set to `false` and `showTabsInTitlebar` is set to `false`, tabs only appear after typing <kbd>Ctrl</kbd> + <kbd>T</kbd>. |
-| `copyOnSelect` | Optional | Boolean | `false` | When set to `true`, a selection is immediately copied to your clipboard upon creation. When set to `false`, the selection persists and awaits further action. |
-| `defaultProfile` | _Required_ | String | PowerShell guid | Sets the default profile. Opens by typing <kbd>Ctrl</kbd> + <kbd>T</kbd> or by clicking the '+' icon. The guid of the desired default profile is used as the value. |
-| `initialCols` | _Required_ | Integer | `120` | The number of columns displayed in the window upon first load. |
-| `initialRows` | _Required_ | Integer | `30` | The number of rows displayed in the window upon first load. |
-| `requestedTheme` | _Required_ | String | `system` | Sets the theme of the application. Possible values: `"light"`, `"dark"`, `"system"` |
-| `showTerminalTitleInTitlebar` | _Required_ | Boolean | `true` | When set to `true`, titlebar displays the title of the selected tab. When set to `false`, titlebar displays "Windows Terminal". |
-| `showTabsInTitlebar` | Optional | Boolean | `true` | When set to `true`, the tabs are moved into the titlebar and the titlebar disappears. When set to `false`, the titlebar sits above the tabs. |
-| `wordDelimiters` | Optional | String | <code>&nbsp;&#x2f;&#x5c;&#x28;&#x29;&#x22;&#x27;&#x2d;&#x3a;&#x2c;&#x2e;&#x3b;&#x3c;&#x3e;&#x7e;&#x21;&#x40;&#x23;&#x24;&#x25;&#x5e;&#x26;&#x2a;&#x7c;&#x2b;&#x3d;&#x5b;&#x5d;&#x7b;&#x7d;&#x7e;&#x3f;│</code><br>_(`│` is `U+2502 BOX DRAWINGS LIGHT VERTICAL`)_ | Determines the delimiters used in a double click selection. |
-
-## Profiles
-Properties listed below are specific to each unique profile.
-
-| Property | Necessity | Type | Default | Description |
-| -------- | --------- | ---- | ------- | ----------- |
-| `guid` | _Required_ | String | | Unique identifier of the profile. Written in registry format: `"{00000000-0000-0000-0000-000000000000}"`. |
-| `name` | _Required_ | String | | Name of the profile. Displays in the dropdown menu. <br>Additionally, this value will be used as the "title" to pass to the shell on startup. Some shells (like `bash`) may choose to ignore this initial value, while others (`cmd`, `powershell`) may use this value over the lifetime of the application. This "title" behavior can be overriden by using `tabTitle`. |
-| `acrylicOpacity` | Optional | Number | `0.5` | When `useAcrylic` is set to `true`, it sets the transparency of the window for the profile. Accepts floating point values from 0-1. |
-| `background` | Optional | String | | Sets the background color of the profile. Overrides `background` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
-| `backgroundImage` | Optional | String | | Sets the file location of the Image to draw over the window background. |
-| `backgroundImageAlignment` | Optional | String | `center` | Sets how the background image aligns to the boundaries of the window. Possible values: `"center"`, `"left"`, `"top"`, `"right"`, `"bottom"`, `"topLeft"`, `"topRight"`, `"bottomLeft"`, `"bottomRight"` |
-| `backgroundImageOpacity` | Optional | Number | `1.0` | Sets the transparency of the background image. Accepts floating point values from 0-1. |
-| `backgroundImageStretchMode` | Optional | String | `uniformToFill` | Sets how the background image is resized to fill the window. Possible values: `"none"`, `"fill"`, `"uniform"`, `"uniformToFill"` |
-| `closeOnExit` | Optional | Boolean | `true` | When set to `true`, the selected tab closes when `exit` is typed. When set to `false`, the tab will remain open when `exit` is typed. |
-| `colorScheme` | Optional | String | `Campbell` | Name of the terminal color scheme to use. Color schemes are defined under `schemes`. |
-| `colorTable` | Optional | Array[String] | | Array of colors used in the profile if `colorscheme` is not set. Array follows the format defined in `schemes`. |
-| `commandline` | Optional | String | | Executable used in the profile. |
-| `cursorColor` | Optional | String | `#FFFFFF` | Sets the cursor color for the profile. Uses hex color format: `"#rrggbb"`. |
-| `cursorHeight` | Optional | Integer | | Sets the percentage height of the cursor starting from the bottom. Only works when `cursorShape` is set to `"vintage"`. Accepts values from 25-100. |
-| `cursorShape` | Optional | String | `bar` | Sets the cursor shape for the profile. Possible values: `"vintage"` ( &#x2583; ), `"bar"` ( &#x2503; ), `"underscore"` ( &#x2581; ), `"filledBox"` ( &#x2588; ), `"emptyBox"` ( &#x25AF; ) |
-| `fontFace` | Optional | String | `Consolas` | Name of the font face used in the profile. We will try to fallback to Consolas if this can't be found or is invalid. |
-| `fontSize` | Optional | Integer | `12` | Sets the font size. |
-| `foreground` | Optional | String | | Sets the foreground color of the profile. Overrides `foreground` set in color scheme if `colorscheme` is set. Uses hex color format: `#rgb` or `"#rrggbb"`. |
-| `hidden` | Optional | Boolean | `false` | If set to true, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamicially generated profiles, while leaving them in your settings file. |
-| `historySize` | Optional | Integer | `9001` | The number of lines above the ones displayed in the window you can scroll back to. |
-| `icon` | Optional | String | | Image file location of the icon used in the profile. Displays within the tab and the dropdown menu. |
-| `padding` | Optional | String | `8, 8, 8, 8` | Sets the padding around the text within the window. Can have three different formats: `"#"` sets the same padding for all sides, `"#, #"` sets the same padding for left-right and top-bottom, and `"#, #, #, #"` sets the padding individually for left, top, right, and bottom. |
-| `scrollbarState` | Optional | String | | Defines the visibility of the scrollbar. Possible values: `"visible"`, `"hidden"` |
-| `selectionBackground` | Optional | String | Sets the selection background color of the profile. Overrides `selectionBackground` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
-| `snapOnInput` | Optional | Boolean | `true` | When set to `true`, the window will scroll to the command input line when typing. When set to `false`, the window will not scroll when you start typing. |
-| `source` | Optional | String | | Stores the name of the profile generator that originated this profile. _There are no discoverable values for this field._ |
-| `startingDirectory` | Optional | String | `%USERPROFILE%` | The directory the shell starts in when it is loaded. |
-| `suppressApplicationTitle` | Optional | Boolean | | When set to `true`, `tabTitle` overrides the default title of the tab and any title change messages from the application will be suppressed. When set to `false`, `tabTitle` behaves as normal. |
-| `tabTitle` | Optional | String | | If set, will replace the `name` as the title to pass to the shell on startup. Some shells (like `bash`) may choose to ignore this initial value, while others (`cmd`, `powershell`) may use this value over the lifetime of the application.  |
-| `useAcrylic` | Optional | Boolean | `false` | When set to `true`, the window will have an acrylic background. When set to `false`, the window will have a plain, untextured background. |
-
-## Schemes
-Properties listed below are specific to each color scheme. [ColorTool](https://github.com/microsoft/terminal/tree/master/src/tools/ColorTool) is a great tool you can use to create and explore new color schemes. All colors use hex color format.
-
-| Property | Necessity | Type | Description |
-| -------- | ---- | ----------- | ----------- |
-| `name` | _Required_ | String | Name of the color scheme. |
-| `foreground` | _Required_ | String | Sets the foreground color of the color scheme. |
-| `background` | _Required_ | String | Sets the background color of the color scheme. |
-| `selectionBackground` | Optional | String | Sets the selection background color of the color scheme. |
-| `black` | _Required_ | String | Sets the color used as ANSI black. |
-| `blue` | _Required_ | String | Sets the color used as ANSI blue. |
-| `brightBlack` | _Required_ | String | Sets the color used as ANSI bright black. |
-| `brightBlue` | _Required_ | String | Sets the color used as ANSI bright blue. |
-| `brightCyan` | _Required_ | String | Sets the color used as ANSI bright cyan. |
-| `brightGreen` | _Required_ | String | Sets the color used as ANSI bright green. |
-| `brightPurple` | _Required_ | String | Sets the color used as ANSI bright purple. |
-| `brightRed` | _Required_ | String | Sets the color used as ANSI bright red. |
-| `brightWhite` | _Required_ | String | Sets the color used as ANSI bright white. |
-| `brightYellow` | _Required_ | String | Sets the color used as ANSI bright yellow. |
-| `cyan` | _Required_ | String | Sets the color used as ANSI cyan. |
-| `green` | _Required_ | String | Sets the color used as ANSI green. |
-| `purple` | _Required_ | String | Sets the color used as ANSI purple. |
-| `red` | _Required_ | String | Sets the color used as ANSI red. |
-| `white` | _Required_ | String | Sets the color used as ANSI white. |
-| `yellow` | _Required_ | String | Sets the color used as ANSI yellow. |
-
-## Keybindings
-Properties listed below are specific to each custom key binding.
-
-| Property | Necessity | Type | Description |
-| -------- | ---- | ----------- | ----------- |
-| `command` | _Required_ | String | The command executed when the associated key bindings are pressed. |
-| `keys` | _Required_ | Array[String] | Defines the key combinations used to call the command. |
-
-### Implemented Keybindings
-
-Bindings listed below are per the implementation in `src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp`
-
- copy
- copyTextWithoutNewlines
- paste
- newTab
- openNewTabDropdown
- duplicateTab
- newTabProfile0
- newTabProfile1
- newTabProfile2
- newTabProfile3
- newTabProfile4
- newTabProfile5
- newTabProfile6
- newTabProfile7
- newTabProfile8
- closeWindow
- closeTab
- closePane
- switchToTab
- nextTab
- prevTab
- increaseFontSize
- decreaseFontSize
- resetFontSize
- scrollUp
- scrollDown
- scrollUpPage
- scrollDownPage
- switchToTab0
- switchToTab1
- switchToTab2
- switchToTab3
- switchToTab4
- switchToTab5
- switchToTab6
- switchToTab7
- switchToTab8
- openSettings
- splitHorizontal
- splitVertical
- resizePaneLeft
- resizePaneRight
- resizePaneUp
- resizePaneDown
- moveFocusLeft
- moveFocusRight
- moveFocusUp
- moveFocusDown
- toggleFullscreen
-
-## Background Images and Icons
-Some Terminal settings allow you to specify custom background images and icons. It is recommended that custom images and icons are stored in system-provided folders and are referred to using the correct [URI Schemes](https://docs.microsoft.com/en-us/windows/uwp/app-resources/uri-schemes). URI Schemes provide a way to reference files independent of their physical paths (which may change in the future).
-
-The most useful URI schemes to remember when customizing background images and icons are:
-
-| URI Scheme | Corresponding Physical Path | Use / description |
-| --- | --- | ---|
-| `ms-appdata:///Local/` | `%localappdata%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\` | Per-machine files |
-| `ms-appdata:///Roaming/` | `%localappdata%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\RoamingState\` | Common files |
-
-> ⚠ Note: Do not rely on file references using the `ms-appx` URI Scheme (i.e. icons). These files are considered an internal implementation detail and may change name/location or may be omitted in the future.
-
-### Icons
-Terminal displays icons for each of your profiles which Terminal generates for any built-in shells - PowerShell Core, PowerShell, and any installed Linux/WSL distros. Each profile refers to a stock icon via the `ms-appx` URI Scheme.
-
-> ⚠ Note: Do not rely on the files referenced by the `ms-appx` URI Scheme - they are considered an internal implementation detail and may change name/location or may be omitted in the future.
-
-You can refer to you own icons if you wish, e.g.:
-
-```json
-    "icon" : "C:\\Users\\richturn\\OneDrive\\WindowsTerminal\\icon-ubuntu-32.png",
-```
-
-> 👉 Tip: Icons should be sized to 32x32px in an appropriate raster image format (e.g. .PNG, .GIF, or .ICO) to avoid having to scale your icons during runtime (causing a noticeable delay and loss of quality.)
-
-### Custom Background Images
-You can apply a background image to each of your profiles, allowing you to configure/brand/style each of your profiles independently from one another if you wish.
-
-To do so, specify your preferred `backgroundImage`, position it using `backgroundImageAlignment`, set its opacity with `backgroundImageOpacity`, and/or specify how your image fill the available space using `backgroundImageStretchMode`.
-
-For example:
-```json
-    "backgroundImage": "C:\\Users\\richturn\\OneDrive\\WindowsTerminal\\bg-ubuntu-256.png",
-    "backgroundImageAlignment": "bottomRight",
-    "backgroundImageOpacity": 0.1,
-    "backgroundImageStretchMode": "none"
-```
-
-> 👉 Tip: You can easily roam your collection of images and icons across all your machines by storing your icons and images in OneDrive (as shown above).
-
-With these settings, your Terminal's Ubuntu profile would look similar to this:
-
-![Custom icon and background image](../images/custom-icon-and-background-image.jpg)
+# Profiles.json Documentation
+
+## Globals
+Properties listed below affect the entire window, regardless of the profile settings.
+
+| Property | Necessity | Type | Default | Description |
+| -------- | --------- | ---- | ------- | ----------- |
+| `alwaysShowTabs` | _Required_ | Boolean | `true` | When set to `true`, tabs are always displayed. When set to `false` and `showTabsInTitlebar` is set to `false`, tabs only appear after typing <kbd>Ctrl</kbd> + <kbd>T</kbd>. |
+| `copyOnSelect` | Optional | Boolean | `false` | When set to `true`, a selection is immediately copied to your clipboard upon creation. When set to `false`, the selection persists and awaits further action. |
+| `defaultProfile` | _Required_ | String | PowerShell guid | Sets the default profile. Opens by typing <kbd>Ctrl</kbd> + <kbd>T</kbd> or by clicking the '+' icon. The guid of the desired default profile is used as the value. |
+| `initialCols` | _Required_ | Integer | `120` | The number of columns displayed in the window upon first load. |
+| `initialRows` | _Required_ | Integer | `30` | The number of rows displayed in the window upon first load. |
+| `requestedTheme` | _Required_ | String | `system` | Sets the theme of the application. Possible values: `"light"`, `"dark"`, `"system"` |
+| `showTerminalTitleInTitlebar` | _Required_ | Boolean | `true` | When set to `true`, titlebar displays the title of the selected tab. When set to `false`, titlebar displays "Windows Terminal". |
+| `showTabsInTitlebar` | Optional | Boolean | `true` | When set to `true`, the tabs are moved into the titlebar and the titlebar disappears. When set to `false`, the titlebar sits above the tabs. |
+| `wordDelimiters` | Optional | String | <code>&nbsp;&#x2f;&#x5c;&#x28;&#x29;&#x22;&#x27;&#x2d;&#x3a;&#x2c;&#x2e;&#x3b;&#x3c;&#x3e;&#x7e;&#x21;&#x40;&#x23;&#x24;&#x25;&#x5e;&#x26;&#x2a;&#x7c;&#x2b;&#x3d;&#x5b;&#x5d;&#x7b;&#x7d;&#x7e;&#x3f;│</code><br>_(`│` is `U+2502 BOX DRAWINGS LIGHT VERTICAL`)_ | Determines the delimiters used in a double click selection. |
+
+## Profiles
+Properties listed below are specific to each unique profile.
+
+| Property | Necessity | Type | Default | Description |
+| -------- | --------- | ---- | ------- | ----------- |
+| `guid` | _Required_ | String | | Unique identifier of the profile. Written in registry format: `"{00000000-0000-0000-0000-000000000000}"`. |
+| `name` | _Required_ | String | | Name of the profile. Displays in the dropdown menu. <br>Additionally, this value will be used as the "title" to pass to the shell on startup. Some shells (like `bash`) may choose to ignore this initial value, while others (`cmd`, `powershell`) may use this value over the lifetime of the application. This "title" behavior can be overriden by using `tabTitle`. |
+| `acrylicOpacity` | Optional | Number | `0.5` | When `useAcrylic` is set to `true`, it sets the transparency of the window for the profile. Accepts floating point values from 0-1. |
+| `background` | Optional | String | | Sets the background color of the profile. Overrides `background` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
+| `backgroundImage` | Optional | String | | Sets the file location of the Image to draw over the window background. |
+| `backgroundImageAlignment` | Optional | String | `center` | Sets how the background image aligns to the boundaries of the window. Possible values: `"center"`, `"left"`, `"top"`, `"right"`, `"bottom"`, `"topLeft"`, `"topRight"`, `"bottomLeft"`, `"bottomRight"` |
+| `backgroundImageOpacity` | Optional | Number | `1.0` | Sets the transparency of the background image. Accepts floating point values from 0-1. |
+| `backgroundImageStretchMode` | Optional | String | `uniformToFill` | Sets how the background image is resized to fill the window. Possible values: `"none"`, `"fill"`, `"uniform"`, `"uniformToFill"` |
+| `closeOnExit` | Optional | String | `graceful` | Sets how the profile reacts to termination or failure to launch. Possible values: `"graceful"` (close when `exit` is typed or the process exits normally), `"always"` (always close) and `"never"` (never close). `true` and `false` are accepted as synonyms for `"graceful"` and `"never"` respectively. |
+| `colorScheme` | Optional | String | `Campbell` | Name of the terminal color scheme to use. Color schemes are defined under `schemes`. |
+| `colorTable` | Optional | Array[String] | | Array of colors used in the profile if `colorscheme` is not set. Array follows the format defined in `schemes`. |
+| `commandline` | Optional | String | | Executable used in the profile. |
+| `cursorColor` | Optional | String | `#FFFFFF` | Sets the cursor color for the profile. Uses hex color format: `"#rrggbb"`. |
+| `cursorHeight` | Optional | Integer | | Sets the percentage height of the cursor starting from the bottom. Only works when `cursorShape` is set to `"vintage"`. Accepts values from 25-100. |
+| `cursorShape` | Optional | String | `bar` | Sets the cursor shape for the profile. Possible values: `"vintage"` ( &#x2583; ), `"bar"` ( &#x2503; ), `"underscore"` ( &#x2581; ), `"filledBox"` ( &#x2588; ), `"emptyBox"` ( &#x25AF; ) |
+| `fontFace` | Optional | String | `Consolas` | Name of the font face used in the profile. We will try to fallback to Consolas if this can't be found or is invalid. |
+| `fontSize` | Optional | Integer | `12` | Sets the font size. |
+| `foreground` | Optional | String | | Sets the foreground color of the profile. Overrides `foreground` set in color scheme if `colorscheme` is set. Uses hex color format: `#rgb` or `"#rrggbb"`. |
+| `hidden` | Optional | Boolean | `false` | If set to true, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamicially generated profiles, while leaving them in your settings file. |
+| `historySize` | Optional | Integer | `9001` | The number of lines above the ones displayed in the window you can scroll back to. |
+| `icon` | Optional | String | | Image file location of the icon used in the profile. Displays within the tab and the dropdown menu. |
+| `padding` | Optional | String | `8, 8, 8, 8` | Sets the padding around the text within the window. Can have three different formats: `"#"` sets the same padding for all sides, `"#, #"` sets the same padding for left-right and top-bottom, and `"#, #, #, #"` sets the padding individually for left, top, right, and bottom. |
+| `scrollbarState` | Optional | String | | Defines the visibility of the scrollbar. Possible values: `"visible"`, `"hidden"` |
+| `selectionBackground` | Optional | String | | Sets the selection background color of the profile. Overrides `selectionBackground` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
+| `snapOnInput` | Optional | Boolean | `true` | When set to `true`, the window will scroll to the command input line when typing. When set to `false`, the window will not scroll when you start typing. |
+| `source` | Optional | String | | Stores the name of the profile generator that originated this profile. _There are no discoverable values for this field._ |
+| `startingDirectory` | Optional | String | `%USERPROFILE%` | The directory the shell starts in when it is loaded. |
+| `suppressApplicationTitle` | Optional | Boolean | | When set to `true`, `tabTitle` overrides the default title of the tab and any title change messages from the application will be suppressed. When set to `false`, `tabTitle` behaves as normal. |
+| `tabTitle` | Optional | String | | If set, will replace the `name` as the title to pass to the shell on startup. Some shells (like `bash`) may choose to ignore this initial value, while others (`cmd`, `powershell`) may use this value over the lifetime of the application.  |
+| `useAcrylic` | Optional | Boolean | `false` | When set to `true`, the window will have an acrylic background. When set to `false`, the window will have a plain, untextured background. |
+| `experimental.retroTerminalEffect` | Optional | Boolean | `false` | When set to `true`, enable retro terminal effects. This is an experimental feature, and its continued existence is not guaranteed. |
+
+## Schemes
+Properties listed below are specific to each color scheme. [ColorTool](https://github.com/microsoft/terminal/tree/master/src/tools/ColorTool) is a great tool you can use to create and explore new color schemes. All colors use hex color format.
+
+| Property | Necessity | Type | Description |
+| -------- | ---- | ----------- | ----------- |
+| `name` | _Required_ | String | Name of the color scheme. |
+| `foreground` | _Required_ | String | Sets the foreground color of the color scheme. |
+| `background` | _Required_ | String | Sets the background color of the color scheme. |
+| `selectionBackground` | Optional | String | Sets the selection background color of the color scheme. |
+| `black` | _Required_ | String | Sets the color used as ANSI black. |
+| `blue` | _Required_ | String | Sets the color used as ANSI blue. |
+| `brightBlack` | _Required_ | String | Sets the color used as ANSI bright black. |
+| `brightBlue` | _Required_ | String | Sets the color used as ANSI bright blue. |
+| `brightCyan` | _Required_ | String | Sets the color used as ANSI bright cyan. |
+| `brightGreen` | _Required_ | String | Sets the color used as ANSI bright green. |
+| `brightPurple` | _Required_ | String | Sets the color used as ANSI bright purple. |
+| `brightRed` | _Required_ | String | Sets the color used as ANSI bright red. |
+| `brightWhite` | _Required_ | String | Sets the color used as ANSI bright white. |
+| `brightYellow` | _Required_ | String | Sets the color used as ANSI bright yellow. |
+| `cyan` | _Required_ | String | Sets the color used as ANSI cyan. |
+| `green` | _Required_ | String | Sets the color used as ANSI green. |
+| `purple` | _Required_ | String | Sets the color used as ANSI purple. |
+| `red` | _Required_ | String | Sets the color used as ANSI red. |
+| `white` | _Required_ | String | Sets the color used as ANSI white. |
+| `yellow` | _Required_ | String | Sets the color used as ANSI yellow. |
+
+## Keybindings
+Properties listed below are specific to each custom key binding.
+
+| Property | Necessity | Type | Description |
+| -------- | ---- | ----------- | ----------- |
+| `command` | _Required_ | String | The command executed when the associated key bindings are pressed. |
+| `keys` | _Required_ | Array[String] | Defines the key combinations used to call the command. |
+
+### Implemented Commands
+
+Commands listed below are per the implementation in [`src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp`](https://github.com/microsoft/terminal/blob/master/src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp)
+
+- copy
+- copyTextWithoutNewlines
+- paste
+- newTab
+- openNewTabDropdown
+- duplicateTab
+- newTabProfile0
+- newTabProfile1
+- newTabProfile2
+- newTabProfile3
+- newTabProfile4
+- newTabProfile5
+- newTabProfile6
+- newTabProfile7
+- newTabProfile8
+- closeWindow
+- closeTab
+- closePane
+- switchToTab
+- nextTab
+- prevTab
+- increaseFontSize
+- decreaseFontSize
+- resetFontSize
+- scrollUp
+- scrollDown
+- scrollUpPage
+- scrollDownPage
+- switchToTab0
+- switchToTab1
+- switchToTab2
+- switchToTab3
+- switchToTab4
+- switchToTab5
+- switchToTab6
+- switchToTab7
+- switchToTab8
+- openSettings
+- splitPane
+- resizePaneLeft
+- resizePaneRight
+- resizePaneUp
+- resizePaneDown
+- moveFocusLeft
+- moveFocusRight
+- moveFocusUp
+- moveFocusDown
+- toggleFullscreen
+- find
+
+## Example Keys
+- ctrl+1
+- ctrl+plus
+- alt+-
+- shift+numpad_1
+- ctrL+shift+numpad_plus
+- ctrl+pgdn
+- ctrl+alt+shift+pgup
+
+## Background Images and Icons
+Some Terminal settings allow you to specify custom background images and icons. It is recommended that custom images and icons are stored in system-provided folders and are referred to using the correct [URI Schemes](https://docs.microsoft.com/en-us/windows/uwp/app-resources/uri-schemes). URI Schemes provide a way to reference files independent of their physical paths (which may change in the future).
+
+The most useful URI schemes to remember when customizing background images and icons are:
+
+| URI Scheme | Corresponding Physical Path | Use / description |
+| --- | --- | ---|
+| `ms-appdata:///Local/` | `%localappdata%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\` | Per-machine files |
+| `ms-appdata:///Roaming/` | `%localappdata%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\RoamingState\` | Common files |
+
+> ⚠ Note: Do not rely on file references using the `ms-appx` URI Scheme (i.e. icons). These files are considered an internal implementation detail and may change name/location or may be omitted in the future.
+
+### Icons
+Terminal displays icons for each of your profiles which Terminal generates for any built-in shells - PowerShell Core, PowerShell, and any installed Linux/WSL distros. Each profile refers to a stock icon via the `ms-appx` URI Scheme.
+
+> ⚠ Note: Do not rely on the files referenced by the `ms-appx` URI Scheme - they are considered an internal implementation detail and may change name/location or may be omitted in the future.
+
+You can refer to you own icons if you wish, e.g.:
+
+```json
+    "icon" : "C:\\Users\\richturn\\OneDrive\\WindowsTerminal\\icon-ubuntu-32.png",
+```
+
+> 👉 Tip: Icons should be sized to 32x32px in an appropriate raster image format (e.g. .PNG, .GIF, or .ICO) to avoid having to scale your icons during runtime (causing a noticeable delay and loss of quality.)
+
+### Custom Background Images
+You can apply a background image to each of your profiles, allowing you to configure/brand/style each of your profiles independently from one another if you wish.
+
+To do so, specify your preferred `backgroundImage`, position it using `backgroundImageAlignment`, set its opacity with `backgroundImageOpacity`, and/or specify how your image fill the available space using `backgroundImageStretchMode`.
+
+For example:
+```json
+    "backgroundImage": "C:\\Users\\richturn\\OneDrive\\WindowsTerminal\\bg-ubuntu-256.png",
+    "backgroundImageAlignment": "bottomRight",
+    "backgroundImageOpacity": 0.1,
+    "backgroundImageStretchMode": "none"
+```
+
+> 👉 Tip: You can easily roam your collection of images and icons across all your machines by storing your icons and images in OneDrive (as shown above).
+
+With these settings, your Terminal's Ubuntu profile would look similar to this:
+
+![Custom icon and background image](../images/custom-icon-and-background-image.jpg)
--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@@ -56,6 +56,7 @@
        "scrollUpPage",
        "splitHorizontal",
        "splitVertical",
+        "splitPane",
        "switchToTab",
        "switchToTab0",
        "switchToTab1",
@@ -79,6 +80,38 @@
      ],
      "type": "string"
    },
+    "SplitState": {
+      "enum": [
+        "vertical",
+        "horizontal"
+      ],
+      "type": "string"
+    },
+    "NewTerminalArgs": {
+      "properties": {
+        "commandline": {
+          "description": "A commandline to use instead of the profile's",
+          "type": "string"
+        },
+        "tabTitle": {
+          "description": "An initial tabTitle to use instead of the profile's",
+          "type": "string"
+        },
+        "startingDirectory": {
+          "description": "A startingDirectory to use instead of the profile's",
+          "type": "string"
+        },
+        "profile": {
+          "description": "Either the GUID or name of a profile to use, instead of launching the default",
+          "type": "string"
+        },
+        "index": {
+          "type": "integer",
+          "description": "The index of the profile in the new tab dropdown to open"
+        }
+      },
+      "type": "object"
+    },
    "ShortcutAction": {
      "properties": {
        "action": {
@@ -100,8 +133,8 @@
            "action": { "type": "string", "pattern": "copy" },
            "trimWhitespace": {
              "type": "boolean",
-              "default": false,
-              "description": "If true, will trim whitespace from the end of the line on copy."
+              "default": true,
+              "description": "If true, whitespace is removed and newlines are maintained. If false, newlines are removed and whitespace is maintained."
            }
          }
        }
@@ -111,13 +144,10 @@
      "description": "Arguments corresponding to a New Tab Action",
      "allOf": [
        { "$ref": "#/definitions/ShortcutAction" },
+        { "$ref": "#/definitions/NewTerminalArgs" },
        {
          "properties": {
-            "action": { "type":"string", "pattern": "newTab" },
-            "index": {
-              "type": "integer",
-              "description": "The index in the new tab dropdown to open in a new tab"
-            }
+            "action": { "type":"string", "pattern": "newTab" }
          }
        }
      ]
@@ -173,6 +203,24 @@
      ],
      "required": [ "direction" ]
    },
+    "SplitPaneAction": {
+      "description": "Arguments corresponding to a Split Pane Action",
+      "allOf": [
+        { "$ref": "#/definitions/ShortcutAction" },
+        { "$ref": "#/definitions/NewTerminalArgs" },
+        {
+          "properties": {
+            "action": { "type": "string", "pattern": "splitPane" },
+            "split": {
+              "$ref": "#/definitions/SplitState",
+              "default": "vertical",
+              "description": "The orientation to split the pane in, either vertical (think [|]) or horizontal (think [-])"
+            }
+          }
+        }
+      ],
+      "required": [ "split" ]
+    },
    "Keybinding": {
      "additionalProperties": false,
      "properties": {
@@ -184,7 +232,8 @@
              { "$ref": "#/definitions/NewTabAction" },
              { "$ref": "#/definitions/SwitchToTabAction" },
              { "$ref": "#/definitions/MoveFocusAction" },
-              { "$ref": "#/definitions/ResizePaneAction" }
+              { "$ref": "#/definitions/ResizePaneAction" },
+              { "$ref": "#/definitions/SplitPaneAction" }
            ]
        },
        "keys": {
@@ -273,276 +322,309 @@
      ],
      "type": "object"
    },
-    "ProfileList": {
-      "description": "Properties are specific to each unique profile.",
-      "items": {
-        "additionalProperties": false,
-        "properties": {
-          "acrylicOpacity": {
-            "default": 0.5,
-            "description": "When useAcrylic is set to true, it sets the transparency of the window for the profile. Accepts floating point values from 0-1 (default 0.5).",
-            "maximum": 1,
-            "minimum": 0,
-            "type": "number"
-          },
-          "background": {
-            "$ref": "#/definitions/Color",
-            "description": "Sets the background color of the profile. Overrides background set in color scheme if colorscheme is set. Uses hex color format: \"#rrggbb\". Default \"#000000\" (black).",
-            "type": ["string", "null"]
-          },
-          "backgroundImage": {
-            "description": "Sets the file location of the Image to draw over the window background.",
-            "type": "string"
-          },
-          "backgroundImageAlignment": {
-            "default": "center",
-            "enum": [
-              "bottom",
-              "bottomLeft",
-              "bottomRight",
-              "center",
-              "left",
-              "right",
-              "top",
-              "topLeft",
-              "topRight"
-            ],
-            "type": "string"
-          },
-          "backgroundImageOpacity": {
-            "description": "(Not in SettingsSchema.md)",
-            "maximum": 1,
-            "minimum": 0,
-            "type": "number"
-          },
-          "backgroundImageStretchMode": {
-            "default": "uniformToFill",
-            "description": "Sets how the background image is resized to fill the window.",
-            "enum": [
-              "fill",
-              "none",
-              "uniform",
-              "uniformToFill"
-            ],
-            "type": "string"
-          },
-          "closeOnExit": {
-            "default": true,
-            "description": "When set to true (default), the selected tab closes when the connected application exits. When set to false, the tab will remain open when the connected application exits.",
-            "type": "boolean"
-          },
-          "colorScheme": {
-            "default": "Campbell",
-            "description": "Name of the terminal color scheme to use. Color schemes are defined under \"schemes\".",
-            "type": "string"
-          },
-          "colorTable": {
-            "description": "Array of colors used in the profile if colorscheme is not set. Colors use hex color format: \"#rrggbb\". Ordering is as follows: [black, red, green, yellow, blue, magenta, cyan, white, bright black, bright red, bright green, bright yellow, bright blue, bright magenta, bright cyan, bright white]",
-            "items": {
-              "additionalProperties": false,
-              "properties": {
-                "background": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the background color of the color table."
-                },
-                "black": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI black."
-                },
-                "blue": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI blue."
-                },
-                "brightBlack": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI bright black."
-                },
-                "brightBlue": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI bright blue."
-                },
-                "brightCyan": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI bright cyan."
-                },
-                "brightGreen": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI bright green."
-                },
-                "brightPurple": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI bright purple."
-                },
-                "brightRed": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI bright red."
-                },
-                "brightWhite": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI bright white."
-                },
-                "brightYellow": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI bright yellow."
-                },
-                "cyan": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI cyan."
-                },
-                "foreground": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the foreground color of the color table."
-                },
-                "green": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI green."
-                },
-                "purple": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI purple."
-                },
-                "red": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI red."
-                },
-                "white": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI white."
-                },
-                "yellow": {
-                  "$ref": "#/definitions/Color",
-                  "description": "Sets the color used as ANSI yellow."
-                }
-              },
-              "type": "object"
-            },
-            "type": "array"
-          },
-          "commandline": {
-            "description": "Executable used in the profile.",
-            "type": "string"
-          },
-          "connectionType": {
-            "$ref": "#/definitions/ProfileGuid",
-            "description": "A GUID reference to a connection type. Currently undocumented as of 0.3, this is used for Azure Cloud Shell"
-          },
-          "cursorColor": {
-            "$ref": "#/definitions/Color",
-            "default": "#FFFFFF",
-            "description": "Sets the cursor color for the profile. Uses hex color format: \"#rrggbb\"."
-          },
-          "cursorHeight": {
-            "description": "Sets the percentage height of the cursor starting from the bottom. Only works when cursorShape is set to \"vintage\". Accepts values from 25-100.",
-            "maximum": 100,
-            "minimum": 25,
-            "type": "integer"
-          },
-          "cursorShape": {
-            "default": "bar",
-            "description": "Sets the cursor shape for the profile. Possible values: \"vintage\" ( ▃ ), \"bar\" ( ┃, default ), \"underscore\" ( ▁ ), \"filledBox\" ( █ ), \"emptyBox\" ( ▯ )",
-            "enum": [
-              "bar",
-              "emptyBox",
-              "filledBox",
-              "underscore",
-              "vintage"
-            ],
-            "type": "string"
-          },
-          "fontFace": {
-            "default": "Consolas",
-            "description": "Name of the font face used in the profile.",
-            "type": "string"
-          },
-          "fontSize": {
-            "default": 12,
-            "description": "Sets the font size.",
-            "minimum": 1,
-            "type": "integer"
-          },
-          "foreground": {
-            "$ref": "#/definitions/Color",
-            "description": "Sets the foreground color of the profile. Overrides foreground set in color scheme if colorscheme is set. Uses hex color format: \"#rrggbb\". Default \"#ffffff\" (white).",
-            "type": ["string", "null"]
-          },
-          "guid": {
-            "$ref": "#/definitions/ProfileGuid",
-            "description": "Unique identifier of the profile. Written in registry format: \"{00000000-0000-0000-0000-000000000000}\"."
-          },
-          "hidden": {
-            "default": false,
-            "description": "If set to true, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamicially generated profiles, while leaving them in your settings file.",
-            "type": "boolean"
-          },
-          "historySize": {
-            "default": 9001,
-            "description": "The number of lines above the ones displayed in the window you can scroll back to.",
-            "minimum": -1,
-            "type": "integer"
-          },
-          "icon": {
-            "description": "Image file location of the icon used in the profile. Displays within the tab and the dropdown menu.",
-            "type": "string"
-          },
-          "name": {
-            "description": "Name of the profile. Displays in the dropdown menu.",
-            "minLength": 1,
-            "type": "string"
-          },
-          "padding": {
-            "default": "8, 8, 8, 8",
-            "description": "Sets the padding around the text within the window. Can have three different formats: \"#\" sets the same padding for all sides, \"#, #\" sets the same padding for left-right and top-bottom, and \"#, #, #, #\" sets the padding individually for left, top, right, and bottom.",
-            "pattern": "^-?[0-9]+(\\.[0-9]+)?( *, *-?[0-9]+(\\.[0-9]+)?|( *, *-?[0-9]+(\\.[0-9]+)?){3})?$",
-            "type": "string"
-          },
-          "scrollbarState": {
-            "default": "visible",
-            "description": "Defines the visibility of the scrollbar.",
-            "enum": [
-              "visible",
-              "hidden"
-            ],
-            "type": "string"
-          },
-          "selectionBackground": {
-            "$ref": "#/definitions/Color",
-            "description": "Sets the selection background color of the profile. Overrides selection background set in color scheme if colorscheme is set. Uses hex color format: \"#rrggbb\"."
-          },
-          "snapOnInput": {
-            "default": true,
-            "description": "When set to true, the window will scroll to the command input line when typing. When set to false, the window will not scroll when you start typing.",
-            "type": "boolean"
-          },
-          "source": {
-            "description": "Stores the name of the profile generator that originated this profile.",
-            "type": "string"
-          },
-          "startingDirectory": {
-            "description": "The directory the shell starts in when it is loaded.",
-            "type": "string"
-          },
-          "suppressApplicationTitle": {
-            "description": "When set to `true`, `tabTitle` overrides the default title of the tab and any title change messages from the application will be suppressed. When set to `false`, `tabTitle` behaves as normal.",
-            "type": "boolean"
-          },
-          "tabTitle": {
-            "description": "If set, will replace the name as the title to pass to the shell on startup. Some shells (like bash) may choose to ignore this initial value, while others (cmd, powershell) may use this value over the lifetime of the application.",
-            "type": "string"
-          },
-          "useAcrylic": {
-            "default": false,
-            "description": "When set to true, the window will have an acrylic background. When set to false, the window will have a plain, untextured background.",
-            "type": "boolean"
-          }
+    "Profile": {
+      "description": "Properties specific to a unique profile.",
+      "additionalProperties": false,
+      "properties": {
+        "acrylicOpacity": {
+          "default": 0.5,
+          "description": "When useAcrylic is set to true, it sets the transparency of the window for the profile. Accepts floating point values from 0-1 (default 0.5).",
+          "maximum": 1,
+          "minimum": 0,
+          "type": "number"
        },
+        "background": {
+          "$ref": "#/definitions/Color",
+          "description": "Sets the background color of the profile. Overrides background set in color scheme if colorscheme is set. Uses hex color format: \"#rrggbb\". Default \"#000000\" (black).",
+          "type": ["string", "null"]
+        },
+        "backgroundImage": {
+          "description": "Sets the file location of the Image to draw over the window background.",
+          "type": "string"
+        },
+        "backgroundImageAlignment": {
+          "default": "center",
+          "enum": [
+            "bottom",
+            "bottomLeft",
+            "bottomRight",
+            "center",
+            "left",
+            "right",
+            "top",
+            "topLeft",
+            "topRight"
+          ],
+          "type": "string"
+        },
+        "backgroundImageOpacity": {
+          "description": "(Not in SettingsSchema.md)",
+          "maximum": 1,
+          "minimum": 0,
+          "type": "number"
+        },
+        "backgroundImageStretchMode": {
+          "default": "uniformToFill",
+          "description": "Sets how the background image is resized to fill the window.",
+          "enum": [
+            "fill",
+            "none",
+            "uniform",
+            "uniformToFill"
+          ],
+          "type": "string"
+        },
+        "closeOnExit": {
+          "default": "graceful",
+          "description": "Sets how the profile reacts to termination or failure to launch. Possible values: \"graceful\" (close when exit is typed or the process exits normally), \"always\" (always close) and \"never\" (never close). true and false are accepted as synonyms for \"graceful\" and \"never\" respectively.",
+          "oneOf": [
+            {
+              "enum": [
+                "never",
+                "graceful",
+                "always"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
+        "colorScheme": {
+          "default": "Campbell",
+          "description": "Name of the terminal color scheme to use. Color schemes are defined under \"schemes\".",
+          "type": "string"
+        },
+        "colorTable": {
+          "description": "Array of colors used in the profile if colorscheme is not set. Colors use hex color format: \"#rrggbb\". Ordering is as follows: [black, red, green, yellow, blue, magenta, cyan, white, bright black, bright red, bright green, bright yellow, bright blue, bright magenta, bright cyan, bright white]",
+          "items": {
+            "additionalProperties": false,
+            "properties": {
+              "background": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the background color of the color table."
+              },
+              "black": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI black."
+              },
+              "blue": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI blue."
+              },
+              "brightBlack": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI bright black."
+              },
+              "brightBlue": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI bright blue."
+              },
+              "brightCyan": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI bright cyan."
+              },
+              "brightGreen": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI bright green."
+              },
+              "brightPurple": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI bright purple."
+              },
+              "brightRed": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI bright red."
+              },
+              "brightWhite": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI bright white."
+              },
+              "brightYellow": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI bright yellow."
+              },
+              "cyan": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI cyan."
+              },
+              "foreground": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the foreground color of the color table."
+              },
+              "green": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI green."
+              },
+              "purple": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI purple."
+              },
+              "red": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI red."
+              },
+              "white": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI white."
+              },
+              "yellow": {
+                "$ref": "#/definitions/Color",
+                "description": "Sets the color used as ANSI yellow."
+              }
+            },
+            "type": "object"
+          },
+          "type": "array"
+        },
+        "commandline": {
+          "description": "Executable used in the profile.",
+          "type": "string"
+        },
+        "connectionType": {
+          "$ref": "#/definitions/ProfileGuid",
+          "description": "A GUID reference to a connection type. Currently undocumented as of 0.3, this is used for Azure Cloud Shell"
+        },
+        "cursorColor": {
+          "$ref": "#/definitions/Color",
+          "default": "#FFFFFF",
+          "description": "Sets the cursor color for the profile. Uses hex color format: \"#rrggbb\"."
+        },
+        "cursorHeight": {
+          "description": "Sets the percentage height of the cursor starting from the bottom. Only works when cursorShape is set to \"vintage\". Accepts values from 25-100.",
+          "maximum": 100,
+          "minimum": 25,
+          "type": "integer"
+        },
+        "cursorShape": {
+          "default": "bar",
+          "description": "Sets the cursor shape for the profile. Possible values: \"vintage\" ( ▃ ), \"bar\" ( ┃, default ), \"underscore\" ( ▁ ), \"filledBox\" ( █ ), \"emptyBox\" ( ▯ )",
+          "enum": [
+            "bar",
+            "emptyBox",
+            "filledBox",
+            "underscore",
+            "vintage"
+          ],
+          "type": "string"
+        },
+        "experimental.retroTerminalEffect": {
+          "description": "When set to true, enable retro terminal effects. This is an experimental feature, and its continued existence is not guaranteed.",
+          "type": "boolean"
+        },
+        "fontFace": {
+          "default": "Consolas",
+          "description": "Name of the font face used in the profile.",
+          "type": "string"
+        },
+        "fontSize": {
+          "default": 12,
+          "description": "Sets the font size.",
+          "minimum": 1,
+          "type": "integer"
+        },
+        "foreground": {
+          "$ref": "#/definitions/Color",
+          "description": "Sets the foreground color of the profile. Overrides foreground set in color scheme if colorscheme is set. Uses hex color format: \"#rrggbb\". Default \"#ffffff\" (white).",
+          "type": ["string", "null"]
+        },
+        "guid": {
+          "$ref": "#/definitions/ProfileGuid",
+          "description": "Unique identifier of the profile. Written in registry format: \"{00000000-0000-0000-0000-000000000000}\"."
+        },
+        "hidden": {
+          "default": false,
+          "description": "If set to true, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamicially generated profiles, while leaving them in your settings file.",
+          "type": "boolean"
+        },
+        "historySize": {
+          "default": 9001,
+          "description": "The number of lines above the ones displayed in the window you can scroll back to.",
+          "minimum": -1,
+          "type": "integer"
+        },
+        "icon": {
+          "description": "Image file location of the icon used in the profile. Displays within the tab and the dropdown menu.",
+          "type": "string"
+        },
+        "name": {
+          "description": "Name of the profile. Displays in the dropdown menu.",
+          "minLength": 1,
+          "type": "string"
+        },
+        "padding": {
+          "default": "8, 8, 8, 8",
+          "description": "Sets the padding around the text within the window. Can have three different formats: \"#\" sets the same padding for all sides, \"#, #\" sets the same padding for left-right and top-bottom, and \"#, #, #, #\" sets the padding individually for left, top, right, and bottom.",
+          "pattern": "^-?[0-9]+(\\.[0-9]+)?( *, *-?[0-9]+(\\.[0-9]+)?|( *, *-?[0-9]+(\\.[0-9]+)?){3})?$",
+          "type": "string"
+        },
+        "scrollbarState": {
+          "default": "visible",
+          "description": "Defines the visibility of the scrollbar.",
+          "enum": [
+            "visible",
+            "hidden"
+          ],
+          "type": "string"
+        },
+        "selectionBackground": {
+          "$ref": "#/definitions/Color",
+          "description": "Sets the selection background color of the profile. Overrides selection background set in color scheme if colorscheme is set. Uses hex color format: \"#rrggbb\"."
+        },
+        "snapOnInput": {
+          "default": true,
+          "description": "When set to true, the window will scroll to the command input line when typing. When set to false, the window will not scroll when you start typing.",
+          "type": "boolean"
+        },
+        "source": {
+          "description": "Stores the name of the profile generator that originated this profile.",
+          "type": "string"
+        },
+        "startingDirectory": {
+          "description": "The directory the shell starts in when it is loaded.",
+          "type": "string"
+        },
+        "suppressApplicationTitle": {
+          "description": "When set to `true`, `tabTitle` overrides the default title of the tab and any title change messages from the application will be suppressed. When set to `false`, `tabTitle` behaves as normal.",
+          "type": "boolean"
+        },
+        "tabTitle": {
+          "description": "If set, will replace the name as the title to pass to the shell on startup. Some shells (like bash) may choose to ignore this initial value, while others (cmd, powershell) may use this value over the lifetime of the application.",
+          "type": "string"
+        },
+        "useAcrylic": {
+          "default": false,
+          "description": "When set to true, the window will have an acrylic background. When set to false, the window will have a plain, untextured background.",
+          "type": "boolean"
+        }
+      },
+      "type": "object"
+    },
+    "ProfileList": {
+      "description": "A list of profiles and the properties specific to each.",
+      "items": {
+        "$ref": "#/definitions/Profile",
        "required": [
          "guid",
          "name"
-        ],
-        "type": "object"
+        ]
      },
      "type": "array"
    },
+    "ProfilesObject": {
+      "description": "A list of profiles and default settings that apply to all of them",
+      "properties": {
+        "list": {
+          "$ref": "#/definitions/ProfileList"
+        },
+        "defaults": {
+          "description": "The default settings that apply to every profile.",
+          "$ref": "#/definitions/Profile"
+        }
+      },
+      "type": "object"
+    },
    "SchemeList": {
      "description": "Properties are specific to each color scheme. ColorTool is a great tool you can use to create and explore new color schemes. All colors use hex color format.",
      "items": {
@@ -642,7 +724,12 @@
        {
          "additionalItems": true,
          "properties": {
-            "profiles": { "$ref": "#/definitions/ProfileList" },
+            "profiles": {
+              "oneOf": [
+              { "$ref": "#/definitions/ProfileList" },
+              { "$ref": "#/definitions/ProfilesObject" }
+              ]
+            },
            "schemes": { "$ref": "#/definitions/SchemeList" }
          },
          "required": [
@@ -657,7 +744,12 @@
      "additionalItems": false,
      "properties": {
        "globals": { "$ref": "#/definitions/Globals" },
-        "profiles": { "$ref": "#/definitions/ProfileList" },
+        "profiles": {
+          "oneOf": [
+          { "$ref": "#/definitions/ProfileList" },
+          { "$ref": "#/definitions/ProfilesObject" }
+          ]
+        },
        "schemes": { "$ref": "#/definitions/SchemeList" }
      },
      "required": [
--- a/doc/specs/#2325
+++ b/doc/specs/#2325
@@ -0,0 +1,346 @@
+---
+author: Mike Griese @zadjii-msft
+created on: 2019-11-13
+last updated: 2019-12-05
+issue id: #2325
+---
+
+# Default Profile Settings
+
+## Abstract
+
+Oftentimes, users have some common settings that they'd like applied to all of
+their profiles, without needing to manually edit the settings of each of them.
+This doc will cover some of the many proposals on how to expose that
+functionality to the user in our JSON settings model. In this first document,
+we'll examine a number of proposed solutions, as well as state our finalized
+design.
+
+## Inspiration
+
+During the course of the pull request review on [#3369], the original pull
+request for this feature's implementation, it became apparent that the entire
+team has differing opinions on how this feature should be exposed to the user.
+This doc is born from that discussion.
+
+## Solution Proposals
+
+The following are a number of different proposals of different ways to achieve
+the proposed functionality:
+
+1. [`defaultSettings` Profile object in the global settings](#proposal-1-defaultsettings-profile-object-in-the-global-settings)
+2. [`__default__` Profile object in the user's profiles](#proposal-2-__default__-profile-object-in-the-users-profiles)
+3. [Change `profiles` to an object with a `list` of profiles and a `defaults`](#proposal-3-change-profiles-to-an-object-with-a-list-of-profiles-and-a-defaults-object)
+   object
+4. [`inheritFrom` in profiles](#proposal-4-inheritfrom-in-profiles)
+
+### Proposal 1: `defaultSettings` Profile object in the global settings
+
+```json
+{
+    "$schema": "https://aka.ms/terminal-profiles-schema",
+    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+    "defaultSettings":
+    {
+        "useAcrylic": true,
+        "acrylicOpacity": 0.1,
+        "fontFace": "Cascadia Code",
+        "fontSize": 10
+    },
+    "requestedTheme" : "dark",
+    "showTabsInTitlebar" : true,
+    "profiles":
+    [
+        {
+            "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+            "name": "Windows PowerShell",
+            "commandline": "powershell.exe",
+            "hidden": false
+        },
+        {
+            "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+            "name": "cmd",
+            "commandline": "cmd.exe",
+            "hidden": false
+        }
+    ],
+    "schemes": [],
+    "keybindings": []
+}
+```
+#### Benefits
+
+##### Clearly encapsulates the default profile settings
+Puts all the default profiles settings in one object. It's immediately obvious
+when scanning the file where the defaults are.
+
+##### Simple to understand
+There's one object that applies to all the subsequent profiles, and that
+object is the `defaultSettings` object.
+
+#### Concerns
+
+##### What do we name this setting?
+People were concerned about the naming of this property. No one has a name that
+we're quite happy with:
+
+* `defaultSettings`: This kinda seems to conflict conceptually with
+  "defaults.json". It's different, but is that obvious?
+* `defaultProfileSettings`: Implies "settings of the default profile"
+* `defaults`: This kinda seems to conflict conceptually with "defaults.json"
+* `baseProfileSettings`: not the worst, but not terribly intuitive
+* Others considered with less enthusiasm
+    - `profiles.defaults`: people don't love the idea of a `.`, but hey, VsCode does it.
+    - `inheritedSettings`
+    - `rootSettings`
+    - `globalSettings`: again maybe conflicts a bit with other concepts/properties
+    - `profileSettings`
+    - `profilePrototype`
+
+##### Why is there this random floating profile in the global settings?
+
+Users may be confused about the purpose of this random `Profile` that's in the
+globals. What's that profile doing there? Is _it_ the default profile?
+
+### Proposal 2: `__default__` Profile object in the user's profiles
+```json
+{
+    "$schema": "https://aka.ms/terminal-profiles-schema",
+    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+    "requestedTheme" : "dark",
+    "showTabsInTitlebar" : true,
+    "profiles":
+    [
+        {
+            "guid": "__default__",
+            "useAcrylic": true,
+            "acrylicOpacity": 0.1,
+            "fontFace": "Cascadia Code",
+            "fontSize": 10
+        },
+        {
+            "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+            "name": "Windows PowerShell",
+            "commandline": "powershell.exe",
+            "hidden": false
+        },
+        {
+            "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+            "name": "cmd",
+            "commandline": "cmd.exe",
+            "hidden": false
+        }
+    ],
+    "schemes": [],
+    "keybindings": []
+}
+```
+
+#### Benefits
+##### Encapsulates the default profile settings
+Puts all the default profiles settings in one object. Probably not as clear as
+proposal 1, since it could be _anywhere_ in the list of profiles.
+
+##### Groups default profile settings with profiles
+In this proposal, the default profile is grouped into the same list of objects
+as the other profiles. All the profiles, and the defaults are all under the
+`"profiles"` object. Makes sense.
+
+#### Concerns
+##### Mysterious `__defaults__` GUID
+The only way to _definitively_ identify that this profile is special is by
+giving it a constant string. This string is _not_ a guid, which again, would be
+obvious.
+
+##### Unintuitive
+Adding a profile that has a mysterious `guid` value use that profile as the
+"defaults" is _very_ unintuitive. Nothing aside from documentation would
+indicate to the user "hey, add this magic profile blob to use as defaults across
+all your profiles".
+
+##### Why does this one profile object apply to all the others
+It might be unintuitive that one profile from the list of profiles affects all
+the others.
+
+### Proposal 3: Change `profiles` to an object with a `list` of profiles and a `defaults` object
+
+```json
+{
+    "$schema": "https://aka.ms/terminal-profiles-schema",
+    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+    "requestedTheme" : "dark",
+    "showTabsInTitlebar" : true,
+    "profiles":
+    {
+        "defaults": {
+            "useAcrylic": true,
+            "acrylicOpacity": 0.1,
+            "fontFace": "Cascadia Code",
+            "fontSize": 10
+        },
+        "list":[
+            {
+                "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+                "name": "Windows PowerShell",
+                "commandline": "powershell.exe",
+                "hidden": false
+            },
+            {
+                "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+                "name": "cmd",
+                "commandline": "cmd.exe",
+                "hidden": false
+            }
+        ]
+    },
+    "schemes": [],
+    "keybindings": []
+}
+```
+
+#### Benefits
+##### Groups default profile settings with profiles
+In this proposal, the default profile is grouped into the same object as the
+list of profiles. All the profiles, and the defaults are all under the
+`"profiles"` object. Makes sense.
+
+##### Backwards compatible
+Fortunately, we can add this functionality _without breaking the existing
+schema_. With Jsoncpp, we can determine at runtime if an object is an _array_ or
+an _object_. If it's an array, we can fall back to the current behavior, safe in
+our knowledge that there's no defaults object. If the object is an array
+however, we can then dig into the object to find the default profile and the
+list of profiles.
+
+#### Concerns
+##### Substantial schema change
+This is a pretty big delta to the settings schema. Instead of using `profiles`
+as a list of `Profile` objects, it instead becomes an object, with a list inside
+it.
+
+As noted above, we could gracefully upgrade this. If the `profiles` object is a
+list, then we can assume there's no `defaults`. This ensures that user's current
+settings files don't break. This is not a major problem.
+
+##### Adds another level of indentation to all profiles
+Some people just hate having things indented this much. 4 layers of indentation
+is quite a lot.
+
+### Proposal 4: `inheritFrom` in profiles
+
+```json
+{
+    "$schema": "https://aka.ms/terminal-profiles-schema",
+    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+    "requestedTheme" : "dark",
+    "showTabsInTitlebar" : true,
+    "profiles":
+    [
+        {
+            "guid": "{11111111-1111-1111-1111-111111111111}",
+            "hidden": true,
+            "useAcrylic": true,
+            "acrylicOpacity": 0.1,
+            "fontFace": "Cascadia Code",
+            "fontSize": 10
+        },
+        {
+            "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+            "inheritFrom": "{11111111-1111-1111-1111-111111111111}",
+            "name": "Windows PowerShell",
+            "commandline": "powershell.exe",
+            "hidden": false
+        },
+        {
+            "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+            "inheritFrom": "{11111111-1111-1111-1111-111111111111}",
+            "name": "cmd",
+            "commandline": "cmd.exe",
+            "hidden": false
+        },
+        {
+            "guid": "{0caa0dad-ffff-5f56-a8ff-afceeeaa6101}",
+            "inheritFrom": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+            "name": "This is another CMD",
+            "commandline": "cmd.exe /c myCoolScript.bat",
+            "hidden": false
+        }
+    ],
+    "schemes": [],
+    "keybindings": []
+}
+```
+
+#### Benefits
+
+##### Matches the existing settings model without major refactoring
+Simply adding a new property to `Profile` would not majorly alter the structure
+of the file.
+
+##### Property name is unique
+`inheritFrom` is very unique relative to other keys we already have.
+
+##### Powerful
+This lets the user have potentially many layers of settings grouping. hese
+layers would let the user seperate out common settings however they like,
+without forcing them to a single "default" profile. They could potentially have
+many "default" profiles, e.g.
+* one that's used for all their WSL profiles, with `startingDirectory` set to
+  `~` and `fontFace` set to "Ubuntu Mono"
+* One that's used for all their powershell profiles
+
+etc.
+
+#### Concerns
+
+##### GUIDs are not human friendly
+
+Using the guid in the `inheritFrom` field is the only way to be sure we're
+uniquely identifying profiles. However, guids are notoriously un-friendly. The
+above example manually uses `"{11111111-1111-1111-1111-111111111111}"` as the
+guid of the "default" profile, but inheriting from other profiles with "real"
+GUIDs would be less understandable. Consider the "This is another CMD" case,
+where it's inheriting from the "cmd" profile. That `"inheritFrom"` value does
+not mean at a quick glance "cmd".
+
+##### We have to make sure that there are no cycles as we're layering
+
+This is mostly a technical challenge, but this does make the implementation a
+bit trickier.
+
+##### How does this work with the settings UI?
+
+When the user edits settings for a profile with the UI, do we only place the
+changes in the top-most profile?
+
+How do we communicate in the UI that a profile is inheriting settings from other
+profiles?
+
+##### Harder to mentally parse
+Maybe not as easy to mentally picture how one profile inherits from another. The
+user would probably need to manually build the tree of profile inheritance in
+their own head to understand how a profile gets its settings.
+
+## Conclusions
+
+After discussion the available options, the team has settled on proposal 3. The
+major selling points being:
+* It groups the new "default profile settings" with the rest of the profile
+  settings
+* While being a schema change, it's not a _breaking_ schema change.
+* When looking at the settings, it's easy to understand how they're related
+
+We also like the idea of proposal 4, but felt that it was too heavy-handed of an
+approach for this relatively simple feature. It's been added to the backlog of
+terminal features, tracked in [#3818].
+
+## Resources
+
+* Default Profile for Common Profile Settings (the original issue) [#2325]
+* Add support for "User Default" settings (the original PR) [#3369]
+* Add support for inheriting and overriding another profile's settings [#3818]
+
+<!-- Footnotes -->
+[#2325]: https://github.com/microsoft/terminal/issues/2325
+[#3369]: https://github.com/microsoft/terminal/pull/3369
+[#3818]: https://github.com/microsoft/terminal/issues/3818
--- a/Search/images/SearchBoxControl.png
+++ b/Search/images/SearchBoxControl.png
--- a/Search/images/SearchBoxControlNoEnoughWidth.png
+++ b/Search/images/SearchBoxControlNoEnoughWidth.png
--- a/Search/images/SearchBoxUpSelected.png
+++ b/Search/images/SearchBoxUpSelected.png
--- a/Search/spec.md
+++ b/Search/spec.md
@@ -0,0 +1,126 @@
+---
+author: Kaiyu Wang KaiyuWang16
+created on: 2019-12-10
+last updated: 2019-12-10
+issue id: #605
+---
+
+# Search in Terminal
+
+## Abstract
+
+This spec is for feature request #605 "Search". It goes over the details of a new feature that allows users to search text in Terminal, within one tab or from all tabs. Expected behavior and design of this feature is included. Besides, future possible follow-up works are also addressed. 
+
+## Inspiration
+
+One of the superior features of iTerm2 is it's content search. The search comes in two variants: search from active tab and search from all tabs. In almost any editor, there is an roughly equivalent string search. We also want to realize search experience in Terminal. There will be two variants, search within one tab or from multiple tabs. We will start with one-tab search implementation. 
+
+## Solution Design
+
+Our ultimate goal is to provide both search within one tab and search from all tabs experiences. But we can start with one-tab search. The search experience should have following features:
+
+1. The search is triggered by KeyBindings. A new setting property named "find" will be enabled in the Json file. The user can set their own key bindings for search. The default is <kbd>ctrl+shift+f</kbd>. 
+2. The user search in a XAML TextBox, which is contained in a custom `SearchBoxControl`. The default position of the search box is the top right corner.
+3. We can have multiple search methods. The simplest one is exact text match. Other match methods include case-sensitive exact match and regex match. In the first phase, we will focus on case sensitive/insensitive text exact match. 
+4. If currently there is no active selection, the search starts from the last line of the mutableViewport. If there is an active selection, we start from the previous or the next text of the selected text. We automatically go around if we reach the start point of the search.
+5. The user should be able to fully interact with the terminal when the search box is on screen. 
+6. For accessibility concerns, the user should be able to navigate all the interactive elements on the search box using keyboard tab if the search box is focused. Searchbox could be created and closed with keyboard bindings. Close is usually bound to Esc.
+
+Conhost already has a module for search. It implements case sensitive or insensitive exact text match search, and it provides methods to select the found word. However, we want to make search as a shared component between Terminal and Console host. Now search module is part of Conhost, and its dependencies include BufferOut and some other types in ConHost such as SCREEN_INFORMATION. In order to make Search a shared component, we need to remove its dependency on ConHost types. BufferOut is already a shared component, but we need to make sure there is no other Conhost dependency.
+
+We will create a `SearchBoxControl` Xaml `UserControl` element. When a search process begins, a `SearchBoxControl` object will be created and attached to `TermControl` root grid. In other words, one SearchBox is added for each `TermControl`. The reasons for this design is:
+
+1. Each `TermControl` object is a Terminal Window and has a individual text buffer. In phase 1 we are going to search witin the current terminal text buffer. 
+2. If we put the search box under TerminalApp, then the search can only happen on the current focused Terminal. 
+3. If the community does not like the current design, we can lift SearchBox to a higher level. 
+
+### Search process implementation
+1. Once the user press <kbd>ctrl+shift+f</kbd> (or user's custom key binding), a new `SearchBoxControl` object will be created and attached as a child of `TermControl`. Focus will move to the TextBox within the `SearchBoxControl`. 
+2. Search is performed on a XAML TextBox. Once the user presses Enter or click up/down arrow button, we start to search from the last line of the current viewport or the current selection, and try to find the exact text in the text buffer. The nearest searched one will be selected. Then the search start point will be set to the selected text. The next search will start before or after the previous searched text.
+3. We re-use the Search module in conhost. It performs the search in a brute-force approach. Starting from every position in the text buffer, the search algorithm compares the span of the searched string with buffer characters, and if the current buffer text matches the whole string, it will return store the position of the text in the buffer and return. The stored position information will be used for selection. 
+3. The user can choose to search up or down. Search module realizes this, we just need to set a boolean flag. Default is search up. 
+4. The user can choose to do case sensitive or insensitive match. This also realized by Search module by setting a boolean flag. Default is search case-insensitively. 
+5. Tab navigation is realized by XAML. We just need to set TabNavigation="Cycle" in `SearchBoxControl`. 
+6. If the user clicks on the "X" button or press <kbd>Esc</kbd>, the search box will disappear and the object will be destructed and detached from the `TermControl` XAML tree. In phase one we do not store any state. 
+7. We need to guarantee full interaction with the terminal when the search box is open. To achieve this, search box and terminal input should be separated. If the current keyboard focus is on the search box, then keydown events will be handled on "search box level". 
+
+## UI/UX Design
+
+![SearchBox mockup](images/SearchBoxControl.png)
+
+Above is the `SearchBoxControl` in dark theme and light theme.
+  - The two buttons with up/down arrows controls the search direction, Each button will be styled to indicate which search direction is currently selected. 
+  - The button with a "Aa" icon, if pressed, means that we are searching case-sensitivily. 
+  - The current style puts all elements - the `X` button, the text box and the search pattern control buttons on one single line. This ensures that the `SearchBoxControl` won't be too high and block terminal text. This is similar with VSCode. Another possible layout style is to put elements in multiple layers. This will occupy more lines, but the search dialog will narrower. Considering that there is not many elements, we do not need multiple layers. 
+
+![SearchBox mockup, arrow button clicked](images/SearchBoxUpSelected.png)
+
+The search box defaults to be on the top right corner of the Terminal window. If the current tab is split into panes, each pane will have a individual searchbox. 
+
+#### Search process
+1. The user presses <kbd>ctrl+shift+f</kbd> (or user's custom key binding) to open the search box. Focus will move to the TextBox. 
+2. Search is performed on a XAML TextBox. Once the user presses Enter or click up/down arrow button, the search starts and searched text will be selected. Next search will be performed beginning from the current selection and go towards up/down. 
+3. The user can choose to search up or down by selecting up arrow or down arrow buttons. The chosen button will be styled to indicate it is selected. If the user does not click the arrows buttons, the default direction is up. 
+4. The user can choose to do case sensitive or insensitive match by checking a check box. The default is case insensitive. 
+5. If the search box is focused, the user can navigate all the elements on the search box using tab. When selected, press Enter equals to click. 
+6. If the user click the "X" button or press <kbd>Esc</kbd>, the search stopped and the search box disappears and focus will move back to Terminal.
+7. Once the search box is closed (exiting search mode), the selection will still be there. This coincides with the current VS Code and cmd experience. To get rid of the selection, the user can just click other area of the window.
+8. If the user clicks on the terminal when the search box is open, it will draw focus back to the terminal from the search box. The search box will still stay open. 
+9. The user can interact with the terminal when the search box is open, which means that the user can scroll the terminal content, or input text when the focus is on the terminal control. 
+10. If the user switches tabs while the search box is open, the focus will be moved back to the terminal. 
+
+## Capabilities
+
+1. The user can search exact matched text in the text buffer of the Terminal Screen. 
+2. The user can choose to search case sensitively and insensitively. 
+3. The user can search up or down. 
+4. Found text will be selected. 
+5. The search will start from the active selected text (inclusive) if there is one, or the end of the written text. 
+6. The search will automatically go around when it reaches the starting point.
+7. The user can use Tab to navigate all the elements in the search box. 
+8. The user can search in the opposite direction with <kbd>Shift + Enter</kbd> 
+
+### Accessibility
+
+The user should be able to use search by keyboard only.
+Once the searchbox is focused, the user can navigate between elements in the search box using Tab. And "click" using Enter. 
+
+### Security
+
+This feature should not introduce any new security issues.
+
+### Reliability
+
+1. The key input of Terminal command line and the search box should be separated. Search box should not block interaction with the command line when it is open. 
+2. The search box should not block too much text. The search box only occupies one line, so it won't have big impact on the readibility of the terminal output. 
+
+### Compatibility
+
+This feature won't break existing features of Terminal.
+
+### Performance, Power, and Efficiency
+
+This feature only launches in need. It does not impact the performance of Terminal. 
+
+## Potential Issues
+                                                              
+1. If the terminal window is not wide enough for the search box to be visible, the buttons on the right of the `TextBox` will become invisible, but the `TextBox` is still visible and the window could not be narrower than the `TextBox`. This is similar to the behavior of other editors. Please see the image below:
+   ![SearchBox width not enough](images/SearchBoxControlNoEnoughWidth.png)
+2. If the terminal window is not high enough for the search box to be visible, the whole terminal screen, inlcuding the `SearchBoxControl` can disappear. This is similar to the behavior of other editors.
+
+## Future considerations
+
+In version 1, we want realize a case sensitive/insensitive exact text match. But we may consider the following features in version 2:
+
+1. Add "Find" button in dropdown menu to trigger search. This enables the search feature to be operated with mouse only. However, this is not required by Accessibility so we do not cover this in phase one. 
+2. Search from all tabs. For Version 1 we just want to realize search within one tab. However, the community also requests search from all tabs. This may require a big change to the search algorithm, but it is not seen as a popular use scenario, so we put it future phase. To implement multi-tab search, we can let TerminalPage or App own a `SearchBoxControl` object, and provide the text buffer of the current focused terminal. We need to change the search algorithm.  
+3. Regular expression match. This is a useful search pattern and is implemented in some editors. However, this use scenario is not used as much as exact text search, thus, we put it in future phase.
+4. Search history. Sometimes users would do the same search for several times, thus, storing the search history is useful. This is not realized by VSCode so it would be a good highlighting point in the future. 
+5. High-light while you type. Emphasizing all the other matches in the buffer with an outline or selection with another color. This provides a clearer view of searched text. But we need to change the search and selection algorithm, so we put it in the future phase. 
+6. Add size handle. Some text editors let the user resize the search box, and there is a size handle on the left side of the search box. This helps user when they search for long text. If the community desires it we may add a similar feature.
+
+This open issue tracks the phase features of Search: https://github.com/microsoft/terminal/issues/3920
+
+## Resources
+
+Github Issue: https://github.com/microsoft/terminal/issues/605
--- a/doc/user-docs/UsingJsonSettings.md
+++ b/doc/user-docs/UsingJsonSettings.md
@@ -72,6 +72,24 @@ For example, here's a sample of the default keybindings:

 ```

+### Unbinding keys
+
+If you ever come across a key binding that you're unhappy with, it's possible to
+easily change the keybindings. For example, vim uses <kbd>Ctrl+^</kbd> as a
+binding for "switch to previous buffer", which conflicts with the Terminal's
+default keybinding for "open a new tab with the sixth profile". If you'd like to
+unbind that keybinding, and allow the keystroke to fall through to vim, you can
+add the following to your keybindings:
+
+```json
+{
+    "command" : null, "keys" : ["ctrl+shift+6"]
+},
+```
+
+This will _unbind_ <kbd>Ctrl+Shift+6</kbd>, allowing vim to use the keystroke
+instead of the terminal.
+
 ## Profiles

 A profile contains the settings applied when a new WT tab is opened. Each
@@ -162,7 +180,7 @@ would like to only change the color scheme of the default `cmd` profile to
        }
 ```

-Here, we're know we're changing the `cmd` profile, because the `guid`
+Here, we know we're changing the `cmd` profile, because the `guid`
 `"{0caa0dad-35be-5f56-a8ff-afceeeaa6101}"` is `cmd`'s unique GUID. Any profiles
 with that GUID will all be treated as the same object. Any changes in that
 profile will overwrite those from the defaults.
@@ -199,6 +217,119 @@ like to hide all the WSL profiles, you could add the following setting:

 ```

+### Default settings
+
+In [#2325](https://github.com/microsoft/terminal/issues/2325), we introduced the
+concept of "Default Profile Settings". These are settings that will apply to all
+of your profiles by default. Profiles can still override these settings
+individually. With default profile settings, you can easily make changes to all
+your profiles at once. For example, given the following settings:
+
+```json
+    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+    "profiles":
+    [
+        {
+            "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+            "name": "Windows PowerShell",
+            "commandline": "powershell.exe",
+            "fontFace": "Cascadia Code",
+            "fontSize": 14
+        },
+        {
+            "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+            "name": "cmd",
+            "commandline": "cmd.exe",
+            "fontFace": "Cascadia Code",
+            "fontSize": 14
+        },
+        {
+            "commandline" : "cmd.exe /k %CMDER_ROOT%\\vendor\\init.bat",
+            "name" : "cmder",
+            "startingDirectory" : "%USERPROFILE%",
+            "fontFace": "Cascadia Code",
+            "fontSize": 14
+        }
+    ],
+```
+
+All three of these profiles are using "Cascadia Code" as their `"fontFace"`, and
+14 as their `fontSize`. With default profile settings, you can easily set these
+properties for all your profiles, like so:
+
+```json
+    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+    "profiles": {
+        "defaults":
+        {
+            "fontFace": "Cascadia Code",
+            "fontSize": 14
+        },
+        "list": [
+            {
+                "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+                "name": "Windows PowerShell",
+                "commandline": "powershell.exe",
+            },
+            {
+                "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+                "name": "cmd",
+                "commandline": "cmd.exe"
+            },
+            {
+                "commandline" : "cmd.exe /k %CMDER_ROOT%\\vendor\\init.bat",
+                "name" : "cmder",
+                "startingDirectory" : "%USERPROFILE%"
+            }
+        ],
+    }
+```
+
+Note that the `profiles` property has changed in this example from a _list_ of
+profiles, to an _object_ with two properties:
+* a `list` that contains the list of all the profiles
+* the new `defaults` object, which contains all the settings that should apply to
+  every profile.
+
+What if I wanted a profile to have a different value for a property other than
+the default? Simply set the property in the profile's entry to override the
+value from `defaults`. Let's say you want the `cmd` profile to have _"Consolas"_
+as the font, but the rest of your profiles to still have _"Cascadia Code"_. You
+could achieve that with the following:
+
+```json
+    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+    "profiles": {
+        "defaults":
+        {
+            "fontFace": "Cascadia Code",
+            "fontSize": 14
+        },
+        "list": [
+            {
+                "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+                "name": "Windows PowerShell",
+                "commandline": "powershell.exe",
+            },
+            {
+                "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+                "name": "cmd",
+                "commandline": "cmd.exe",
+                "fontFace": "Consolas"
+            },
+            {
+                "commandline" : "cmd.exe /k %CMDER_ROOT%\\vendor\\init.bat",
+                "name" : "cmder",
+                "startingDirectory" : "%USERPROFILE%"
+            }
+        ],
+    }
+```
+
+In the above settings, the `"fontFace"` in the `cmd.exe` profile overrides the
+`"fontFace"` from the `defaults`.
+
+
 ## Configuration Examples:

 ### Add a custom background to the WSL Debian terminal profile
--- a/res/terminal/images-Dev/LargeTile.scale-100.png
+++ b/res/terminal/images-Dev/LargeTile.scale-100.png
--- a/res/terminal/images-Dev/LargeTile.scale-125.png
+++ b/res/terminal/images-Dev/LargeTile.scale-125.png
--- a/res/terminal/images-Dev/LargeTile.scale-150.png
+++ b/res/terminal/images-Dev/LargeTile.scale-150.png
--- a/res/terminal/images-Dev/LargeTile.scale-200.png
+++ b/res/terminal/images-Dev/LargeTile.scale-200.png
--- a/res/terminal/images-Dev/LargeTile.scale-400.png
+++ b/res/terminal/images-Dev/LargeTile.scale-400.png
--- a/res/terminal/images-Dev/LockScreenLogo.scale-100.png
+++ b/res/terminal/images-Dev/LockScreenLogo.scale-100.png
--- a/res/terminal/images-Dev/LockScreenLogo.scale-125.png
+++ b/res/terminal/images-Dev/LockScreenLogo.scale-125.png
--- a/res/terminal/images-Dev/LockScreenLogo.scale-150.png
+++ b/res/terminal/images-Dev/LockScreenLogo.scale-150.png
--- a/res/terminal/images-Dev/LockScreenLogo.scale-200.png
+++ b/res/terminal/images-Dev/LockScreenLogo.scale-200.png
--- a/res/terminal/images-Dev/LockScreenLogo.scale-400.png
+++ b/res/terminal/images-Dev/LockScreenLogo.scale-400.png
--- a/res/terminal/images-Dev/SmallTile.scale-100.png
+++ b/res/terminal/images-Dev/SmallTile.scale-100.png
--- a/res/terminal/images-Dev/SmallTile.scale-125.png
+++ b/res/terminal/images-Dev/SmallTile.scale-125.png
--- a/res/terminal/images-Dev/SmallTile.scale-150.png
+++ b/res/terminal/images-Dev/SmallTile.scale-150.png
--- a/res/terminal/images-Dev/SmallTile.scale-200.png
+++ b/res/terminal/images-Dev/SmallTile.scale-200.png
--- a/res/terminal/images-Dev/SmallTile.scale-400.png
+++ b/res/terminal/images-Dev/SmallTile.scale-400.png
--- a/res/terminal/images-Dev/SplashScreen.scale-100.png
+++ b/res/terminal/images-Dev/SplashScreen.scale-100.png
--- a/res/terminal/images-Dev/SplashScreen.scale-125.png
+++ b/res/terminal/images-Dev/SplashScreen.scale-125.png
--- a/res/terminal/images-Dev/SplashScreen.scale-150.png
+++ b/res/terminal/images-Dev/SplashScreen.scale-150.png
--- a/res/terminal/images-Dev/SplashScreen.scale-200.png
+++ b/res/terminal/images-Dev/SplashScreen.scale-200.png
--- a/res/terminal/images-Dev/SplashScreen.scale-400.png
+++ b/res/terminal/images-Dev/SplashScreen.scale-400.png
--- a/res/terminal/images-Dev/Square150x150Logo.scale-100.png
+++ b/res/terminal/images-Dev/Square150x150Logo.scale-100.png
--- a/res/terminal/images-Dev/Square150x150Logo.scale-125.png
+++ b/res/terminal/images-Dev/Square150x150Logo.scale-125.png
--- a/res/terminal/images-Dev/Square150x150Logo.scale-150.png
+++ b/res/terminal/images-Dev/Square150x150Logo.scale-150.png
--- a/res/terminal/images-Dev/Square150x150Logo.scale-200.png
+++ b/res/terminal/images-Dev/Square150x150Logo.scale-200.png
--- a/res/terminal/images-Dev/Square150x150Logo.scale-400.png
+++ b/res/terminal/images-Dev/Square150x150Logo.scale-400.png
--- a/res/terminal/images-Dev/Square44x44Logo.scale-100.png
+++ b/res/terminal/images-Dev/Square44x44Logo.scale-100.png
--- a/res/terminal/images-Dev/Square44x44Logo.scale-125.png
+++ b/res/terminal/images-Dev/Square44x44Logo.scale-125.png
--- a/res/terminal/images-Dev/Square44x44Logo.scale-150.png
+++ b/res/terminal/images-Dev/Square44x44Logo.scale-150.png
--- a/res/terminal/images-Dev/Square44x44Logo.scale-200.png
+++ b/res/terminal/images-Dev/Square44x44Logo.scale-200.png
--- a/res/terminal/images-Dev/Square44x44Logo.scale-400.png
+++ b/res/terminal/images-Dev/Square44x44Logo.scale-400.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-16.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-16.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-16_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-16_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-20.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-20.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-20_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-20_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-24.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-24.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-24_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-256.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-256.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-256_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-256_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-30.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-30.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-30_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-30_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-32.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-32.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-32_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-32_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-36.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-36.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-36_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-36_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-40.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-40.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-40_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-40_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-48.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-48.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-48_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-48_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-60.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-60.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-60_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-60_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-64.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-64.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-64_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-64_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-72.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-72.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-72_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-72_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-80.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-80.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-80_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-80_altform-unplated.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-96.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-96.png
--- a/res/terminal/images-Dev/Square44x44Logo.targetsize-96_altform-unplated.png
+++ b/res/terminal/images-Dev/Square44x44Logo.targetsize-96_altform-unplated.png
--- a/res/terminal/images-Dev/StoreLogo.scale-100.png
+++ b/res/terminal/images-Dev/StoreLogo.scale-100.png
--- a/res/terminal/images-Dev/StoreLogo.scale-125.png
+++ b/res/terminal/images-Dev/StoreLogo.scale-125.png
--- a/res/terminal/images-Dev/StoreLogo.scale-150.png
+++ b/res/terminal/images-Dev/StoreLogo.scale-150.png
--- a/res/terminal/images-Dev/StoreLogo.scale-200.png
+++ b/res/terminal/images-Dev/StoreLogo.scale-200.png
--- a/res/terminal/images-Dev/StoreLogo.scale-400.png
+++ b/res/terminal/images-Dev/StoreLogo.scale-400.png
--- a/res/terminal/images-Dev/Wide310x150Logo.scale-100.png
+++ b/res/terminal/images-Dev/Wide310x150Logo.scale-100.png
--- a/res/terminal/images-Dev/Wide310x150Logo.scale-125.png
+++ b/res/terminal/images-Dev/Wide310x150Logo.scale-125.png
--- a/res/terminal/images-Dev/Wide310x150Logo.scale-150.png
+++ b/res/terminal/images-Dev/Wide310x150Logo.scale-150.png
--- a/res/terminal/images-Dev/Wide310x150Logo.scale-200.png
+++ b/res/terminal/images-Dev/Wide310x150Logo.scale-200.png
--- a/res/terminal/images-Dev/Wide310x150Logo.scale-400.png
+++ b/res/terminal/images-Dev/Wide310x150Logo.scale-400.png
--- a/res/terminal/images-Universal/LargeTile.scale-100.png
+++ b/res/terminal/images-Universal/LargeTile.scale-100.png
--- a/res/terminal/images-Universal/LargeTile.scale-125.png
+++ b/res/terminal/images-Universal/LargeTile.scale-125.png
--- a/res/terminal/images-Universal/LargeTile.scale-150.png
+++ b/res/terminal/images-Universal/LargeTile.scale-150.png
--- a/res/terminal/images-Universal/LargeTile.scale-200.png
+++ b/res/terminal/images-Universal/LargeTile.scale-200.png
--- a/res/terminal/images-Universal/LargeTile.scale-400.png
+++ b/res/terminal/images-Universal/LargeTile.scale-400.png
--- a/res/terminal/images-Universal/LockScreenLogo.scale-100.png
+++ b/res/terminal/images-Universal/LockScreenLogo.scale-100.png
--- a/res/terminal/images-Universal/LockScreenLogo.scale-125.png
+++ b/res/terminal/images-Universal/LockScreenLogo.scale-125.png
--- a/res/terminal/images-Universal/LockScreenLogo.scale-150.png
+++ b/res/terminal/images-Universal/LockScreenLogo.scale-150.png
--- a/res/terminal/images-Universal/LockScreenLogo.scale-200.png
+++ b/res/terminal/images-Universal/LockScreenLogo.scale-200.png
--- a/res/terminal/images-Universal/LockScreenLogo.scale-400.png
+++ b/res/terminal/images-Universal/LockScreenLogo.scale-400.png
--- a/res/terminal/images-Universal/SmallTile.scale-100.png
+++ b/res/terminal/images-Universal/SmallTile.scale-100.png
--- a/res/terminal/images-Universal/SmallTile.scale-125.png
+++ b/res/terminal/images-Universal/SmallTile.scale-125.png
--- a/res/terminal/images-Universal/SmallTile.scale-150.png
+++ b/res/terminal/images-Universal/SmallTile.scale-150.png
--- a/res/terminal/images-Universal/SmallTile.scale-200.png
+++ b/res/terminal/images-Universal/SmallTile.scale-200.png
--- a/res/terminal/images-Universal/SmallTile.scale-400.png
+++ b/res/terminal/images-Universal/SmallTile.scale-400.png
--- a/Show More
+++ b/Show More