Merged PR 4764832: Migrate OSS changes up to 7b489128ac

Related work items: #26765368
2020-06-04 19:21:33 +00:00 · 2020-06-04 19:21:33 +00:00 · b1715479bd
parent 92812bf316 7b489128ac
commit b1715479bd
438 changed files with 17260 additions and 8438 deletions
--- a/.github/actions/spell-check/advice.txt
+++ b/.github/actions/spell-check/advice.txt
@ -3,13 +3,21 @@
 :pencil2: Contributor please read this
 </summary>

-* If the items listed above are names, please add them to `.github/actions/spell-check/dictionary/names.txt`.
-* If they're APIs, you can add them to a file in `.github/actions/spell-check/dictionary/`.
-* If they're just things you're using, please add them to an appropriate file in `.github/actions/spell-check/whitelist/`.
-* If you need to use a specific token in one place and it shouldn't generally be used, you can
-add an item in an appropriate file in `.github/actions/spell-check/patterns/`.
+By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.
+
+:warning: The command is written for posix shells. You can copy the contents of each `perl` command excluding the outer `'` marks and dropping any `'"`/`"'` quotation mark pairs into a file and then run `perl file.pl` from the root of the repository to run the code. Alternatively, you can manually insert the items...
+
+If the listed items are:
+* ... **misspelled**, then please *correct* them instead of using the command.
+* ... *names*, please add them to `.github/actions/spell-check/dictionary/names.txt`.
+* ... APIs, you can add them to a file in `.github/actions/spell-check/dictionary/`.
+* ... just things you're using, please add them to an appropriate file in `.github/actions/spell-check/expect/`.
+* ... tokens you only need in one place and shouldn't *generally be used*, you can add an item in an appropriate file in `.github/actions/spell-check/patterns/`.

 See the `README.md` in each directory for more information.
+
+:microscope: You can test your commits **without** *appending* to a PR by creating a new branch with that extra change and pushing it to your fork. The [:check-spelling](https://github.com/marketplace/actions/check-spelling) action will run in response to your **push** -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. :wink:
+
 </details>

 #### :warning: Reviewers
--- a/.github/actions/spell-check/dictionary/api.txt
+++ b/.github/actions/spell-check/dictionary/api.txt
--- a/.github/actions/spell-check/dictionary/apis.txt
+++ b/.github/actions/spell-check/dictionary/apis.txt
@ -1,6 +1,30 @@
-IMap
+ACCEPTFILES
+ACCESSDENIED
+bitfield
+bitfields
+CLASSNOTAVAILABLE
+EXPCMDFLAGS
+EXPCMDSTATE
+fullkbd
+href
+IBox
+IBind
+IClass
+IComparable
 ICustom
+IExplorer
+IMap
 IObject
+IStorage
 LCID
 NCHITTEST
+NCLBUTTONDBLCLK
+NCRBUTTONDBLCLK
+NOAGGREGATION
+NOREDIRECTIONBITMAP
+oaidl
+ocidl
 rfind
+roundf
+SIZENS
+tmp
--- a/.github/actions/spell-check/dictionary/microsoft.txt
+++ b/.github/actions/spell-check/dictionary/microsoft.txt
@ -1,7 +1,10 @@
+LKG
 mfcribbon
 microsoft
 microsoftonline
 osgvsowi
+powerrename
 powershell
 tdbuildteamid
+vcruntime
 visualstudio
--- a/.github/actions/spell-check/dictionary/names.txt
+++ b/.github/actions/spell-check/dictionary/names.txt
@ -3,6 +3,7 @@ austdi
 Ballmer
 bhoj
 Bhojwani
+carlos
 dhowett
 Diviness
 dsafa
@ -53,6 +54,8 @@ Wirt
 Wojciech
 zadjii
 Zamor
+Zamora
+zamora
 Zoey
 zorio
 Zverovich
--- a/.github/actions/spell-check/excludes.txt
+++ b/.github/actions/spell-check/excludes.txt
@ -51,6 +51,7 @@ SUMS$
 \.xpm$
 \.yml$
 \.zip$
+^consolegit2gitfilters\.json$
 ^dep/
 ^oss/
 ^doc/reference/UTF8-torture-test\.txt$
--- a/.github/actions/spell-check/expect/README.md
+++ b/.github/actions/spell-check/expect/README.md
@ -0,0 +1,13 @@
+The contents of each `.txt` file in this directory are merged together.
+
+* [alphabet](alphabet.txt) is a sample for alphabet related items
+* [web](web.txt) is a sample for web/html related items
+* [expect](expect.txt) is the main list of expected items -- there is nothing
+particularly special about the file name (beyond the extension which is
+important).
+
+These terms are things which temporarily exist in the project, but which
+aren't necessarily words.
+
+If something is a word that could come and go, it probably belongs in a
+[dictionary](../dictionary/README.md).
--- a/.github/actions/spell-check/whitelist/alphabet.txt
+++ b/.github/actions/spell-check/whitelist/alphabet.txt
@ -1,4 +1,3 @@
-abcd
 abcde
 abcdef
 ABCDEFG
@ -8,6 +7,8 @@ abcdefghijk
 abcdefghijklmnop
 ABCDEFGHIJKLMNOPQRST
 abcdefghijklmnopqrstuvwxyz
+ABE
+BBBBBBBBBBBBBBDDDD
 QQQQQQQQQQABCDEFGHIJ
 QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQ
 QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQQ
@ -16,6 +17,7 @@ qrstuvwxyz
 qwerty
 QWERTYUIOP
 qwertyuiopasdfg
+YYYYYYYDDDDDDDDDDD
 ZAAZZ
 ZABBZ
 ZBAZZ
--- a/.github/actions/spell-check/whitelist/whitelist.txt
+++ b/.github/actions/spell-check/whitelist/whitelist.txt
@ -1,17 +1,12 @@
 AAAAAABBBBBBCCC
 AAAAABBBBBBBCCC
-AAD
+AAAAABCCCCCCCCC
+AAAAADCCCCCCCCC
 ABANDONFONT
 ABCDEFGHIJKLMNO
 ABCG
-abe
-abec
 abf
 abi
-acb
-accd
-ACCEPTFILES
-ACCESSDENIED
 acec
 acf
 acidev
@ -27,10 +22,7 @@ ADDREF
 addressof
 ADDSTRING
 ADDTOOL
-aeed
 AEnd
-afae
-afceeeaa
 AFew
 AFill
 AFX
@ -129,7 +121,6 @@ awch
 azuredevopspodcast
 azurewebsites
 azzle
-baac
 backend
 backgrounded
 Backgrounder
@ -140,23 +131,15 @@ Batang
 baz
 Bazz
 BBBBCCCCC
-bbc
-bbd
 BBDM
-bbe
 bbwe
 bc
-bca
-bcb
-bcc
 bcount
 bcrypt
 bcx
 bcz
-bda
 BEFOREPARENT
 beginthread
-bfb
 bgcolor
 bgfx
 bgidx
@ -170,7 +153,6 @@ binplace
 binplaced
 bitcoin
 bitcrazed
-bitfield
 bitflag
 bitmask
 BITOPERATION
@ -213,7 +195,6 @@ BValue
 byref
 bytearray
 bytebuffer
-caa
 Cac
 callee
 cang
@ -224,7 +205,6 @@ cascadia
 catid
 cazamor
 CBash
-cbb
 cbegin
 cbiex
 CBN
@ -245,12 +225,9 @@ CConversion
 CCRT
 cctype
 CDATA
-CDBA
 cdd
-CDE
 cdecl
 CDeclaration
-cebb
 CEdit
 CELLSIZE
 cend
@ -498,14 +475,10 @@ dai
 DATABLOCK
 DATAVIEW
 DATAW
-dba
 DBatch
-dbb
 dbcs
 DBCSCHAR
 DBCSFONT
-dbd
-DBDCF
 dbg
 DBGALL
 DBGCHARS
@ -516,13 +489,11 @@ dblclk
 DBlob
 dbproj
 DBUILD
-dcf
 DColor
 DCOLORVALUE
 dcommon
 DCompile
 dcompiler
-ddb
 dde
 DDESHARE
 DDevice
@ -538,6 +509,7 @@ DECAWM
 DECCKM
 DECCOLM
 decf
+DECEKBD
 DECKPAM
 DECKPM
 DECKPNM
@ -554,6 +526,7 @@ deconstructed
 DECPCTERM
 DECRC
 DECRLM
+DECRQM
 DECRST
 DECSASD
 DECSC
@ -566,6 +539,7 @@ DECSEL
 DECSET
 DECSLRM
 DECSMBV
+DECSMKR
 DECSR
 decstandar
 DECSTBM
@ -594,6 +568,7 @@ Delt
 demoable
 depersist
 deprioritized
+deps
 deque
 deref
 deserialization
@ -611,7 +586,6 @@ devicefamily
 devops
 Dext
 df
-dfa
 DFactory
 dh
 dialogbox
@ -632,6 +606,7 @@ dllexport
 DLLGETVERSIONPROC
 dllimport
 dllinit
+dllmain
 DLLVERSIONINFO
 DLOAD
 DLOOK
@ -649,7 +624,6 @@ DPICHANGE
 DPICHANGED
 dpix
 dpiy
-draggable
 DRAWFRAME
 DRAWITEM
 DRAWITEMSTRUCT
@ -680,14 +654,9 @@ dxgidwm
 dxinterop
 dxttbmp
 eachother
-EAEC
 eaf
 EASTEUROPE
 eb
-eba
-ebce
-EBFB
-ECFB
 ECH
 echokey
 ecount
@ -697,8 +666,6 @@ EDITTEXT
 EDITUPDATE
 edputil
 edu
-eeb
-eee
 Efast
 EHsc
 EJO
@ -708,7 +675,6 @@ Elems
 elif
 elseif
 emacs
-Emojis
 emptybox
 enabledelayedexpansion
 endian
@ -727,6 +693,7 @@ ENUMLOGFONTEX
 enumranges
 envvar
 eol
+EPres
 ERASEBKGND
 errno
 errorlevel
@ -765,27 +732,17 @@ failfast
 FAILIFTHERE
 fallthrough
 FARPROC
-fba
-fbb
-fbd
-fbdc
-FBE
 fcb
-fcc
 fcharset
 fclose
 fcntl
-fd
-fdb
 fdc
-fdd
+FDD
 fde
 fdopen
-fdpi
 fdw
 fea
 fesb
-ffc
 FFDE
 FFF
 FFrom
@ -931,7 +888,6 @@ Gfun
 gfx
 gh
 github
-githubusercontent
 gitlab
 gle
 globals
@ -1024,9 +980,7 @@ hpp
 HPR
 HPROPSHEETPAGE
 HREDRAW
-HREF
 hresult
-hrgn
 HRSRC
 hscroll
 hsl
@ -1212,6 +1166,7 @@ kcub
 kcud
 kcuf
 kcuu
+Kd
 keith
 kernelbase
 kernelbasestaging
@ -1259,6 +1214,7 @@ LEFTSHIFT
 len
 lhs
 libpopcnt
+libtickit
 LIMITTEXT
 LINEDOWN
 LINESELECTION
@ -1370,6 +1326,7 @@ MAKELONG
 MAKELPARAM
 MAKELRESULT
 malloc
+manpage
 MAPBITMAP
 MAPVIRTUALKEY
 MAPVK
@ -1393,7 +1350,6 @@ memallocator
 memcmp
 memcopy
 memcpy
-memcpying
 memmove
 memset
 MENUCHAR
@ -1489,7 +1445,6 @@ nbsp
 Nc
 NCCALCSIZE
 NCCREATE
-NCHITTEST'ed
 NCLBUTTONDOWN
 NCLBUTTONUP
 NCMBUTTONDOWN
@ -1562,10 +1517,13 @@ NOTHOUSANDS
 nothrow
 NOTICKS
 NOTIMPL
+notin
 NOTNULL
 NOTRACK
 NOTSUPPORTED
+notypeopt
 nouicompat
+nounihan
 NOUPDATE
 NOWAIT
 NOYIELD
@ -1667,7 +1625,6 @@ Outof
 OUTOFCONTEXT
 OUTOFMEMORY
 outout
-OUTPATHROOT
 Outptr
 Ov
 OVERLAPPEDWINDOW
@ -1960,6 +1917,7 @@ REGSTR
 reingest
 Relayout
 RELBINPATH
+remoting
 renderengine
 rendersize
 reparenting
@ -2140,6 +2098,7 @@ SHIFTJIS
 Shl
 shlguid
 shlobj
+shobjidl
 shlwapi
 SHORTPATH
 SHOWCURSOR
@ -2227,7 +2186,6 @@ stgm
 stl
 stoi
 stol
-storageitems
 storelogo
 stoul
 stoutapot
@ -2333,7 +2291,6 @@ TEXCOORD
 texel
 textattribute
 TEXTATTRIBUTEID
-textblock
 Textbox
 textboxes
 textbuffer
@ -2361,7 +2318,6 @@ TLEN
 Tlg
 Tlgdata
 TMAE
-tmp
 TMPF
 TMult
 tmultiple
@ -2394,7 +2350,6 @@ TRACKCOMPOSITION
 trackpad
 transcoder
 transitioning
-trc
 Trd
 TREX
 triaged
@ -2430,8 +2385,11 @@ typeparam
 TYUI
 uap
 uapadmin
+UAX
 ubuntu
 ucd
+UCD
+ucdxml
 uch
 UCHAR
 ucs
@ -2514,7 +2472,6 @@ USESHOWWINDOW
 USESIZE
 USESTDHANDLES
 ushort
-usr
 USRDLL
 utf
 utils
@ -2556,7 +2513,6 @@ vkey
 VKKEYSCAN
 VMs
 VPA
-vpack
 VPATH
 VPR
 VPrintf
@ -2652,6 +2608,7 @@ wincontypes
 WINCORE
 windbg
 WINDEF
+winget
 WINDIR
 windll
 WINDOWALPHA
@ -2736,7 +2693,6 @@ WRITECONSOLEINPUT
 WRITECONSOLEOUTPUT
 WRITECONSOLEOUTPUTSTRING
 wrl
-wrn
 wrp
 WRunoff
 WScript
--- a/.github/actions/spell-check/expect/web.txt
+++ b/.github/actions/spell-check/expect/web.txt
@ -0,0 +1,15 @@
+http
+td
+www
+ecma
+rapidtables
+WCAG
+freedesktop
+ycombinator
+robertelder
+kovidgoyal
+leonerd
+fixterms
+uk
+winui
+appshellintegration
--- a/.github/actions/spell-check/patterns/patterns.txt
+++ b/.github/actions/spell-check/patterns/patterns.txt
@ -1,8 +1,12 @@
-https://(?:(?:[-a-zA-Z0-9?&=]*\.|)microsoft\.com)/[-a-zA-Z0-9?&=_\/.]*
+https://(?:(?:[-a-zA-Z0-9?&=]*\.|)microsoft\.com)/[-a-zA-Z0-9?&=_#\/.]*
 https://aka\.ms/[-a-zA-Z0-9?&=\/_]*
+https://www.w3.org/[-a-zA-Z0-9?&=\/_#]*
 https://(?:(?:www\.|)youtube\.com|youtu.be)/[-a-zA-Z0-9?&=]*
+https://[a-z-]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
+[Pp]ublicKeyToken="?[0-9a-fA-F]{16}"?
+(?:[{"]|UniqueIdentifier>)[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}(?:[}"]|</UniqueIdentifier)
 (?:0[Xx]|U\+|#)[a-f0-9A-FGgRr]{2,}[Uu]?[Ll]?\b
-\{[0-9A-FA-F]{8}-(?:[0-9A-FA-F]{4}-){3}[0-9A-FA-F]{12}\}
+microsoft/cascadia-code\@[0-9a-fA-F]{40}
 \d+x\d+Logo
 Scro\&ll
 # selectionInput.cpp
--- a/.github/actions/spell-check/whitelist/README.md
+++ b/.github/actions/spell-check/whitelist/README.md
@ -1,7 +0,0 @@
-The contents of each `.txt` file in this directory are merged together.
-
-* [alphabet](alphabet.txt) is a sample for alphabet related items
-* [web](web.txt) is a sample for web/html related items
-* [whitelist](whitelist.txt) is the main whitelist -- there is nothing
-particularly special about the file name (beyond the extension which is
-important).
--- a/.github/actions/spell-check/whitelist/web.txt
+++ b/.github/actions/spell-check/whitelist/web.txt
@ -1,4 +0,0 @@
-http
-td
-www
-ecma
--- a/.github/workflows/spelling.yml
+++ b/.github/workflows/spelling.yml
@ -13,7 +13,7 @@ jobs:
    - uses: actions/checkout@v2.0.0
      with:
        fetch-depth: 5
-    - uses: check-spelling/check-spelling@0.0.15-alpha
+    - uses: check-spelling/check-spelling@0.0.16-alpha
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        bucket: .github/actions
--- a/.gitignore
+++ b/.gitignore
@ -48,6 +48,7 @@ dlldata.c
 project.lock.json
 artifacts/

+*_h.h
 *_i.c
 *_p.c
 *_i.h
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -125,7 +125,7 @@ Team members will be happy to help review specs and guide them to completion.

 ### Help Wanted

-Once the team have approved an issue/spec, development can proceed. If no developers are immediately available, the spec can be parked ready for a developer to get started. Parked specs' issues will be labeled "Help Wanted". To find a list of development opportunities waiting for developer involvement, visit the Issues and filter on [the Help-Wanted label](https://github.com/microsoft/terminal/labels/Help-Wanted).
+Once the team have approved an issue/spec, development can proceed. If no developers are immediately available, the spec can be parked ready for a developer to get started. Parked specs' issues will be labeled "Help Wanted". To find a list of development opportunities waiting for developer involvement, visit the Issues and filter on [the Help-Wanted label](https://github.com/microsoft/terminal/labels/Help%20Wanted).

 ---

@ -155,4 +155,4 @@ Once your code has been reviewed and approved by the requisite number of team me

 ## Thank you

-Thank you in advance for your contribution! Now, [what's next on the list](https://github.com/microsoft/terminal/labels/Help-Wanted)? 😜
+Thank you in advance for your contribution! Now, [what's next on the list](https://github.com/microsoft/terminal/labels/Help%20Wanted)? 😜
--- a/NOTICE.md
+++ b/NOTICE.md
@ -181,7 +181,7 @@ SOFTWARE.

 ```

-## {fmt}
+## &#x7b;fmt&#x7d;

 **Source**: https://github.com/fmtlib/fmt

--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Terminal", "Terminal", "{59840756-302F-44DF-AA47-441A9D673202}"
 EndProject
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "CascadiaPackage", "src\cascadia\CascadiaPackage\CascadiaPackage.wapproj", "{CA5CAD1A-224A-4171-B13A-F16E576FDD12}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B} = {F2ED628A-DB22-446F-A081-4CC845B51A2B}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.EXE", "src\host\exe\Host.EXE.vcxproj", "{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}"
 	ProjectSection(ProjectDependencies) = postProject
@ -85,6 +88,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.Tests.Feature", "src\h
 		{18D09A24-8240-42D6-8CB6-236EEE820263} = {18D09A24-8240-42D6-8CB6-236EEE820263}
 		{FC802440-AD6A-4919-8F2C-7701F2B38D79} = {FC802440-AD6A-4919-8F2C-7701F2B38D79}
 		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A} = {58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalParser.UnitTests", "src\terminal\parser\ut_parser\Parser.UnitTests.vcxproj", "{12144E07-FE63-4D33-9231-748B8D8C3792}"
@ -188,6 +192,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalSettings", "src\cascadia\TerminalSettings\TerminalSettings.vcxproj", "{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminalShellExt", "src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj", "{F2ED628A-DB22-446F-A081-4CC845B51A2B}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalCore", "src\cascadia\UnitTests_TerminalCore\UnitTests.vcxproj", "{2C2BEEF4-9333-4D05-B12A-1905CBF112F9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{06EC74CB-9A12-429C-B551-8562EC954747} = {06EC74CB-9A12-429C-B551-8562EC954747}
@ -1108,6 +1114,25 @@ Global
 		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x64.Build.0 = Release|x64
 		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x86.ActiveCfg = Release|Win32
 		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x86.Build.0 = Release|Win32
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|Any CPU.ActiveCfg = Release|Win32
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|ARM64.ActiveCfg = Release|ARM64
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|x64.ActiveCfg = Release|x64
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|x64.Build.0 = Release|x64
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|x86.ActiveCfg = Release|Win32
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Debug|ARM64.Build.0 = Debug|ARM64
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Debug|x64.ActiveCfg = Debug|x64
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Debug|x64.Build.0 = Debug|x64
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Debug|x86.ActiveCfg = Debug|Win32
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Debug|x86.Build.0 = Debug|Win32
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Release|Any CPU.ActiveCfg = Release|Win32
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Release|ARM64.Build.0 = Release|ARM64
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Release|x64.ActiveCfg = Release|x64
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Release|x64.Build.0 = Release|x64
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Release|x86.ActiveCfg = Release|Win32
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.Release|x86.Build.0 = Release|Win32
 		{2C2BEEF4-9333-4D05-B12A-1905CBF112F9}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{2C2BEEF4-9333-4D05-B12A-1905CBF112F9}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
 		{2C2BEEF4-9333-4D05-B12A-1905CBF112F9}.AuditMode|x64.ActiveCfg = AuditMode|x64
@ -1558,6 +1583,7 @@ Global
 		{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {59840756-302F-44DF-AA47-441A9D673202}
+		{F2ED628A-DB22-446F-A081-4CC845B51A2B} = {59840756-302F-44DF-AA47-441A9D673202}
 		{2C2BEEF4-9333-4D05-B12A-1905CBF112F9} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{EF3E32A7-5FF6-42B4-B6E2-96CD7D033F00} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 		{16376381-CE22-42BE-B667-C6B35007008D} = {81C352DB-1818-45B7-A284-18E259F1CC87}
--- a/README.md
+++ b/README.md
@ -2,7 +2,8 @@

 This repository contains the source code for:

-* [Windows Terminal](https://www.microsoft.com/en-us/p/windows-terminal-preview/9n0dx20hk701)
+* [Windows Terminal](https://aka.ms/terminal)
+* [Windows Terminal Preview](https://aka.ms/terminal-preview)
 * The Windows console host (`conhost.exe`)
 * Components shared between the two projects
 * [ColorTool](https://github.com/Microsoft/Terminal/tree/master/src/tools/ColorTool)
@ -10,6 +11,7 @@ This repository contains the source code for:

 Related repositories include:

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

@ -19,7 +21,7 @@ Related repositories include:

 ### Microsoft Store [Recommended]

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

 This is our preferred method.

@ -34,6 +36,14 @@ For users who are unable to install Terminal from the Microsoft Store, Terminal
 > * Be sure to install the [Desktop Bridge VC++ v14 Redistributable Package](https://www.microsoft.com/en-us/download/details.aspx?id=53175) otherwise Terminal may not install and/or run and may crash at startup
 > * Terminal will not auto-update when new builds are released so you will need to regularly install the latest Terminal release to receive all the latest fixes and improvements!

+#### Via Windows Package Manager CLI (aka winget)
+
+[winget](https://github.com/microsoft/winget-cli) users can download and install the latest Terminal release by installing the `Microsoft.WindowsTerminal` package:
+
+```powershell
+winget install --id=Microsoft.WindowsTerminal -e
+```
+
 #### Via Chocolatey (unofficial)

 [Chocolatey](https://chocolatey.org) users can download and install the latest Terminal release by installing the `microsoft-windows-terminal` package:
@ -61,12 +71,6 @@ ColorTool|![](https://microsoft.visualstudio.com/_apis/public/build/definitions/

 ---

-## Windows Terminal v1.0 Roadmap
-
-The plan for delivering Windows Terminal v1.0 [is described here](/doc/terminal-v1-roadmap.md), and will be updated as the project proceeds.
-
---
-
 ## Terminal & Console Overview

 Please take a few minutes to review the overview below before diving into the code:
@ -131,7 +135,7 @@ Solution: Make sure you're building & deploying the `CascadiaPackage` project in

 ## Documentation

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

 ---

@ -226,4 +230,4 @@ For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [open
 [conduct-code]: https://opensource.microsoft.com/codeofconduct/
 [conduct-FAQ]: https://opensource.microsoft.com/codeofconduct/faq/
 [conduct-email]: mailto:opencode@microsoft.com
-[store-install-link]: https://aka.ms/windowsterminal
+[store-install-link]: https://aka.ms/terminal
--- a/build/config/SignConfig.WindowsTerminal.xml
+++ b/build/config/SignConfig.WindowsTerminal.xml
@ -1,6 +1,5 @@
 <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" /> 
+   <file src="__INPATHROOT__\Microsoft.WindowsTerminal*.msixbundle" signType="136020001" />
  </job>
 </SignConfigXML>
--- a/build/pipelines/release.yml
+++ b/build/pipelines/release.yml
@ -15,6 +15,14 @@ variables:
 # store publication machinery happy.
 name: 'Terminal_$(date:yyMM).$(date:dd)$(rev:rrr)'

+# Build Arguments:
+#   WindowsTerminalOfficialBuild=[true,false]
+#     true - this is running on our build agent
+#     false - running locally
+#   WindowsTerminalBranding=[Dev,Preview,Release]
+#     <none>  - Development build resources (default)
+#     Preview - Preview build resources
+#     Release - regular build resources
 jobs:
  - template: ./templates/build-console-audit-job.yml
    parameters:
@ -23,17 +31,17 @@ jobs:
  - template: ./templates/build-console-int.yml
    parameters:
      platform: x64
-      additionalBuildArguments: /p:WindowsTerminalReleaseBuild=true
+      additionalBuildArguments: /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=Preview

  - template: ./templates/build-console-int.yml
    parameters:
      platform: x86
-      additionalBuildArguments: /p:WindowsTerminalReleaseBuild=true
+      additionalBuildArguments: /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=Preview

  - template: ./templates/build-console-int.yml
    parameters:
      platform: arm64
-      additionalBuildArguments: /p:WindowsTerminalReleaseBuild=true
+      additionalBuildArguments: /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=Preview

  - template: ./templates/check-formatting.yml

--- a/build/scripts/Generate-ThirdPartyNotices.ps1
+++ b/build/scripts/Generate-ThirdPartyNotices.ps1
@ -0,0 +1,14 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Position=0, Mandatory=$true)][string]$MarkdownNoticePath,
+    [Parameter(Position=1, Mandatory=$true)][string]$OutputPath
+)
+
+@"
+<html>
+  <head><title>Third-Party Notices</title></head>
+  <body>
+  $(ConvertFrom-Markdown $MarkdownNoticePath | Select -Expand Html)
+  </body>
+</html>
+"@ | Out-File -Encoding UTF-8 $OutputPath -Force
--- a/build/scripts/Test-WindowsTerminalPackage.ps1
+++ b/build/scripts/Test-WindowsTerminalPackage.ps1
@ -68,6 +68,27 @@ Try {
        }
    }

+    $dependencies = $Manifest.Package.Dependencies.PackageDependency.Name
+    $depsHasVclibsDesktop = ("Microsoft.VCLibs.140.00.UWPDesktop" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug.UWPDesktop" -in $dependencies)
+    $depsHasVcLibsAppX = ("Microsoft.VCLibs.140.00" -in $dependencies) -or ("Microsoft.VCLibs.140.00.Debug" -in $dependencies)
+    $filesHasVclibsDesktop = ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140.dll" -EA:Ignore)) -or ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140d.dll" -EA:Ignore))
+    $filesHasVclibsAppX = ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140_app.dll" -EA:Ignore)) -or ($null -ne (Get-Item "$AppxPackageRootPath\vcruntime140d_app.dll" -EA:Ignore))
+
+    If ($depsHasVclibsDesktop -Eq $filesHasVclibsDesktop) {
+        $eitherBoth = if ($depsHasVclibsDesktop) { "both" } else { "neither" }
+        $neitherNor = if ($depsHasVclibsDesktop) { "and" } else { "nor" }
+        Throw "Package has $eitherBoth Dependency $neitherNor Integrated Desktop VCLibs"
+    }
+
+    If ($depsHasVclibsAppx -Eq $filesHasVclibsAppx) {
+        if ($depsHasVclibsAppx) {
+            # We've shipped like this forever, so downgrade to warning.
+            Write-Warning "Package has both Dependency and Integrated AppX VCLibs"
+        } else {
+            Throw "Package has neither Dependency nor Integrated AppX VCLibs"
+        }
+    }
+
    ### Check that we have an App.xbf (which is a proxy for our resources having been merged)
    $resourceXpath = '/PriInfo/ResourceMap/ResourceMapSubtree[@name="Files"]/NamedResource[@name="App.xbf"]'
    $AppXbf = $PRIFile.SelectSingleNode($resourceXpath)
--- a/custom.props
+++ b/custom.props
@ -4,8 +4,8 @@
  <PropertyGroup Label="Version">
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
    <XesBaseYearForStoreVersion>2020</XesBaseYearForStoreVersion>
-    <VersionMajor>0</VersionMajor>
-    <VersionMinor>11</VersionMinor>
+    <VersionMajor>1</VersionMajor>
+    <VersionMinor>1</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
  </PropertyGroup>
 </Project>
--- a/dep/CLI11/CLI11.hpp
+++ b/dep/CLI11/CLI11.hpp
--- a/dep/CLI11/README.md
+++ b/dep/CLI11/README.md
@ -1,5 +1,5 @@
 # CLI11

-Taken from [release v1.8.0](https://github.com/CLIUtils/CLI11/releases/tag/v1.8.0), source commit
-[13becad](https://github.com/CLIUtils/CLI11/commit/13becaddb657eacd090537719a669d66d393b8b2)
+Taken from [release v1.9.0](https://github.com/CLIUtils/CLI11/releases/tag/v1.9.0), source commit
+[dd0d8e4](https://github.com/CLIUtils/CLI11/commit/dd0d8e4fe729e5b1110232c7a5c9566dad884686)

--- a/dep/CLI11/cgmanifest.json
+++ b/dep/CLI11/cgmanifest.json
@ -0,0 +1,13 @@
+{"Registrations":[
+    {
+      "component": {
+       "type": "git",
+       "git": {
+         "repositoryUrl": "https://github.com/CLIUtils/CLI11",
+         "commitHash": "dd0d8e4fe729e5b1110232c7a5c9566dad884686"
+         }
+       }
+    }
+ ],
+ "Version": 1
+}
--- a/dep/jsoncpp/README.md
+++ b/dep/jsoncpp/README.md
@ -2,6 +2,15 @@

 [Amalgamated](https://github.com/open-source-parsers/jsoncpp/wiki/Amalgamated)
 from source commit
-[ddabf50](https://github.com/open-source-parsers/jsoncpp/commit/ddabf50f72cf369bf652a95c4d9fe31a1865a781),
-release 1.8.4.
+[6aba23f](https://github.com/open-source-parsers/jsoncpp/commit/6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2),
+release 1.9.3.

+> Generating amalgamated source and header JsonCpp is provided with a script to
+> generate a single header and a single source file to ease inclusion into an
+> existing project. The amalgamated source can be generated at any time by
+> running the following command from the top-directory (this requires Python
+> 3.4+):
+>
+> ```
+> python amalgamate.py
+> ```
--- a/dep/jsoncpp/cgmanifest.json
+++ b/dep/jsoncpp/cgmanifest.json
@ -0,0 +1,13 @@
+{"Registrations":[
+    {
+      "component": {
+       "type": "git",
+       "git": {
+         "repositoryUrl": "https://github.com/open-source-parsers/jsoncpp",
+         "commitHash": "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2"
+         }
+       }
+    }
+ ],
+ "Version": 1
+}
--- a/dep/jsoncpp/json/json-forwards.h
+++ b/dep/jsoncpp/json/json-forwards.h
@ -79,6 +79,151 @@ license you like.
 /// to prevent private header inclusion.
 #define JSON_IS_AMALGAMATION

+// //////////////////////////////////////////////////////////////////////
+// Beginning of content of file: include/json/version.h
+// //////////////////////////////////////////////////////////////////////
+
+#ifndef JSON_VERSION_H_INCLUDED
+#define JSON_VERSION_H_INCLUDED
+
+// Note: version must be updated in three places when doing a release. This
+// annoying process ensures that amalgamate, CMake, and meson all report the
+// correct version.
+// 1. /meson.build
+// 2. /include/json/version.h
+// 3. /CMakeLists.txt
+// IMPORTANT: also update the SOVERSION!!
+
+#define JSONCPP_VERSION_STRING "1.9.3"
+#define JSONCPP_VERSION_MAJOR 1
+#define JSONCPP_VERSION_MINOR 9
+#define JSONCPP_VERSION_PATCH 3
+#define JSONCPP_VERSION_QUALIFIER
+#define JSONCPP_VERSION_HEXA                                                   \
+  ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) |             \
+   (JSONCPP_VERSION_PATCH << 8))
+
+#ifdef JSONCPP_USING_SECURE_MEMORY
+#undef JSONCPP_USING_SECURE_MEMORY
+#endif
+#define JSONCPP_USING_SECURE_MEMORY 0
+// If non-zero, the library zeroes any memory that it has allocated before
+// it frees its memory.
+
+#endif // JSON_VERSION_H_INCLUDED
+
+// //////////////////////////////////////////////////////////////////////
+// End of content of file: include/json/version.h
+// //////////////////////////////////////////////////////////////////////
+
+
+
+
+
+
+// //////////////////////////////////////////////////////////////////////
+// Beginning of content of file: include/json/allocator.h
+// //////////////////////////////////////////////////////////////////////
+
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
+// Distributed under MIT license, or public domain if desired and
+// recognized in your jurisdiction.
+// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
+
+#ifndef JSON_ALLOCATOR_H_INCLUDED
+#define JSON_ALLOCATOR_H_INCLUDED
+
+#include <cstring>
+#include <memory>
+
+#pragma pack(push, 8)
+
+namespace Json {
+template <typename T> class SecureAllocator {
+public:
+  // Type definitions
+  using value_type = T;
+  using pointer = T*;
+  using const_pointer = const T*;
+  using reference = T&;
+  using const_reference = const T&;
+  using size_type = std::size_t;
+  using difference_type = std::ptrdiff_t;
+
+  /**
+   * Allocate memory for N items using the standard allocator.
+   */
+  pointer allocate(size_type n) {
+    // allocate using "global operator new"
+    return static_cast<pointer>(::operator new(n * sizeof(T)));
+  }
+
+  /**
+   * Release memory which was allocated for N items at pointer P.
+   *
+   * The memory block is filled with zeroes before being released.
+   * The pointer argument is tagged as "volatile" to prevent the
+   * compiler optimizing out this critical step.
+   */
+  void deallocate(volatile pointer p, size_type n) {
+    std::memset(p, 0, n * sizeof(T));
+    // free using "global operator delete"
+    ::operator delete(p);
+  }
+
+  /**
+   * Construct an item in-place at pointer P.
+   */
+  template <typename... Args> void construct(pointer p, Args&&... args) {
+    // construct using "placement new" and "perfect forwarding"
+    ::new (static_cast<void*>(p)) T(std::forward<Args>(args)...);
+  }
+
+  size_type max_size() const { return size_t(-1) / sizeof(T); }
+
+  pointer address(reference x) const { return std::addressof(x); }
+
+  const_pointer address(const_reference x) const { return std::addressof(x); }
+
+  /**
+   * Destroy an item in-place at pointer P.
+   */
+  void destroy(pointer p) {
+    // destroy using "explicit destructor"
+    p->~T();
+  }
+
+  // Boilerplate
+  SecureAllocator() {}
+  template <typename U> SecureAllocator(const SecureAllocator<U>&) {}
+  template <typename U> struct rebind { using other = SecureAllocator<U>; };
+};
+
+template <typename T, typename U>
+bool operator==(const SecureAllocator<T>&, const SecureAllocator<U>&) {
+  return true;
+}
+
+template <typename T, typename U>
+bool operator!=(const SecureAllocator<T>&, const SecureAllocator<U>&) {
+  return false;
+}
+
+} // namespace Json
+
+#pragma pack(pop)
+
+#endif // JSON_ALLOCATOR_H_INCLUDED
+
+// //////////////////////////////////////////////////////////////////////
+// End of content of file: include/json/allocator.h
+// //////////////////////////////////////////////////////////////////////
+
+
+
+
+
+
 // //////////////////////////////////////////////////////////////////////
 // Beginning of content of file: include/json/config.h
 // //////////////////////////////////////////////////////////////////////
@ -90,19 +235,14 @@ license you like.

 #ifndef JSON_CONFIG_H_INCLUDED
 #define JSON_CONFIG_H_INCLUDED
-#include <stddef.h>
-#include <string> //typedef String
-#include <stdint.h> //typedef int64_t, uint64_t
-
-/// If defined, indicates that json library is embedded in CppTL library.
-//# define JSON_IN_CPPTL 1
-
-/// If defined, indicates that json may leverage CppTL library
-//#  define JSON_USE_CPPTL 1
-/// If defined, indicates that cpptl vector based map should be used instead of
-/// std::map
-/// as Value container.
-//#  define JSON_USE_CPPTL_SMALLMAP 1
+#include <cstddef>
+#include <cstdint>
+#include <istream>
+#include <memory>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <type_traits>

 // If non-zero, the library uses exceptions to report bad input instead of C
 // assertion macros. The default is to use exceptions.
@ -110,164 +250,132 @@ license you like.
 #define JSON_USE_EXCEPTION 1
 #endif

+// Temporary, tracked for removal with issue #982.
+#ifndef JSON_USE_NULLREF
+#define JSON_USE_NULLREF 1
+#endif
+
 /// If defined, indicates that the source file is amalgamated
 /// to prevent private header inclusion.
 /// Remarks: it is automatically defined in the generated amalgamated header.
 // #define JSON_IS_AMALGAMATION

-#ifdef JSON_IN_CPPTL
-#include <cpptl/config.h>
-#ifndef JSON_USE_CPPTL
-#define JSON_USE_CPPTL 1
-#endif
-#endif
-
-#ifdef JSON_IN_CPPTL
-#define JSON_API CPPTL_API
-#elif defined(JSON_DLL_BUILD)
+// Export macros for DLL visibility
+#if defined(JSON_DLL_BUILD)
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #define JSON_API __declspec(dllexport)
 #define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
+#elif defined(__GNUC__) || defined(__clang__)
+#define JSON_API __attribute__((visibility("default")))
 #endif // if defined(_MSC_VER)
+
 #elif defined(JSON_DLL)
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #define JSON_API __declspec(dllimport)
 #define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
 #endif // if defined(_MSC_VER)
-#endif // ifdef JSON_IN_CPPTL
+#endif // ifdef JSON_DLL_BUILD
+
 #if !defined(JSON_API)
 #define JSON_API
 #endif

+#if defined(_MSC_VER) && _MSC_VER < 1800
+#error                                                                         \
+    "ERROR:  Visual Studio 12 (2013) with _MSC_VER=1800 is the oldest supported compiler with sufficient C++11 capabilities"
+#endif
+
+#if defined(_MSC_VER) && _MSC_VER < 1900
+// As recommended at
+// https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010
+extern JSON_API int msvc_pre1900_c99_snprintf(char* outBuf, size_t size,
+                                              const char* format, ...);
+#define jsoncpp_snprintf msvc_pre1900_c99_snprintf
+#else
+#define jsoncpp_snprintf std::snprintf
+#endif
+
 // If JSON_NO_INT64 is defined, then Json only support C++ "int" type for
 // integer
 // Storages, and 64 bits integer support is disabled.
 // #define JSON_NO_INT64 1

-#if defined(_MSC_VER) // MSVC
-#  if _MSC_VER <= 1200 // MSVC 6
-    // Microsoft Visual Studio 6 only support conversion from __int64 to double
-    // (no conversion from unsigned __int64).
-#    define JSON_USE_INT64_DOUBLE_CONVERSION 1
-    // Disable warning 4786 for VS6 caused by STL (identifier was truncated to '255'
-    // characters in the debug information)
-    // All projects I've ever seen with VS6 were using this globally (not bothering
-    // with pragma push/pop).
-#    pragma warning(disable : 4786)
-#  endif // MSVC 6
-
-#  if _MSC_VER >= 1500 // MSVC 2008
-    /// Indicates that the following function is deprecated.
-#    define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
-#  endif
-
-#endif // defined(_MSC_VER)
-
-// In c++11 the override keyword allows you to explicitly define that a function
-// is intended to override the base-class version.  This makes the code more
-// managable and fixes a set of common hard-to-find bugs.
-#if __cplusplus >= 201103L
-# define JSONCPP_OVERRIDE override
-# define JSONCPP_NOEXCEPT noexcept
-#elif defined(_MSC_VER) && _MSC_VER > 1600 && _MSC_VER < 1900
-# define JSONCPP_OVERRIDE override
-# define JSONCPP_NOEXCEPT throw()
-#elif defined(_MSC_VER) && _MSC_VER >= 1900
-# define JSONCPP_OVERRIDE override
-# define JSONCPP_NOEXCEPT noexcept
-#else
-# define JSONCPP_OVERRIDE
-# define JSONCPP_NOEXCEPT throw()
-#endif
-
-#ifndef JSON_HAS_RVALUE_REFERENCES
-
-#if defined(_MSC_VER) && _MSC_VER >= 1600 // MSVC >= 2010
-#define JSON_HAS_RVALUE_REFERENCES 1
-#endif // MSVC >= 2010
+// JSONCPP_OVERRIDE is maintained for backwards compatibility of external tools.
+// C++11 should be used directly in JSONCPP.
+#define JSONCPP_OVERRIDE override

 #ifdef __clang__
-#if __has_feature(cxx_rvalue_references)
-#define JSON_HAS_RVALUE_REFERENCES 1
-#endif  // has_feature
-
-#elif defined __GNUC__ // not clang (gcc comes later since clang emulates gcc)
-#if defined(__GXX_EXPERIMENTAL_CXX0X__) || (__cplusplus >= 201103L)
-#define JSON_HAS_RVALUE_REFERENCES 1
-#endif  // GXX_EXPERIMENTAL
-
-#endif // __clang__ || __GNUC__
-
-#endif // not defined JSON_HAS_RVALUE_REFERENCES
-
-#ifndef JSON_HAS_RVALUE_REFERENCES
-#define JSON_HAS_RVALUE_REFERENCES 0
+#if __has_extension(attribute_deprecated_with_message)
+#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message)))
 #endif
-
-#ifdef __clang__
-#  if __has_extension(attribute_deprecated_with_message)
-#    define JSONCPP_DEPRECATED(message)  __attribute__ ((deprecated(message)))
-#  endif
-#elif defined __GNUC__ // not clang (gcc comes later since clang emulates gcc)
-#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
-#    define JSONCPP_DEPRECATED(message)  __attribute__ ((deprecated(message)))
-#  elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-#    define JSONCPP_DEPRECATED(message)  __attribute__((__deprecated__))
-#  endif  // GNUC version
-#endif // __clang__ || __GNUC__
+#elif defined(__GNUC__) // not clang (gcc comes later since clang emulates gcc)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
+#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message)))
+#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+#define JSONCPP_DEPRECATED(message) __attribute__((__deprecated__))
+#endif                  // GNUC version
+#elif defined(_MSC_VER) // MSVC (after clang because clang on Windows emulates
+                        // MSVC)
+#define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
+#endif // __clang__ || __GNUC__ || _MSC_VER

 #if !defined(JSONCPP_DEPRECATED)
 #define JSONCPP_DEPRECATED(message)
 #endif // if !defined(JSONCPP_DEPRECATED)

-#if __GNUC__ >= 6
-#  define JSON_USE_INT64_DOUBLE_CONVERSION 1
+#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 6))
+#define JSON_USE_INT64_DOUBLE_CONVERSION 1
 #endif

 #if !defined(JSON_IS_AMALGAMATION)

-# include "version.h"
-
-# if JSONCPP_USING_SECURE_MEMORY
-#  include "allocator.h" //typedef Allocator
-# endif
+#include "allocator.h"
+#include "version.h"

 #endif // if !defined(JSON_IS_AMALGAMATION)

 namespace Json {
-typedef int Int;
-typedef unsigned int UInt;
+using Int = int;
+using UInt = unsigned int;
 #if defined(JSON_NO_INT64)
-typedef int LargestInt;
-typedef unsigned int LargestUInt;
+using LargestInt = int;
+using LargestUInt = unsigned int;
 #undef JSON_HAS_INT64
 #else                 // if defined(JSON_NO_INT64)
 // For Microsoft Visual use specific types as long long is not supported
 #if defined(_MSC_VER) // Microsoft Visual Studio
-typedef __int64 Int64;
-typedef unsigned __int64 UInt64;
+using Int64 = __int64;
+using UInt64 = unsigned __int64;
 #else                 // if defined(_MSC_VER) // Other platforms, use long long
-typedef int64_t Int64;
-typedef uint64_t UInt64;
-#endif // if defined(_MSC_VER)
-typedef Int64 LargestInt;
-typedef UInt64 LargestUInt;
+using Int64 = int64_t;
+using UInt64 = uint64_t;
+#endif                // if defined(_MSC_VER)
+using LargestInt = Int64;
+using LargestUInt = UInt64;
 #define JSON_HAS_INT64
 #endif // if defined(JSON_NO_INT64)
-#if JSONCPP_USING_SECURE_MEMORY
-#define JSONCPP_STRING        std::basic_string<char, std::char_traits<char>, Json::SecureAllocator<char> >
-#define JSONCPP_OSTRINGSTREAM std::basic_ostringstream<char, std::char_traits<char>, Json::SecureAllocator<char> >
-#define JSONCPP_OSTREAM       std::basic_ostream<char, std::char_traits<char>>
-#define JSONCPP_ISTRINGSTREAM std::basic_istringstream<char, std::char_traits<char>, Json::SecureAllocator<char> >
-#define JSONCPP_ISTREAM       std::istream
-#else
-#define JSONCPP_STRING        std::string
-#define JSONCPP_OSTRINGSTREAM std::ostringstream
-#define JSONCPP_OSTREAM       std::ostream
-#define JSONCPP_ISTRINGSTREAM std::istringstream
-#define JSONCPP_ISTREAM       std::istream
-#endif // if JSONCPP_USING_SECURE_MEMORY
-} // end namespace Json
+
+template <typename T>
+using Allocator =
+    typename std::conditional<JSONCPP_USING_SECURE_MEMORY, SecureAllocator<T>,
+                              std::allocator<T>>::type;
+using String = std::basic_string<char, std::char_traits<char>, Allocator<char>>;
+using IStringStream =
+    std::basic_istringstream<String::value_type, String::traits_type,
+                             String::allocator_type>;
+using OStringStream =
+    std::basic_ostringstream<String::value_type, String::traits_type,
+                             String::allocator_type>;
+using IStream = std::istream;
+using OStream = std::ostream;
+} // namespace Json
+
+// Legacy names (formerly macros).
+using JSONCPP_STRING = Json::String;
+using JSONCPP_ISTRINGSTREAM = Json::IStringStream;
+using JSONCPP_OSTRINGSTREAM = Json::OStringStream;
+using JSONCPP_ISTREAM = Json::IStream;
+using JSONCPP_OSTREAM = Json::OStream;

 #endif // JSON_CONFIG_H_INCLUDED

@ -299,17 +407,23 @@ typedef UInt64 LargestUInt;
 namespace Json {

 // writer.h
+class StreamWriter;
+class StreamWriterBuilder;
+class Writer;
 class FastWriter;
 class StyledWriter;
+class StyledStreamWriter;

 // reader.h
 class Reader;
+class CharReader;
+class CharReaderBuilder;

-// features.h
+// json_features.h
 class Features;

 // value.h
-typedef unsigned int ArrayIndex;
+using ArrayIndex = unsigned int;
 class StaticString;
 class Path;
 class PathArgument;
--- a/dep/jsoncpp/json/json.h
+++ b/dep/jsoncpp/json/json.h
--- a/dep/jsoncpp/jsoncpp.cpp
+++ b/dep/jsoncpp/jsoncpp.cpp
--- a/dep/wil
+++ b/dep/wil
@ -1 +1 @@
-Subproject commit e8c599bca6c56c44b6730ad93f6abbc9ecd60fc1
+Subproject commit 3c00e7f1d8cf9930bbb8e5be3ef0df65c84e8928
--- a/doc/cascadia/Json-Utility-API.md
+++ b/doc/cascadia/Json-Utility-API.md
@ -0,0 +1,257 @@
+# New Json Utility API
+
+## Raw value conversion (GetValue)
+
+`GetValue` is a convenience helper that will either read a value into existing storage (type-deduced) or
+return a JSON value coerced into the specified type.
+
+When reading into existing storage, it returns a boolean indicating whether that storage was modified.
+
+If the JSON value cannot be converted to the specified type, an exception will be generated.
+
+```c++
+std::string one;
+std::optional<std::string> two;
+
+JsonUtils::GetValue(json, one);
+// one is populated or unchanged.
+
+JsonUtils::GetValue(json, two);
+// two is populated, nullopt or unchanged
+
+auto three = JsonUtils::GetValue<std::string>(json);
+// three is populated or zero-initialized
+
+auto four = JsonUtils::GetValue<std::optional<std::string>>(json);
+// four is populated or nullopt
+```
+
+## Key lookup (GetValueForKey)
+
+`GetValueForKey` follows the same rules as `GetValue`, but takes an additional key.
+It is assumed that the JSON value passed to GetValueForKey is of `object` type.
+
+```c++
+std::string one;
+std::optional<std::string> two;
+
+JsonUtils::GetValueForKey(json, "firstKey", one);
+// one is populated or unchanged.
+
+JsonUtils::GetValueForKey(json, "secondKey", two);
+// two is populated, nullopt or unchanged
+
+auto three = JsonUtils::GetValueForKey<std::string>(json, "thirdKey");
+// three is populated or zero-initialized
+
+auto four = JsonUtils::GetValueForKey<std::optional<std::string>>(json, "fourthKey");
+// four is populated or nullopt
+```
+
+## Rationale: Value-Returning Getters
+
+JsonUtils provides two types of `GetValue...`: value-returning and reference-filling.
+
+The reference-filling fixtures use type deduction so that a developer does not
+need to specify template parameters on every `GetValue` call. It excels at
+populating class members during deserialization.
+
+The value-returning fixtures, on the other hand, are very useful for partial
+deserialization and key detection when you do not need to deserialize an entire
+instance of a class or you need to reason about the presence of members.
+
+To provide a concrete example of the latter, consider:
+
+```c++
+if (const auto guid{ GetValueForKey<std::optional<GUID>>(json, "guid") }) 
+    // This condition is only true if there was a "guid" member in the provided JSON object.
+    // It can be accessed through *guid.
+}
+```
+
+If you are... | Use
+--------------|-----
+Deserializing | `GetValue(..., storage)`
+Interrogating | `storage = GetValue<T>(...)`
+
+## Converting User-Defined Types
+
+All conversions are done using specializations of
+`JsonUtils::ConversionTrait<T>`.  To implement a converter for a user-defined
+type, you must implement a specialization of `JsonUtils::ConversionTrait<T>`.
+
+Every specialization over `T` must implement `static T FromJson(const Json::Value&)`
+and `static bool CanConvert(const Json::Value&)`.
+
+```c++
+struct MyCustomType { int val; };
+
+template<>
+struct ConversionTrait<MyCustomType>
+{
+    // This trait converts a string of the format "[0-9]" to a value of type MyCustomType.
+
+    static MyCustomType FromJson(const Json::Value& json)
+    {
+        return MyCustomType{ json.asString()[0] - '0' };
+    }
+
+    static bool CanConvert(const Json::Value& json)
+    {
+        return json.isString();
+    }
+};
+```
+
+### Converting User-Defined Enumerations
+
+Enumeration types represent a single choice out of multiple options.
+
+In a JSON data model, they are typically represented as strings.
+
+For parsing enumerations, JsonUtils provides the `JSON_ENUM_MAPPER` macro. It
+can be used to establish a converter that will take a set of known strings and
+convert them to values.
+
+```c++
+JSON_ENUM_MAPPER(CursorStyle)
+{
+    // pair_type is provided by ENUM_MAPPER.
+    JSON_MAPPINGS(5) = {
+        pair_type{ "bar", CursorStyle::Bar },
+        pair_type{ "vintage", CursorStyle::Vintage },
+        pair_type{ "underscore", CursorStyle::Underscore },
+        pair_type{ "filledBox", CursorStyle::FilledBox },
+        pair_type{ "emptyBox", CursorStyle::EmptyBox }
+    };
+};
+```
+
+If the enum mapper fails to convert the provided string, it will throw an
+exception.
+
+### Converting User-Defined Flag Sets
+
+Flags represent a multiple-choice selection. They are typically implemented as
+enums with bitfield values intended to be ORed together.
+
+In JSON, a set of flags may be represented by a single string (`"flagName"`) or
+an array of strings (`["flagOne", "flagTwo"]`).
+
+JsonUtils provides a `JSON_FLAG_MAPPER` macro that can be used to produce a
+specialization for a set of flags.
+
+Given the following flag enum,
+
+```c++
+enum class JsonTestFlags : int
+{
+    FlagOne = 1 << 0,
+    FlagTwo = 1 << 1
+};
+```
+
+You can register a flag mapper with the `JSON_FLAG_MAPPER` macro as follows:
+
+```c++
+JSON_FLAG_MAPPER(JsonTestFlags)
+{
+    JSON_MAPPINGS(2) = {
+        pair_type{ "flagOne", JsonTestFlags::FlagOne },
+        pair_type{ "flagTwo", JsonTestFlags::FlagTwo },
+    };
+};
+```
+
+The `FLAG_MAPPER` also provides two convenience definitions, `AllSet` and
+`AllClear`, that can be used to represent "all choices" and "no choices"
+respectively.
+
+```c++
+JSON_FLAG_MAPPER(JsonTestFlags)
+{
+    JSON_MAPPINGS(4) = {
+        pair_type{ "never", AllClear },
+        pair_type{ "flagOne", JsonTestFlags::FlagOne },
+        pair_type{ "flagTwo", JsonTestFlags::FlagTwo },
+        pair_type{ "always", AllSet },
+    };
+};
+```
+
+Because flag values are additive, `["always", "flagOne"]` will result in the
+same behavior as `"always"`.
+
+If the flag mapper encounters an unknown flag, it will throw an exception.
+
+If the flag mapper encounters a logical discontinuity such as `["never", "flagOne"]`
+(as in the above example), it will throw an exception.
+
+### Advanced Use
+
+`GetValue` and `GetValueForKey` can be passed, as their final arguments, any
+value whose type implements the same interface as `ConversionTrait<T>`--that
+is, `FromJson(const Json::Value&)` and `CanConvert(const Json::Value&)`.
+
+This allows for one-off conversions without a specialization of
+`ConversionTrait` or even stateful converters.
+
+#### Stateful Converter Sample
+
+```c++
+struct MultiplyingConverter {
+    int BaseValue;
+
+    bool CanConvert(const Json::Value&) { return true; }
+
+    int FromJson(const Json::Value& value)
+    {
+        return value.asInt() * BaseValue;
+    }
+};
+
+...
+
+Json::Value json{ 66 }; // A JSON value containing the number 66
+MultiplyingConverter conv{ 10 };
+
+auto v = JsonUtils::GetValue<int>(json, conv);
+// v is equal to 660.
+```
+
+## Behavior Chart
+
+### GetValue(T&) (type-deducing)
+
+-|json type invalid|json null|valid
+-|-|-|-
+`T`|❌ exception|🔵 unchanged|✔ converted
+`std::optional<T>`|❌ exception|🟨 `nullopt`|✔ converted
+
+### GetValue&lt;T&gt;() (returning)
+
+-|json type invalid|json null|valid
+-|-|-|-
+`T`|❌ exception|🟨 `T{}` (zero value)|✔ converted
+`std::optional<T>`|❌ exception|🟨 `nullopt`|✔ converted
+
+### GetValueForKey(T&) (type-deducing)
+
+GetValueForKey builds on the behavior set from GetValue by adding
+a "key not found" state. The remaining three cases are the same.
+
+val type|key not found|_json type invalid_|_json null_|_valid_
+-|-|-|-|-
+`T`|🔵 unchanged|_❌ exception_|_🔵 unchanged_|_✔ converted_
+`std::optional<T>`|_🔵 unchanged_|_❌ exception_|_🟨 `nullopt`_|_✔ converted_
+
+### GetValueForKey&lt;T&gt;() (return value)
+
+val type|key not found|_json type invalid_|_json null_|_valid_
+-|-|-|-|-
+`T`|🟨 `T{}` (zero value)|_❌ exception_|_🟨 `T{}` (zero value)_|_✔ converted_
+`std::optional<T>`|🟨 `nullopt`|_❌ exception_|_🟨 `nullopt`_|_✔ converted_
+
+### Future Direction
+
+These converters lend themselves very well to automatic _serialization_.
--- a/doc/cascadia/SettingsSchema.md
+++ b/doc/cascadia/SettingsSchema.md
@ -1,6 +1,7 @@
-# Profiles.json Documentation
+# Settings.json Documentation

 ## Globals
+
 Properties listed below affect the entire window, regardless of the profile settings.

 | Property | Necessity | Type | Default | Description |
@ -21,8 +22,13 @@ Properties listed below affect the entire window, regardless of the profile sett
 | `tabWidthMode` | Optional | String | `equal` | Sets the width of the tabs. Possible values: `"equal"`, `"titleLength"` |
 | `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. |
 | `confirmCloseAllTabs` | Optional | Boolean | `true` | When set to `true` closing a window with multiple tabs open WILL require confirmation.  When set to `false` closing a window with multiple tabs open WILL NOT require confirmation. |
+| `startOnUserLogin` | Optional | Boolean | `false` | When set to `true` enables the launch of Windows Terminal at startup. Setting to `false` will disable the startup task entry. Note: if the Windows Terminal startup task entry is disabled either by org policy or by user action this setting will have no effect. |
+| `disabledProfileSources` | Optional | Array[String] | `[]` | Disables all the dynamic profile generators in this list, preventing them from adding their profiles to the list of profiles on startup. This array can contain any combination of `Windows.Terminal.Wsl`, `Windows.Terminal.Azure`, or `Windows.Terminal.PowershellCore`. For more information, see [UsingJsonSettings.md](https://github.com/microsoft/terminal/blob/master/doc/user-docs/UsingJsonSettings.md#dynamic-profiles) |
+| `experimental.rendering.forceFullRepaint` | Optional | Boolean | `false` | When set to true, we will redraw the entire screen each frame. When set to false, we will render only the updates to the screen between frames. |
+| `experimental.rendering.software` | Optional | Boolean | `false` | When set to true, we will use the software renderer (a.k.a. WARP) instead of the hardware one. |

 ## Profiles
+
 Properties listed below are specific to each unique profile.

 | Property | Necessity | Type | Default | Description |
@ -42,8 +48,9 @@ Properties listed below are specific to each unique profile.
 | `cursorColor` | Optional | String | | Sets the cursor color of the profile. Overrides `cursorColor` set in color scheme if `colorscheme` is set. 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 | `Cascadia Code` | 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. |
+| `fontFace` | Optional | String | `Cascadia Mono` | 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. |
+| `fontWeight` | Optional | String | `normal` | Sets the weight (lightness or heaviness of the strokes) for the given font. Possible values: `"thin"`, `"extra-light"`, `"light"`, `"semi-light"`, `"normal"`, `"medium"`, `"semi-bold"`, `"bold"`, `"extra-bold"`, `"black"`, `"extra-black"`, or the corresponding numeric representation of OpenType font weight. |
 | `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 dynamically 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. |
@ -60,6 +67,7 @@ Properties listed below are specific to each unique profile.
 | `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 |
@ -87,12 +95,13 @@ Properties listed below are specific to each color scheme. [ColorTool](https://g
 | `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. |
+| `keys` | _Required_ | Array[String] or String | Defines the key combinations used to call the command. |
 | `action` | Optional | String | Adds additional functionality to certain commands. |

 ### Implemented Commands and Actions
@ -139,9 +148,10 @@ For commands with arguments:
 ### Accepted Modifiers and Keys

 #### Modifiers
-`Ctrl+`, `Shift+`, `Alt+`
+`ctrl+`, `shift+`, `alt+`

 #### Keys
+
 | Type | Keys |
 | ---- | ---- |
 | Function and Alphanumeric Keys | `f1-f24`, `a-z`, `0-9` |
@ -151,6 +161,7 @@ For commands with arguments:
 | Numpad Keys | `numpad_0-numpad_9`, `numpad0-numpad9`, `numpad_add`, `numpad_plus`, `numpad_decimal`, `numpad_period`, `numpad_divide`, `numpad_minus`, `numpad_subtract`, `numpad_multiply` |

 ## 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:
@ -163,6 +174,7 @@ The most useful URI schemes to remember when customizing background images and i
 > ⚠ 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.
@ -176,6 +188,7 @@ You can refer to you own icons if you wish, e.g.:
 > 👉 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`.
--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@ -1,7 +1,7 @@
 {
  "$id": "https://github.com/microsoft/terminal/blob/master/doc/cascadia/profiles.schema.json",
  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "Microsoft's Windows Terminal Settings Profile Schema'",
+  "title": "Microsoft's Windows Terminal Settings Profile Schema",
  "definitions": {
    "KeyChordSegment": {
      "pattern": "^(?<modifier>(ctrl|alt|shift)(?:\\+(ctrl|alt|shift)(?<!\\2))?(?:\\+(ctrl|alt|shift)(?<!\\2|\\3))?\\+)?(?<key>[^\\s+]|backspace|tab|enter|esc|escape|space|pgup|pageup|pgdn|pagedown|end|home|left|up|right|down|insert|delete|(?<!shift.+)(?:numpad_?[0-9]|numpad_(?:period|decimal))|numpad_(?:multiply|plus|add|minus|subtract|divide)|f[1-9]|f1[0-9]|f2[0-4]|plus)$",
@ -18,6 +18,14 @@
      "pattern": "^(-?\\d+)?(,\\s?(-?\\d+)?)?$",
      "type": "string"
    },
+    "DynamicProfileSource": {
+      "enum": [
+        "Windows.Terminal.Wsl",
+        "Windows.Terminal.Azure",
+        "Windows.Terminal.PowershellCore"
+      ],
+      "type": "string"
+    },
    "ProfileGuid": {
      "default": "{}",
      "pattern": "^\\{[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\\}$",
@ -30,7 +38,6 @@
        "closeTab",
        "closeWindow",
        "copy",
-        "decreaseFontSize",
        "duplicateTab",
        "moveFocus",
        "newTab",
@ -90,7 +97,7 @@
        },
        "index": {
          "type": "integer",
-          "description": "The index of the profile in the new tab dropdown to open"
+          "description": "The index of the profile in the new tab dropdown (starting at 0)"
        }
      },
      "type": "object"
@ -134,7 +141,7 @@
            "singleLine": {
              "type": "boolean",
              "default": false,
-              "description": "If true, newlines are removed and whitespace is maintained. If false, whitespace is removed and newlines are maintained."
+              "description": "If true, the copied content will be copied as a single line (even if there are hard line breaks present in the text). If false, newlines persist from the selected text."
            }
          }
        }
@ -214,11 +221,11 @@
            "split": {
              "$ref": "#/definitions/SplitState",
              "default": "auto",
-              "description": "The orientation to split the pane in, either vertical (think [|]), horizontal (think [-]), or auto (splits pane based on remaining space)"
+              "description": "The orientation to split the pane in. Possible values:\n -\"auto\" (splits pane based on remaining space)\n -\"horizontal\" (think [-])\n -\"vertical\" (think [|])"
            },
            "splitMode": {
              "default": "duplicate",
-              "description": "Control how the pane splits. Only accepts `duplicate` which will duplicate the focused pane's profile into a new pane."
+              "description": "Control how the pane splits. Only accepts \"duplicate\" which will duplicate the focused pane's profile into a new pane."
            }
          }
        }
@ -242,7 +249,7 @@
            ]
        },
        "keys": {
-          "description": "Defines the key combinations used to call the command.",
+          "description": "Defines the key combinations used to call the command. It must be composed of...\n -any number of modifiers (ctrl/alt/shift)\n -a non-modifier key",
          "oneOf": [
            {
              "$ref": "#/definitions/KeyChordSegment"
@ -269,7 +276,7 @@
      "properties": {
        "alwaysShowTabs": {
          "default": true,
-          "description": "When set to true, tabs are always displayed. When set to false and showTabsInTitlebar is set to false, tabs only appear after opening a new tab.",
+          "description": "When set to true, tabs are always displayed. When set to false and \"showTabsInTitlebar\" is set to false, tabs only appear after opening a new tab.",
          "type": "boolean"
        },
        "copyOnSelect": {
@ -283,8 +290,23 @@
          "type": "boolean"
        },
        "defaultProfile": {
-          "$ref": "#/definitions/ProfileGuid",
-          "description": "Sets the default profile. Opens by clicking the '+' icon or typing the key binding assigned to 'newTab'. The guid of the desired default profile is used as the value."
+          "description": "Sets the default profile. Opens by clicking the \"+\" icon or typing the key binding assigned to \"newTab\".",
+          "type": "string"
+        },
+        "disabledProfileSources": {
+          "description": "Disables all the dynamic profile generators in this list, preventing them from adding their profiles to the list of profiles on startup.",
+          "items": {
+            "$ref": "#/definitions/DynamicProfileSource"
+          },
+          "type": "array"
+        },
+        "experimental.rendering.forceFullRepaint": {
+          "description": "When set to true, we will redraw the entire screen each frame. When set to false, we will render only the updates to the screen between frames.",
+          "type": "boolean"
+        },
+        "experimental.rendering.software": {
+          "description": "When set to true, we will use the software renderer (a.k.a. WARP) instead of the hardware one.",
+          "type": "boolean"
        },
        "initialCols": {
          "default": 120,
@ -295,7 +317,7 @@
        },
        "initialPosition": {
          "$ref": "#/definitions/Coordinates",
-          "description": "The position of the top left corner of the window upon first load. On a system with multiple displays, these coordinates are relative to the top left of the primary display. If launchMode is set to maximized, the window will be maximized on the monitor specified by those coordinates."
+          "description": "The position of the top left corner of the window upon first load. On a system with multiple displays, these coordinates are relative to the top left of the primary display. If \"launchMode\" is set to maximized, the window will be maximized on the monitor specified by those coordinates."
        },
        "initialRows": {
          "default": 30,
@ -315,10 +337,10 @@
        },
        "rowsToScroll": {
          "default": "system",
-          "description": "The number of rows to scroll at a time with the mouse wheel. This will override the system setting if the value is not zero or 'system'.",
+          "description": "The number of rows to scroll at a time with the mouse wheel. This will override the system setting if the value is not zero or \"system\".",
          "maximum": 999,
          "minimum": 0,
-          "type": ["integer", "string"]
+          "type": [ "integer", "string" ]
        },
        "keybindings": {
          "description": "Properties are specific to each custom key binding.",
@ -329,7 +351,7 @@
        },
        "theme": {
          "default": "system",
-          "description": "Sets the theme of the application.",
+          "description": "Sets the theme of the application. The special value \"system\" refers to the active Windows system theme.",
          "enum": [
            "light",
            "dark",
@ -344,17 +366,17 @@
        },
        "showTerminalTitleInTitlebar": {
          "default": true,
-          "description": "When set to true, titlebar displays the title of the selected tab. When set to false, titlebar displays 'Windows Terminal'.",
+          "description": "When set to true, titlebar displays the title of the selected tab. When set to false, titlebar displays \"Windows Terminal\".",
          "type": "boolean"
        },
        "snapToGridOnResize": {
          "default": false,
-          "description": "When set to true, the window will snap to the nearest character boundary on resize. When false, the window will resize 'smoothly'",
+          "description": "When set to true, the window will snap to the nearest character boundary on resize. When false, the window will resize smoothly",
          "type": "boolean"
        },
        "tabWidthMode": {
          "default": "equal",
-          "description": "Sets the width of the tabs.",
+          "description": "Sets the width of the tabs. Possible values include:\n -\"equal\" sizes each tab to the same width\n -\"titleLength\" sizes each tab to the length of its title",
          "enum": [
            "equal",
            "titleLength"
@ -368,8 +390,8 @@
        },
        "confirmCloseAllTabs": {
          "default": true,
-          "description": " When set to `true` closing a window with multiple tabs open WILL require confirmation.  When set to `false` closing a window with multiple tabs open WILL NOT require confirmation.",
-          "type":"boolean"
+          "description": "When set to \"true\" closing a window with multiple tabs open will require confirmation.  When set to \"false\", the confirmation dialog will not appear.",
+          "type": "boolean"
        }
      },
      "required": [
@ -401,11 +423,11 @@
        "background": {
          "$ref": "#/definitions/Color",
          "default": "#0c0c0c",
-          "description": "Sets the background color of the profile. Overrides background set in color scheme if colorscheme is set. Uses hex color format: \"#rrggbb\".",
+          "description": "Sets the background color of the text. Overrides \"background\" from the color scheme. Uses hex color format: \"#rrggbb\".",
          "type": ["string", "null"]
        },
        "backgroundImage": {
-          "description": "Sets the file location of the Image to draw over the window background.",
+          "description": "Sets the file location of the image to draw over the window background.",
          "type": ["string", "null"]
        },
        "backgroundImageAlignment": {
@ -421,12 +443,14 @@
            "topLeft",
            "topRight"
          ],
+          "description": "Sets how the background image aligns to the boundaries of the window. Possible values: \"center\", \"left\", \"top\", \"right\", \"bottom\", \"topLeft\", \"topRight\", \"bottomLeft\", \"bottomRight\"",
          "type": "string"
        },
        "backgroundImageOpacity": {
-          "description": "(Not in SettingsSchema.md)",
-          "maximum": 1,
-          "minimum": 0,
+          "default": 1.0,
+          "description": "Sets the transparency of the background image. Accepts floating point values from 0-1.",
+          "maximum": 1.0,
+          "minimum": 0.0,
          "type": "number"
        },
        "backgroundImageStretchMode": {
@ -442,7 +466,7 @@
        },
        "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.",
+          "description": "Sets how the profile reacts to termination or failure to launch. Possible values:\n -\"graceful\" (close when exit is typed or the process exits normally)\n -\"always\" (always close)\n -\"never\" (never close).\ntrue and false are accepted as synonyms for \"graceful\" and \"never\" respectively.",
          "oneOf": [
            {
              "enum": [
@ -462,109 +486,27 @@
          "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",
-          "description": "Sets the cursor color of the profile. Overrides cursor color set in color scheme if colorscheme is set. Uses hex color format: \"#rrggbb\"."
+          "oneOf": [
+            { "$ref": "#/definitions/Color" },
+            {"type": "null"}
+          ],
+          "description": "Sets the color of the cursor. Overrides the cursor color from the color scheme. 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","null"]
+          "type": ["integer","null"],
+          "default": 25
        },
        "cursorShape": {
          "default": "bar",
-          "description": "Sets the cursor shape for the profile. Possible values: \"vintage\" ( ▃ ), \"bar\" ( ┃, default ), \"underscore\" ( ▁ ), \"filledBox\" ( █ ), \"emptyBox\" ( ▯ )",
+          "description": "Sets the shape of the cursor. Possible values:\n -\"bar\" ( ┃, default )\n -\"emptyBox\" ( ▯ )\n -\"filledBox\" ( █ )\n -\"underscore\" ( ▁ )\n -\"vintage\" ( ▃ )",
          "enum": [
            "bar",
            "emptyBox",
@ -579,20 +521,47 @@
          "type": "boolean"
        },
        "fontFace": {
-          "default": "Cascadia Code",
+          "default": "Cascadia Mono",
          "description": "Name of the font face used in the profile.",
          "type": "string"
        },
        "fontSize": {
          "default": 12,
-          "description": "Sets the font size.",
+          "description": "Size of the font in points.",
          "minimum": 1,
          "type": "integer"
        },
+        "fontWeight": {
+          "default": "normal",
+          "description": "Sets the weight (lightness or heaviness of the strokes) for the given font. Possible values:\n -\"thin\"\n -\"extra-light\"\n -\"light\"\n -\"semi-light\"\n -\"normal\" (default)\n -\"medium\"\n -\"semi-bold\"\n -\"bold\"\n -\"extra-bold\"\n -\"black\"\n -\"extra-black\" or the corresponding numeric representation of OpenType font weight.",
+          "oneOf": [
+            {
+              "enum": [
+                "thin",
+                "extra-light",
+                "light",
+                "semi-light",
+                "normal",
+                "medium",
+                "semi-bold",
+                "bold",
+                "extra-bold",
+                "black",
+                "extra-black"
+              ],
+              "type": "string"
+            },
+            {
+              "maximum": 990,
+              "minimum": 100,
+              "type": "integer"
+            }
+          ]
+        },
        "foreground": {
          "$ref": "#/definitions/Color",
          "default": "#cccccc",
-          "description": "Sets the foreground color of the profile. Overrides foreground set in color scheme if colorscheme is set. Uses hex color format: \"#rrggbb\".",
+          "description": "Sets the text color. Overrides \"foreground\" from the color scheme. Uses hex color format: \"#rrggbb\".",
          "type": ["string", "null"]
        },
        "guid": {
@ -621,7 +590,7 @@
        },
        "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.",
+          "description": "Sets the padding around the text within the window. Can have three different formats:\n -\"#\" sets the same padding for all sides \n -\"#, #\" sets the same padding for left-right and top-bottom\n -\"#, #, #, #\" 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"
        },
@ -635,8 +604,11 @@
          "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\"."
+          "oneOf": [
+            {"$ref": "#/definitions/Color"},
+            { "type": "null" }
+          ],
+          "description": "Sets the background color of selected text. Overrides selectionBackground set in the color scheme. Uses hex color format: \"#rrggbb\"."
        },
        "snapOnInput": {
          "default": true,
@ -653,7 +625,8 @@
        },
        "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"
+          "type": "boolean",
+          "default": false
        },
        "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.",
--- a/doc/reference/customtextlayout.xlsx
+++ b/doc/reference/customtextlayout.xlsx
--- a/doc/specs/#4999
+++ b/doc/specs/#4999
@ -0,0 +1,559 @@
+---
+author: Mike Griese @zadjii-msft
+created on: 2020-05-07
+last updated: 2020-06-03
+issue id: 4999
+---
+
+# Improved keyboard handling in Conpty
+
+## Abstract
+
+The Windows Console internally uses [`INPUT_RECORD`]s to represent the various
+types of input that a user might send to a client application. This includes
+things like keypresses, mouse events, window resizes, etc.
+
+However, conpty's keyboard input is fundamentally backed by VT sequences, which
+limits the range of keys that a terminal application can actually send relative
+to what the console was capable of. This results in a number of keys that were
+previously representable in the console as `INPUT_RECORD`s, but are impossible
+to send to a client application that's running in conpty mode.
+
+Some of these issues include, but are not limited to:
+
+* Some keybindings used by PSReadLine aren't getting through [#879]
+* Bug Report: Control+Space not sent to terminal emulator. [#2865]
+* Shift+Enter always submits, breaking PSReadline features [#530]
+* Powershell: Ctrl-Alt-? does not work in Windows Terminal [#3079]
+* Bug: ctrl+break is not ctrl+c [#1119]
+* Something wrong with keyboard modifiers processing? [#1694]
+* Numeric input not accepted by choice.exe [#3608]
+* Ctrl+Keys that can't be encoded as VT should still fall through as the unmodified character [#3483]
+* Modifier keys are not properly propagated to application hosted in Windows Terminal [#4334] / [#4446]
+
+This spec covers a mechanism by which we can add support to ConPTY so that a
+terminal application could send `INPUT_RECORD`-like key events to conpty,
+enabling client applications to receive the full range of keys once again.
+Included at the bottom of this document is a collection of [options that were
+investigated](#options-considered) as a part of preparing this document.
+
+## Considerations
+
+When evaluating existing encoding schemes for viability, the following things
+were used to evaluate whether or not a particular encoding would work for our
+needs:
+
+* Would a particular encoding be mixable with other normal VT processing easily?
+  - How would the Terminal know when it should send a \<chosen_encoding> key vs
+    a normally encoded one?
+    - For ex, <kbd>Ctrl+space</kbd> - should we send `NUL` or
+      \<chosen_encoding's version of ctrl+space>
+* If there's a scenario where Windows Terminal might _not_ be connected to a
+  conpty, then how does conpty enable \<chosen_encoding>?
+* Is the goal "Full `INPUT_RECORD` fidelity" or "Make the above scenarios work"?
+  - One could imagine having the Terminal special-case the above keys, and send
+    the xterm modifyOtherKeys sequences just for those scenarios.
+    - This would _not_ work for <kbd>shift</kbd> all by itself.
+  - In my _opinion_, "just making the above work" is a subset of "full
+    INPUT_RECORD", and inevitably we're going to want "full INPUT_RECORD"
+
+The goal we're trying to achieve is communicating `INPUT_RECORD`s from the
+terminal to the client app via conpty. This isn't supposed to be a \*nix
+terminal compatible communication, it's supposed to be fundamentally Win32-like.
+
+Keys that we definitely need to support, that don't have unique VT sequences:
+* <kbd>Ctrl+Space</kbd> ([#879], [#2865])
+* <kbd>Shift+Enter</kbd> ([#530])
+* <kbd>Ctrl+Break</kbd> ([#1119])
+* <kbd>Ctrl+Alt+?</kbd> ([#3079])
+* <kbd>Ctrl</kbd>, <kbd>Alt</kbd>, <kbd>Shift</kbd>,  (without another keydown/up) ([#3608], [#4334], [#4446])
+
+> 👉 NOTE: There are actually 5 types of events that can all be encoded as an
+> `INPUT_RECORD`. This spec primarily focuses on the encoding of
+> `KEY_EVENT_RECORD`s. It is left as a Future Consideration to add support for
+> the other types of `INPUT_RECORD` as other sequences, which could be done
+> trivially similarly to the following proposal.
+
+## Solution Design
+
+### Inspiration
+
+The design we've settled upon is one that's highly inspired by a few precedents:
+* `Application Cursor Keys (DECCKM)` is a long-supported VT sequence which a
+  client application can use to request a different input format from the
+  Terminal. This is the DECSET sequence `^[[?1h`/`^[[?1l` (for enable/disable,
+  respectively). This changes the sequences sent by keys like the Arrow keys
+  from a sequence like `^[[A` to `^[OA` instead.
+* The `kitty` terminal emulator uses a similar DECSET sequence for enabling
+  their own input format, which they call ["full mode"]. Similar to DECCKM, this
+  changes the format of the sequences that the terminal should send for keyboard
+  input. Their "full mode" contains much more information when keys are pressed
+  or released (though, less than a full `INPUT_RECORD` worth of data). Instead
+  of input being sent to the client as a CSI or SS3 sequence, this `kitty` mode
+  uses "Application Program-Command" (or "APC") sequences , prefixed with `^[_`.
+* [iTerm2](https://www.iterm2.com/documentation-escape-codes.html) has a region
+  of OSC's that they've carved for themselves all starting with the same initial
+  parameter, `1337`. They then have a number of commands that all use the second
+  parameter to indicate what command specific to iTerm2 they're actually
+  implementing.
+
+### Requesting `win32-input-mode`
+
+An application can request `win32-input-mode` with the following private mode sequence:
+
+```
+  ^[ [ ? 9001 h/l
+              l: Disable win32-input-mode
+              h: Enable win32-input-mode
+```
+
+Private mode `9001` seems unused according to the [xterm
+documentation](https://invisible-island.net/xterm/ctlseqs/ctlseqs.html). This is
+stylistically similar to how `DECKPM`, `DECCKM`, and `kitty`'s ["full mode"] are
+enabled.
+
+> 👉 NOTE: an earlier draft of this spec used an OSC sequence for enabling these
+> sequences. This was abandoned in favor of the more stylistically consistent
+> private mode params proposed above. Additionally, if implemented as a private
+> mode, then a client app could query if this setting was set with `DECRQM`
+
+When a terminal receives a `^[[?9001h` sequence, they should switch into
+`win32-input-mode`. In `win32-input-mode`, the terminal will send keyboard input
+to the connected client application in the following format:
+
+### `win32-input-mode` sequences
+
+The `KEY_EVENT_RECORD` portion of an input record (the part that's important for
+us to encode in this feature) is defined as the following:
+
+```c++
+typedef struct _KEY_EVENT_RECORD {
+  BOOL  bKeyDown;
+  WORD  wRepeatCount;
+  WORD  wVirtualKeyCode;
+  WORD  wVirtualScanCode;
+  union {
+    WCHAR UnicodeChar;
+    CHAR  AsciiChar;
+  } uChar;
+  DWORD dwControlKeyState;
+} KEY_EVENT_RECORD;
+```
+
+To encode all of this information, I propose the following sequence. This is a
+CSI sequence with a final terminator character of `_`. This character appears to
+only be used as a terminator for the [SCO input
+sequence](https://vt100.net/docs/vt510-rm/chapter6.html) for
+<kbd>Ctrl+Shift+F10</kbd>. This conflict isn't a real concern for us
+compatibility wise. For more details, see [SCO
+Compatibility](#SCO-compatibility) below.
+
+```
+  ^[ [ Vk ; Sc ; Uc ; Kd ; Cs ; Rc _
+
+       Vk: the value of wVirtualKeyCode - any number. If omitted, defaults to '0'.
+
+       Sc: the value of wVirtualScanCode - any number. If omitted, defaults to '0'.
+
+       Uc: the decimal value of UnicodeChar - for example, NUL is "0", LF is
+           "10", the character 'A' is "65". If omitted, defaults to '0'.
+
+       Kd: the value of bKeyDown - either a '0' or '1'. If omitted, defaults to '0'.
+
+       Cs: the value of dwControlKeyState - any number. If omitted, defaults to '0'.
+
+       Rc: the value of wRepeatCount - any number. If omitted, defaults to '1'.
+
+```
+
+> 👉 NOTE: an earlier draft of this spec used an APC sequence for encoding the
+> input sequences. This was changed to a CSI for stylistic reasons. There's not
+> a great body of reference anywhere that lists APC sequences in use, so there's
+> no way to know if the sequence would collide with another terminal emulator's
+> usage. Furthermore, using an APC seems to give a distinct impression that
+> this is some "Windows Terminal" specific sequence, which is not intended. This
+> is a Windows-specific sequence, but one that any Terminal/application could
+> use.
+
+In this way, a terminal can communicate input to a connected client application
+as `INPUT_RECORD`s, without any loss of fidelity.
+
+#### Example
+
+When the user presses <kbd>Ctrl+F1</kbd> in the console, the console actually
+send 4 input records to the client application:
+* A <kbd>Ctrl</kbd> down event
+* A <kbd>F1</kbd> down event
+* A <kbd>F1</kbd> up event
+* A <kbd>Ctrl</kbd> up event
+
+Encoded in `win32-input-mode`, this would look like the following:
+```
+^[[17;29;0;1;8;1_
+^[[112;59;0;1;8;1_
+^[[112;59;0;0;8;1_
+^[[17;29;0;0;0;1_
+
+Down: 1 Repeat: 1 KeyCode: 0x11 ScanCode: 0x1d Char: \0 (0x0) KeyState: 0x28
+Down: 1 Repeat: 1 KeyCode: 0x70 ScanCode: 0x3b Char: \0 (0x0) KeyState: 0x28
+Down: 0 Repeat: 1 KeyCode: 0x70 ScanCode: 0x3b Char: \0 (0x0) KeyState: 0x28
+Down: 0 Repeat: 1 KeyCode: 0x11 ScanCode: 0x1d Char: \0 (0x0) KeyState: 0x20
+```
+
+Similarly, for a keypress like <kbd>Ctrl+Alt+A</kbd>, which is 6 key events:
+```
+^[[17;29;0;1;8;1_
+^[[18;56;0;1;10;1_
+^[[65;30;0;1;10;1_
+^[[65;30;0;0;10;1_
+^[[18;56;0;0;8;1_
+^[[17;29;0;0;0;1_
+
+Down: 1 Repeat: 1 KeyCode: 0x11 ScanCode: 0x1d Char: \0 (0x0) KeyState: 0x28
+Down: 1 Repeat: 1 KeyCode: 0x12 ScanCode: 0x38 Char: \0 (0x0) KeyState: 0x2a
+Down: 1 Repeat: 1 KeyCode: 0x41 ScanCode: 0x1e Char: \0 (0x0) KeyState: 0x2a
+Down: 0 Repeat: 1 KeyCode: 0x41 ScanCode: 0x1e Char: \0 (0x0) KeyState: 0x2a
+Down: 0 Repeat: 1 KeyCode: 0x12 ScanCode: 0x38 Char: \0 (0x0) KeyState: 0x28
+Down: 0 Repeat: 1 KeyCode: 0x11 ScanCode: 0x1d Char: \0 (0x0) KeyState: 0x20
+```
+
+Or, for something simple like <kbd>A</kbd> (which is 4 key events):
+```
+^[[16;42;0;1;16;1_
+^[[65;30;65;1;16;1_
+^[[16;42;0;0;0;1_
+^[[65;30;97;0;0;1_
+
+Down: 1 Repeat: 1 KeyCode: 0x10 ScanCode: 0x2a Char: \0 (0x0) KeyState: 0x30
+Down: 1 Repeat: 1 KeyCode: 0x41 ScanCode: 0x1e Char: A  (0x41) KeyState: 0x30
+Down: 0 Repeat: 1 KeyCode: 0x10 ScanCode: 0x2a Char: \0 (0x0) KeyState: 0x20
+Down: 0 Repeat: 1 KeyCode: 0x41 ScanCode: 0x1e Char: a  (0x61) KeyState: 0x20
+```
+
+> 👉 NOTE: In all the above examples, I had my NumLock key off. If I had the
+> NumLock key instead pressed, all the KeyState parameters would have bits 0x20
+> set. To get these keys with a NumLock, add 32 to the value.
+
+These parameters are ordered based on how likely they are to be used. Most of
+the time, the repeat count is not needed (it's almost always `1`), so it can be
+left off when not required. Similarly, the control key state is probably going
+to be 0 a lot of the time too, so that is second last. Even keydown will be 0 at
+least half the time, so that can be omitted some of the time.
+
+Furthermore, considering omitted values in CSI parameters default to the values
+specified above, the above sequences could each be shortened to the following.
+
+* <kbd>Ctrl+F1</kbd>
+```
+^[[17;29;;1;8_
+^[[112;59;;1;8_
+^[[112;59;;;8_
+^[[17;29_
+```
+
+* <kbd>Ctrl+Alt+A</kbd>
+```
+^[[17;29;;1;8_
+^[[18;56;;1;10_
+^[[65;30;;1;10_
+^[[65;30;;;10_
+^[[18;56;;;8_
+^[[17;29;;_
+```
+
+* <kbd>A</kbd> (which is <kbd>shift+a</kbd>)
+```
+^[[16;42;;1;16_
+^[[65;30;65;1;16_
+^[[16;42_
+^[[65;30;97_
+```
+
+* Or even easier, just <kbd>a</kbd>
+```
+^[[65;30;97;1_
+^[[65;30;97_
+```
+
+### Scenarios
+
+#### User is typing into WSL from the Windows Terminal
+
+`WT -> conpty[1] -> wsl`
+
+* Conpty[1] will ask for `win32-input-mode` from the Windows Terminal when
+  conpty[1] first boots up. Conpty will _always_ ask for win32-input-mode -
+  Terminals that _don't_ support this mode will ignore this sequence on startup.
+* When the user types keys in Windows Terminal, WT will translate them into
+  win32 sequences and send them to conpty[1]
+* Conpty[1] will translate those win32 sequences into `INPUT_RECORD`s.
+  - When those `INPUT_RECORD`s are written to the input buffer, they'll be
+    converted into VT sequences corresponding to whatever input mode the linux
+    app is in.
+* When WSL reads the input, it'll read (using `ReadConsoleInput`) a stream of
+  `INPUT_RECORD`s that contain only character information, which it will then
+  pass to the linux application.
+  - This is how `wsl.exe` behaves today, before this change.
+
+#### User is typing into `cmd.exe` running in WSL interop
+
+`WT -> conpty[1] -> wsl -> conpty[2] -> cmd.exe`
+
+(presuming you start from the previous scenario, and launch `cmd.exe` inside wsl)
+
+* Conpty[2] will ask for `win32-input-mode` from conpty[1] when conpty[2] first
+  boots up.
+    - As conpty[1] is just a conhost that knows how to handle
+      `win32-input-mode`, it will switch its own VT input handling into
+      `win32-input-mode`
+* When the user types keys in Windows Terminal, WT will translate them into
+  win32 sequences and send them to conpty[1]
+* Conpty[1] will translate those win32 sequences into `INPUT_RECORD`s. When
+  conpty[1] writes these to its buffer, it will translate the `INPUT_RECORD`s
+  into VT sequences for the `win32-input-mode`. This is because it believes the
+  client (in this case, the conpty[2] running attached to `wsl`) wants
+  `win32-input-mode`.
+* When WSL reads the input, it'll read (using `ReadConsoleInput`) a stream of
+  `INPUT_RECORD`s that contain only character information, which it will then
+  use to pass a stream of characters to conpty[2].
+* Conpty[2] will get those sequences, and will translate those win32 sequences
+  into `INPUT_RECORD`s
+* When `cmd.exe` reads the input, they'll receive the full `INPUT_RECORD`s
+  they're expecting
+
+
+## UI/UX Design
+
+This is not a user-facing feature.
+
+## Capabilities
+
+### Accessibility
+
+_(no change expected)_
+
+### Security
+
+_(no change expected)_
+
+### Reliability
+
+_(no change expected)_
+
+### Compatibility
+
+This isn't expected to break any existing scenarios. The information that we're
+passing to conpty from the Terminal should strictly have _more_ information in
+them than they used to. Conhost was already capable of translating
+`INPUT_RECORD`s back into VT sequences, so this should work the same as before.
+
+There's some hypothetical future where the Terminal isn't connected to conpty.
+In that future, the Terminal will still be able to work correctly, even with
+this ConPTY change. The Terminal will only switch into sending
+`win32-input-mode` sequences when _conpty asks for them_. Otherwise, the
+Terminal will still behave like a normal terminal emulator.
+
+#### Terminals that don't support `?9001h`
+
+Traditionally, whenever a terminal emulator doesn't understand a particular VT
+sequence, they simply ignore the unknown sequence. This assumption is being
+relied upon heavily, as ConPTY will _always_ emit a `^[[?9001h` on
+initialization, to request `win32-input-mode`.
+
+#### SCO Compatibility
+
+As mentioned above, the `_` character is used as a terminator for the [SCO input
+sequence](https://vt100.net/docs/vt510-rm/chapter6.html) for
+<kbd>Ctrl+Shift+F10</kbd>. This conflict would be a problem if a hypothetical
+terminal was connected to conpty that sent input to conpty in SCO format.
+However, if that terminal was only sending input to conpty in SCO mode, it would
+have much worse problems than just <kbd>Ctrl+Shift+F10</kbd> not working. If we
+did want to support SCO mode in the future, I'd even go so far as to say we
+could maybe treat a `win32-input-mode` sequence with no params as
+<kbd>Ctrl+Shift+F10</kbd>, considering that `KEY_EVENT_RECORD{0}` isn't really
+valid anyways.
+
+#### Remoting `INPUT_RECORD`s
+
+A potential area of concern is the fact that VT sequences are often used to
+remote input from one machine to another. For example, a terminal might be
+running on machine A, and the conpty at the end of the pipe (which is running
+the client application) might be running on another machine B.
+
+If these two machines have different keyboard layouts, then it's possible that
+the `INPUT_RECORD`s synthesized by the terminal on machine A won't really be
+valid on machine B. It's possible that machine B has a different mapping of scan
+codes \<-> characters. A client that's running on machine B that uses win32 APIs
+to try and infer the vkey, scancode, or character from the other information in
+the `INPUT_RECORD` might end up synthesizing the wrong values.
+
+At the time of writing, we're not really sure what a good solution to this
+problem would be. Client applications that use `win32-input-mode` should be
+aware of this, and be written with the understanding that these values are
+coming from the terminal's machine, which might not necessarily be the local
+machine.
+
+### Performance, Power, and Efficiency
+
+_(no change expected)_
+
+## Potential Issues
+
+_(no change expected)_
+
+## Future considerations
+
+* We could also hypothetically use this same mechanism to send Win32-like mouse
+  events to conpty, since similar to VT keyboard events, VT mouse events don't
+  have the same fidelity that Win32 mouse events do.
+  - We could enable this with a different terminating character, to identify
+    which type of `INPUT_RECORD` event we're encoding.
+* Client applications that want to be able to read full Win32 keyboard input
+  from `conhost` _using VT_ will also be able to use `^[[?9001h` to do this. If
+  they emit `^[[?9001h`, then conhost will switch itself into
+  `win32-input-mode`, and the client will read `win32-input-mode` encoded
+  sequences as input. This could enable other cross-platform applications to
+  also use win32-like input in the future.
+
+## Options Considered
+
+_disclaimer: these notes are verbatim from my research notes in [#4999]_.
+
+### Create our own format for `INPUT_RECORD`s
+
+* If we wanted to do this, then we'd probably want to have the Terminal only
+  send input as this format, and not use the existing translator to synthesize
+  VT sequences
+    - Consider sending a ctrl down, '^A', ctrl up. We wouldn't want to send this
+      as three sequences, because conpty will take the '^A' and synthesize
+      _another_ ctrl down, ctrl up pair.
+* With conpty passthrough mode, we'd still need the `InputStateMachineEngine`
+  to convert these sequences into INPUT_RECORDs to translate back to VT
+* Wouldn't really expect client apps to ever _need_ this format, but it could
+  always be possible for them to need it in the future.
+
+#### Pros:
+* Definitely gets us all the information that we need.
+* Can handle solo modifiers
+* Can handle keydown and keyup separately
+* We can make the sequence however we want to parse it.
+
+#### Cons:
+* No reference implementation, so we'd be flying blind
+* We'd be defining our own VT sequences for these, which we've never done
+  before. This was _inevitable_, however, this is still the first time we'd be
+  doing this.
+* By having the Terminal send all input as _this protocol_, VT Input passthrough
+  to apps that want VT input won't work anymore for the Terminal. That's _okay_
+
+### kitty extension
+[Reference](https://sw.kovidgoyal.net/kitty/protocol-extensions.html#keyboard-handling)
+
+#### Pros:
+* Not terribly difficult to decode
+* Unique from anything else we'd be processing, as it's an APC sequence
+  (`\x1b_`)
+* From their docs:
+  > All printable key presses without modifier keys are sent
+  just as in the normal mode. ... For non printable keys and key combinations
+  including one or more modifiers, an escape sequence encoding the key event is
+  sent
+   - I think I like this. ASCII and other keyboard layout chars (things that would
+     hit `SendChar`) would still just come through as the normal char.
+
+#### Cons:
+* Their encoding table is _odd_. [Look at
+  this](https://sw.kovidgoyal.net/kitty/key-encoding.html). What order is that
+  in? Obviously the first column is sorted alphabetically, but the mapping of
+  key->char is in a certainly hard to decipher order.
+* I can't get it working locally, so hard to test 😐
+* They do declare the `fullkbd` terminfo capability to identify that they
+  support this mode, but I'm not sure anyone else uses it.
+  - I'm also not sure that any _client_ apps are reading this currently.
+* This isn't designed to be full `KEY_EVENT`s - where would we put the scancode
+  (for apps that think that's important)?
+  - We'd have to extend this protocol _anyways_
+
+### `xterm` "Set key modifier options"
+Notably looking at
+[`modifyOtherKeys`](https://invisible-island.net/xterm/manpage/xterm.html#VT100-Widget-Resources:modifyOtherKeys).
+
+#### Pros:
+* `xterm` implements this so there's a reference implementation
+* relatively easy to parse these sequences. `CSI 27 ; <modifiers> ; <key> ~`
+
+#### Cons:
+* Only sends the sequence on key-up
+* Doesn't send modifiers all on their own
+
+### `DECPCTERM`
+[VT100.net doc](https://vt100.net/docs/vt510-rm/DECPCTERM.html)
+
+#### Pros:
+* Enables us to send key-down and key-up keys independently
+* Enables us to send modifiers on their own
+* Part of the VT 510 standard
+
+#### Cons:
+* neither `xterm` nor `gnome-terminal` (VTE) seem to implement this. I'm not
+  sure if anyone's got a reference implementation for us to work with.
+* Unsure how this would work with other keyboard layouts
+    - [this doc](https://vt100.net/docs/vt510-rm/chapter8.html#S8.13) seems to
+      list the key-down/up codes for all the en-us keyboard keys, but the
+      scancodes for these are different for up and down. That would seem to
+      imply we couldn't just shove the Win32 scancode in those bits
+
+### `DECKPM`, `DECSMKR`
+[DECKPM](https://vt100.net/docs/vt510-rm/DECKPM.html)
+[DECSMKR](https://vt100.net/docs/vt510-rm/DECSMKR.html)
+[DECEKBD](https://vt100.net/docs/vt510-rm/DECEKBD.html)
+
+#### Pros:
+* Enables us to send key-down and key-up keys independently
+* Enables us to send modifiers on their own
+* Part of the VT 510 standard
+
+#### Cons:
+* neither `xterm` nor `gnome-terminal` (VTE) seem to implement this. I'm not
+  sure if anyone's got a reference implementation for us to work with.
+* not sure that "a three-character ISO key position name, for example C01" is
+  super compatible with our Win32 VKEYs.
+
+
+### `libtickit` encoding
+[Source](http://www.leonerd.org.uk/hacks/fixterms)
+
+#### Pros:
+* Simple encoding scheme
+
+#### Cons:
+* Doesn't differentiate between keydowns and keyups
+* Unsure who implements this - not extensively investigated
+
+
+## Resources
+
+* The initial discussion for this topic was done in [#879], and much of the
+  research of available options is also available as a discussion in [#4999].
+* [Why Is It so Hard to Detect Keyup Event on Linux?](https://blog.robertelder.org/detect-keyup-event-linux-terminal/)
+  - and the [HackerNews discussion](https://news.ycombinator.com/item?id=19012132)
+* [ConEmu specific OSCs](https://conemu.github.io/en/AnsiEscapeCodes.html#ConEmu_specific_OSC)
+* [iterm2 specific sequences](https://www.iterm2.com/documentation-escape-codes.html)
+* [terminal-wg draft list of OSCs](https://gitlab.freedesktop.org/terminal-wg/specifications/-/issues/10)
+
+<!-- Footnotes -->
+[#530]: https://github.com/microsoft/terminal/issues/530
+[#879]: https://github.com/microsoft/terminal/issues/879
+[#1119]: https://github.com/microsoft/terminal/issues/1119
+[#1694]: https://github.com/microsoft/terminal/issues/1694
+[#2865]: https://github.com/microsoft/terminal/issues/2865
+[#3079]: https://github.com/microsoft/terminal/issues/3079
+[#3483]: https://github.com/microsoft/terminal/issues/3483
+[#3608]: https://github.com/microsoft/terminal/issues/3608
+[#4334]: https://github.com/microsoft/terminal/issues/4334
+[#4446]: https://github.com/microsoft/terminal/issues/4446
+[#4999]: https://github.com/microsoft/terminal/issues/4999
+
+[`INPUT_RECORD`]: https://docs.microsoft.com/en-us/windows/console/input-record-str
+
+["full mode"]: https://sw.kovidgoyal.net/kitty/protocol-extensions.html#keyboard-handling
--- a/doc/user-docs/UsingCommandlineArguments.md
+++ b/doc/user-docs/UsingCommandlineArguments.md
@ -41,17 +41,18 @@ same window. <sup>[[1](#footnote-1)]</sup>

 #### `split-pane`

-`split-pane [-H]|[-V] [terminal_parameters]`
+`split-pane [-H,--horizontal|-V,--vertical] [terminal_parameters]`

 Creates a new pane in the currently focused tab by splitting the given pane
 vertically or horizontally. <sup>[[1](#footnote-1)]</sup>

 **Parameters**:

-* `-H`, `-V`: Used to indicate which direction to split the pane. `-V` is
-  "vertically" (think `[|]`), and `-H` is "horizontally" (think `[-]`). If
-  omitted, defaults to "auto", which splits the current pane in whatever the
-  larger dimension is. If both `-H` and `-V` are provided, defaults to vertical.
+* `-H,--horizontal`, `-V,--vertical`: Used to indicate which direction to split
+  the pane. `-V` is "vertically" (think `[|]`), and `-H` is "horizontally"
+  (think `[-]`). If omitted, defaults to "auto", which splits the current pane
+  in whatever the larger dimension is. If both `-H` and `-V` are provided,
+  defaults to vertical.
 * `[terminal_parameters]`: See [[terminal_parameters]](#terminal_parameters).

 #### `focus-tab`
@ -124,10 +125,77 @@ This creates a new Windows Terminal window with one tab, and 3 panes:
 * `split-pane -p "Windows PowerShell"`: This will create a new pane, split from
  the parent with the default profile. This pane will open with the "Windows
  PowerShell" profile
-* `split-pane -H wsl.exe`: This will create a third pane, slit _horizontally_
+* `split-pane -H wsl.exe`: This will create a third pane, split _horizontally_
  from the "Windows PowerShell" pane. It will be running the default profile,
  and will use `wsl.exe` as the commandline (instead of the default profile's
  `commandline`).

+
+### Using multiple commands from PowerShell
+
+The Windows Terminal uses the semicolon character `;` as a delimiter for
+separating subcommands in the `wt` commandline. Unfortunately, `powershell` also
+uses `;` as a command separator. To work around this you can use the following
+tricks to help run multiple wt sub commands from powershell. In all the
+following examples, we'll be creating a new Terminal window with three panes -
+one running `cmd`, one with `powershell`, and a last one running `wsl`.
+
+In each of the following examples, we're using the `Start-Process` command to
+run `wt`. For more information on why we're using `Start-Process`, see ["Using
+`start`"](#using-start) below.
+
+#### Single quoted parameters (if you aren't calculating anything):
+
+In this example, we'll wrap all the parameters to `wt` in single quotes (`'`)
+
+```PowerShell
+start wt 'new-tab "cmd"; split-pane -p "Windows PowerShell" ; split-pane -H wsl.exe'
+```
+
+#### Escaped quotes (if you need variables):
+
+If you'd like to pass a value contained in a variable to the `wt` commandline,
+instead use the following syntax:
+
+```PowerShell
+$ThirdPane = "wsl.exe"
+start wt "new-tab cmd; split-pane -p `"Windows PowerShell`" ; split-pane -H $ThirdPane"
+```
+
+Note the usage of  `` ` `` to escape the double-quotes (`"`) around "Windows
+Powershell" in the `-p` parameter to the `split-pane` sub-command.
+
+#### Using `start`
+
+All the above examples explicitly used `start` to launch the Terminal.
+
+In the following examples, we're going to not use `start` to run the
+commandline. Instead, we'll try two other methods of escaping the commandline:
+* Only escaping the semicolons so that `powershell` will ignore them and pass
+  them straight to `wt`.
+* Using `--%`, so powershell will treat the rest of the commandline as arguments
+  to the application.
+
+```PowerShell
+wt new-tab "cmd" `; split-pane -p "Windows PowerShell" `; split-pane -H wsl.exe
+```
+
+```Powershell
+wt --% new-tab cmd ; split-pane -p "Windows PowerShell" ; split-pane -H wsl.exe
+```
+
+In both these examples, the newly created Windows Terminal window will create
+the window by correctly parsing all the provided commandline arguments.
+
+However, these methods are _not_ recommended currently, as Powershell will wait
+for the newly-created Terminal window to be closed before returning control to
+Powershell. By default, Powershell will always wait for Windows Store
+applications (like the Windows Terminal) to close before returning to the
+prompt. Note that this is different than the behavior of `cmd`, which will return
+to the prompt immediately. See
+[Powershell/PowerShell#9970](https://github.com/PowerShell/PowerShell/issues/9970)
+for more details on this bug.
+
+
 [#4023]: https://github.com/microsoft/terminal/pull/4023
 [#4472]: https://github.com/microsoft/terminal/issues/4472
--- a/doc/user-docs/UsingJsonSettings.md
+++ b/doc/user-docs/UsingJsonSettings.md
@ -38,16 +38,17 @@ not affect a particular terminal instance.
 Example settings include

 ```json
+{
    "defaultProfile" : "{58ad8b0c-3ef8-5f4d-bc6f-13e4c00f2530}",
    "initialCols" : 120,
    "initialRows" : 50,
-    "requestedTheme" : "system",
+    "theme" : "system",
    "keybindings" : []
    ...
+}
 ```

-These global properties can exist either in the root json object, or in an
-object under a root property `"globals"`.
+These global properties should exist in the root json object.

 ## Key Bindings

@ -87,7 +88,7 @@ This will allow you to simplify the above snippet as follows:
 }
 ```

-
+A list of default key bindings is available [here](https://github.com/microsoft/terminal/blob/master/src/cascadia/TerminalApp/defaults.json#L204).

 ### Unbinding keys

@ -159,7 +160,7 @@ Example settings include

 The profile GUID is used to reference the default profile in the global settings.

-The values for background image stretch mode are documented [here](https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.media.stretch)
+The values for background image stretch mode are documented [here](https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.media.stretch).

 ### Hiding a profile

@ -251,6 +252,12 @@ like to hide all the WSL profiles, you could add the following setting:

 ```

+> 👉 **NOTE**: On launch, if a dynamic profile generator is enabled, it will
+> always add new profiles it detects to your list of profiles. If you delete a
+> dynamically generated profile from your list of profiles, it will just get
+> re-added the next time the Terminal is launched! To remove a dynamic profile
+> from your list of profiles, make sure to set `"hidden": true` in the profile.
+
 ### Default settings

 In [#2325](https://github.com/microsoft/terminal/issues/2325), we introduced the
--- a/doc/user-docs/index.md
+++ b/doc/user-docs/index.md
@ -25,7 +25,7 @@ NOTE: The default shell is PowerShell; you can change this using the _Running a

 ### Command line options

-None at this time. See issue [#607](https://github.com/microsoft/terminal/issues/607)
+Windows Terminal has implemented a rich set of command-line options in part as response to issue [#607](https://github.com/microsoft/terminal/issues/607).  See [UsingCommandlineArguments.md](https://github.com/microsoft/terminal/blob/master/doc/user-docs/UsingCommandlineArguments.md) for details.

 ## Multiple Tabs

@ -45,7 +45,7 @@ To customize the shell list, see the _Configuring Windows Terminal_ section belo

 ## Starting a new PowerShell tab with admin privilege

-There is no current plan to support this feature for security reasons. See issue [#623](https://github.com/microsoft/terminal/issues/632)
+There is no current plan to support this feature for security reasons. See issue [#632](https://github.com/microsoft/terminal/issues/632)

 ## Selecting and Copying Text in Windows Terminal

@ -61,7 +61,7 @@ Copy and paste operations can also be keybound. For more information on how to b

 ## Add a "Open Windows Terminal Here" to File Explorer

-Not currently supported "out of the box". See issue [#1060](https://github.com/microsoft/terminal/issues/1060)
+Not currently supported "out of the box" (See issue [#1060](https://github.com/microsoft/terminal/issues/1060)). However, you can open Windows Terminal in current directory by typing `wt -d .` in the Explorer address bar.

 ## Configuring Windows Terminal

@ -87,4 +87,5 @@ For an introduction to the various settings, see [Using Json Settings](UsingJson
 2. Terminal zoom can be changed by holding <kbd>Ctrl</kbd> and scrolling with mouse.
 3. Background opacity can be changed by holding <kbd>Ctrl</kbd>+<kbd>Shift</kbd> and scrolling with mouse. Note that acrylic transparency is limited by the OS only to focused windows.
 4. Open Windows Terminal in current directory by typing `wt -d .` in the address bar.
-5. Please add more Tips and Tricks.
+5. Pin the Windows Terminal to the taskbar. Now it can be launched using the Windows shortcut <kbd>Win</kbd>+<kbd>Number</kbd> (e.g. <kbd>Win</kbd>+<kbd>1</kbd> or any other number based on the position in the taskbar!). Press <kbd>Win</kbd>+<kbd>Shift</kbd>+<kbd>Number</kbd> to always launch a new window.
+6. Please add more Tips and Tricks.
--- a/res/Cascadia.ttf
+++ b/res/Cascadia.ttf
--- a/res/CascadiaMono.ttf
+++ b/res/CascadiaMono.ttf
--- a/res/README.md
+++ b/res/README.md
@ -17,5 +17,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi

 ### Fonts Included

-* Cascadia Code
-   * from microsoft/cascadia-code@d733599504811e8f3969de20368817d20e162dba
+* Cascadia Code, Cascadia Mono (2005.15)
+   * from microsoft/cascadia-code@0610f2df4356200adb93cb5bca2221b92ad6ee7e
--- a/res/terminal/Terminal.svg
+++ b/res/terminal/Terminal.svg
@ -0,0 +1,89 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 13H16V6H2C0.9 6 0 6.9 0 8V13Z" fill="#CCCCCC"/>
+<path d="M32 6H16V13H32V6Z" fill="#999999"/>
+<path d="M48 13H32V6H46C47.1 6 48 6.9 48 8V13Z" fill="#666666"/>
+<path d="M46 42H2C0.9 42 0 41.1 0 40V12H48V40C48 41.1 47.1 42 46 42Z" fill="url(#paint0_linear)"/>
+<g filter="url(#filter0_dd)">
+<path d="M15.2 24.3L6.39999 33.1C5.89999 33.6 5.89999 34.3 6.39999 34.7L8.19999 36.5C8.69999 37 9.4 37 9.8 36.5L18.6 27.7C19.1 27.2 19.1 26.5 18.6 26.1L16.8 24.3C16.4 23.9 15.6 23.9 15.2 24.3Z" fill="url(#paint1_linear)"/>
+<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="6" y="24" width="13" height="13">
+<path d="M15.2 24.3L6.39999 33.1C5.89999 33.6 5.89999 34.3 6.39999 34.7L8.19999 36.5C8.69999 37 9.4 37 9.8 36.5L18.6 27.7C19.1 27.2 19.1 26.5 18.6 26.1L16.8 24.3C16.4 23.9 15.6 23.9 15.2 24.3Z" fill="url(#paint2_linear)"/>
+</mask>
+<g mask="url(#mask0)">
+<g filter="url(#filter1_dd)">
+<path d="M9.8 17.3L18.6 26.1C19.1 26.6 19.1 27.3 18.6 27.7L16.8 29.5C16.3 30 15.6 30 15.2 29.5L6.39999 20.7C5.89999 20.2 5.89999 19.5 6.39999 19.1L8.19999 17.3C8.59999 16.9 9.4 16.9 9.8 17.3Z" fill="url(#paint3_linear)"/>
+</g>
+</g>
+<path d="M9.8 17.3L18.6 26.1C19.1 26.6 19.1 27.3 18.6 27.7L16.8 29.5C16.3 30 15.6 30 15.2 29.5L6.39999 20.7C5.89999 20.2 5.89999 19.5 6.39999 19.1L8.19999 17.3C8.59999 16.9 9.4 16.9 9.8 17.3Z" fill="url(#paint4_linear)"/>
+</g>
+<g filter="url(#filter2_dd)">
+<path d="M40 32H24C23.4 32 23 32.4 23 33V36C23 36.6 23.4 37 24 37H40C40.6 37 41 36.6 41 36V33C41 32.4 40.6 32 40 32Z" fill="url(#paint5_linear)"/>
+</g>
+<defs>
+<filter id="filter0_dd" x="3.02499" y="15" width="18.95" height="25.875" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="0.5"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="1.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow" result="effect2_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow" result="shape"/>
+</filter>
+<filter id="filter1_dd" x="3.02499" y="15" width="18.95" height="18.875" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="0.5"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="1.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow" result="effect2_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow" result="shape"/>
+</filter>
+<filter id="filter2_dd" x="20" y="30" width="24" height="11" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="0.5"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="1.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow" result="effect2_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear" x1="36.4462" y1="47.8257" x2="11.8217" y2="5.1748" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="14.5276" y1="33.9959" x2="10.4841" y2="26.9924" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#B3B3B3"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="14.5276" y1="33.9959" x2="10.4841" y2="26.9924" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#B3B3B3"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="16.2747" y1="30.0336" x2="8.73699" y2="16.9781" gradientUnits="userSpaceOnUse">
+<stop stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#E6E6E6"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="16.2747" y1="30.0336" x2="8.73699" y2="16.9781" gradientUnits="userSpaceOnUse">
+<stop stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#E6E6E6"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="35.1496" y1="39.9553" x2="28.8504" y2="29.0447" gradientUnits="userSpaceOnUse">
+<stop stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#E6E6E6"/>
+</linearGradient>
+</defs>
+</svg>
--- a/res/terminal/Terminal_Dev.svg
+++ b/res/terminal/Terminal_Dev.svg
@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   fill="none"
+   version="1.1"
+   id="svg284"
+   sodipodi:docname="Terminal_Dev_Pill.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata288">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="870"
+     inkscape:window-height="692"
+     id="namedview286"
+     showgrid="false"
+     inkscape:zoom="8.8541667"
+     inkscape:cx="32.978823"
+     inkscape:cy="31.710582"
+     inkscape:window-x="2437"
+     inkscape:window-y="145"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg284" />
+  <g
+     id="g4007"
+     transform="matrix(0.9375,0,0,0.9375,0,1.5)">
+    <path
+       id="path150"
+       d="M 0,13 H 16 V 6 H 2 C 0.9,6 0,6.9 0,8 Z"
+       inkscape:connector-curvature="0"
+       style="fill:#cccccc" />
+    <path
+       id="path152"
+       d="M 32,6 H 16 v 7 h 16 z"
+       inkscape:connector-curvature="0"
+       style="fill:#999999" />
+    <path
+       id="path154"
+       d="M 48,13 H 32 V 6 h 14 c 1.1,0 2,0.9 2,2 z"
+       inkscape:connector-curvature="0"
+       style="fill:#666666" />
+    <path
+       id="path156"
+       d="M 46,42 H 2 C 0.9,42 0,41.1 0,40 V 12 h 48 v 28 c 0,1.1 -0.9,2 -2,2 z"
+       style="fill:url(#paint0_linear)"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g171"
+       style="filter:url(#filter0_dd)">
+      <path
+         id="path158"
+         d="m 15.2,24.3 -8.80001,8.8 c -0.5,0.5 -0.5,1.2 0,1.6 l 1.8,1.8 C 8.69999,37 9.4,37 9.8,36.5 l 8.8,-8.8 c 0.5,-0.5 0.5,-1.2 0,-1.6 l -1.8,-1.8 c -0.4,-0.4 -1.2,-0.4 -1.6,0 z"
+         style="fill:url(#paint1_linear)"
+         inkscape:connector-curvature="0" />
+      <mask
+         height="13"
+         width="13"
+         y="24"
+         x="6"
+         maskUnits="userSpaceOnUse"
+         mask-type="alpha"
+         id="mask0">
+        <path
+           id="path160"
+           d="m 15.2,24.3 -8.80001,8.8 c -0.5,0.5 -0.5,1.2 0,1.6 l 1.8,1.8 C 8.69999,37 9.4,37 9.8,36.5 l 8.8,-8.8 c 0.5,-0.5 0.5,-1.2 0,-1.6 l -1.8,-1.8 c -0.4,-0.4 -1.2,-0.4 -1.6,0 z"
+           inkscape:connector-curvature="0"
+           style="fill:url(#paint2_linear)" />
+      </mask>
+      <g
+         id="g167"
+         mask="url(#mask0)">
+        <g
+           id="g165"
+           style="filter:url(#filter1_dd)">
+          <path
+             id="path163"
+             d="m 9.8,17.3 8.8,8.8 c 0.5,0.5 0.5,1.2 0,1.6 l -1.8,1.8 c -0.5,0.5 -1.2,0.5 -1.6,0 L 6.39999,20.7 c -0.5,-0.5 -0.5,-1.2 0,-1.6 l 1.8,-1.8 C 8.59999,16.9 9.4,16.9 9.8,17.3 Z"
+             style="fill:url(#paint3_linear)"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <path
+         id="path169"
+         d="m 9.8,17.3 8.8,8.8 c 0.5,0.5 0.5,1.2 0,1.6 l -1.8,1.8 c -0.5,0.5 -1.2,0.5 -1.6,0 L 6.39999,20.7 c -0.5,-0.5 -0.5,-1.2 0,-1.6 l 1.8,-1.8 C 8.59999,16.9 9.4,16.9 9.8,17.3 Z"
+         style="fill:url(#paint4_linear)"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g175"
+       style="filter:url(#filter2_dd)">
+      <path
+         id="path173"
+         d="M 40,32 H 24 c -0.6,0 -1,0.4 -1,1 v 3 c 0,0.6 0.4,1 1,1 h 16 c 0.6,0 1,-0.4 1,-1 v -3 c 0,-0.6 -0.4,-1 -1,-1 z"
+         style="fill:url(#paint5_linear)"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <defs
+     id="defs282">
+    <filter
+       id="filter0_dd"
+       x="3.02499"
+       y="15"
+       width="18.95"
+       height="25.875"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood177" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix179" />
+      <feOffset
+         dy="0.5"
+         id="feOffset181" />
+      <feGaussianBlur
+         stdDeviation="0.5"
+         id="feGaussianBlur183" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"
+         id="feColorMatrix185" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend187" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix189" />
+      <feOffset
+         dy="1"
+         id="feOffset191" />
+      <feGaussianBlur
+         stdDeviation="1.5"
+         id="feGaussianBlur193" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"
+         id="feColorMatrix195" />
+      <feBlend
+         mode="normal"
+         in2="effect1_dropShadow"
+         result="effect2_dropShadow"
+         id="feBlend197" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect2_dropShadow"
+         result="shape"
+         id="feBlend199" />
+    </filter>
+    <filter
+       id="filter1_dd"
+       x="3.02499"
+       y="15"
+       width="18.95"
+       height="18.875"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood202" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix204" />
+      <feOffset
+         dy="0.5"
+         id="feOffset206" />
+      <feGaussianBlur
+         stdDeviation="0.5"
+         id="feGaussianBlur208" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"
+         id="feColorMatrix210" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend212" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix214" />
+      <feOffset
+         dy="1"
+         id="feOffset216" />
+      <feGaussianBlur
+         stdDeviation="1.5"
+         id="feGaussianBlur218" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"
+         id="feColorMatrix220" />
+      <feBlend
+         mode="normal"
+         in2="effect1_dropShadow"
+         result="effect2_dropShadow"
+         id="feBlend222" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect2_dropShadow"
+         result="shape"
+         id="feBlend224" />
+    </filter>
+    <filter
+       id="filter2_dd"
+       x="20"
+       y="30"
+       width="24"
+       height="11"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood227" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix229" />
+      <feOffset
+         dy="0.5"
+         id="feOffset231" />
+      <feGaussianBlur
+         stdDeviation="0.5"
+         id="feGaussianBlur233" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"
+         id="feColorMatrix235" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend237" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix239" />
+      <feOffset
+         dy="1"
+         id="feOffset241" />
+      <feGaussianBlur
+         stdDeviation="1.5"
+         id="feGaussianBlur243" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"
+         id="feColorMatrix245" />
+      <feBlend
+         mode="normal"
+         in2="effect1_dropShadow"
+         result="effect2_dropShadow"
+         id="feBlend247" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect2_dropShadow"
+         result="shape"
+         id="feBlend249" />
+    </filter>
+    <linearGradient
+       id="paint0_linear"
+       x1="36.4462"
+       y1="47.8257"
+       x2="11.8217"
+       y2="5.1748"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#333333"
+         id="stop252" />
+      <stop
+         offset="1"
+         stop-color="#4D4D4D"
+         id="stop254" />
+    </linearGradient>
+    <linearGradient
+       id="paint1_linear"
+       x1="14.5276"
+       y1="33.9959"
+       x2="10.4841"
+       y2="26.9924"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#999999"
+         id="stop257" />
+      <stop
+         offset="1"
+         stop-color="#B3B3B3"
+         id="stop259" />
+    </linearGradient>
+    <linearGradient
+       id="paint2_linear"
+       x1="14.5276"
+       y1="33.9959"
+       x2="10.4841"
+       y2="26.9924"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#999999"
+         id="stop262" />
+      <stop
+         offset="1"
+         stop-color="#B3B3B3"
+         id="stop264" />
+    </linearGradient>
+    <linearGradient
+       id="paint3_linear"
+       x1="16.2747"
+       y1="30.0336"
+       x2="8.73699"
+       y2="16.9781"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#CCCCCC"
+         id="stop267" />
+      <stop
+         offset="1"
+         stop-color="#E6E6E6"
+         id="stop269" />
+    </linearGradient>
+    <linearGradient
+       id="paint4_linear"
+       x1="16.2747"
+       y1="30.0336"
+       x2="8.73699"
+       y2="16.9781"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#CCCCCC"
+         id="stop272" />
+      <stop
+         offset="1"
+         stop-color="#E6E6E6"
+         id="stop274" />
+    </linearGradient>
+    <linearGradient
+       id="paint5_linear"
+       x1="35.1496"
+       y1="39.9553"
+       x2="28.8504"
+       y2="29.0447"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#CCCCCC"
+         id="stop277" />
+      <stop
+         offset="1"
+         stop-color="#E6E6E6"
+         id="stop279" />
+    </linearGradient>
+  </defs>
+  <rect
+     x="19"
+     y="31.053001"
+     width="29"
+     height="11.947"
+     rx="1.8238994"
+     id="rect29"
+     style="fill:#9bf00b;stroke-width:1;fill-opacity:1;stroke:none;stroke-miterlimit:4;stroke-dasharray:none" />
+  <path
+     d="m 24.998257,40.538599 v -7.024197 h 2.027903 c 2.589481,0 3.884267,1.141257 3.884267,3.423864 0,1.084167 -0.359217,1.956116 -1.077651,2.615754 -0.718342,0.656356 -1.681726,0.984579 -2.889877,0.984579 z m 1.160912,-6.034785 v 5.050206 h 0.930645 c 0.819661,0 1.456384,-0.225351 1.910261,-0.675963 0.457161,-0.450611 0.685786,-1.08745 0.685786,-1.910334 0,-1.642576 -0.850666,-2.463909 -2.552,-2.463909 z m 9.982475,6.034785 h -3.943088 v -7.024197 h 3.786324 v 0.989412 h -2.620487 v 1.988765 h 2.414751 v 0.984578 h -2.414751 v 2.076863 h 2.777251 z m 6.754538,-7.024197 -2.522544,7.024197 h -1.302902 l -2.478497,-7.024197 h 1.273538 l 1.733981,5.329365 c 0.05545,0.169811 0.09794,0.367347 0.127308,0.592698 h 0.01961 c 0.02289,-0.186136 0.07022,-0.386955 0.142082,-0.602457 l 1.773103,-5.319606 z"
+     id="pill_text"
+     inkscape:connector-curvature="0"
+     style="fill:#000000;stroke-width:1;stroke:none;stroke-miterlimit:4;stroke-dasharray:none" />
+</svg>
--- a/res/terminal/Terminal_Pre.svg
+++ b/res/terminal/Terminal_Pre.svg
@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   fill="none"
+   version="1.1"
+   id="svg284"
+   sodipodi:docname="Terminal_Pre_Pill.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata288">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="922"
+     inkscape:window-height="816"
+     id="namedview286"
+     showgrid="false"
+     inkscape:zoom="8.8541667"
+     inkscape:cx="-17.429862"
+     inkscape:cy="31.710582"
+     inkscape:window-x="3142"
+     inkscape:window-y="60"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg284" />
+  <g
+     id="g4007"
+     transform="matrix(0.9375,0,0,0.9375,0,1.5)">
+    <path
+       id="path150"
+       d="M 0,13 H 16 V 6 H 2 C 0.9,6 0,6.9 0,8 Z"
+       inkscape:connector-curvature="0"
+       style="fill:#cccccc" />
+    <path
+       id="path152"
+       d="M 32,6 H 16 v 7 h 16 z"
+       inkscape:connector-curvature="0"
+       style="fill:#999999" />
+    <path
+       id="path154"
+       d="M 48,13 H 32 V 6 h 14 c 1.1,0 2,0.9 2,2 z"
+       inkscape:connector-curvature="0"
+       style="fill:#666666" />
+    <path
+       id="path156"
+       d="M 46,42 H 2 C 0.9,42 0,41.1 0,40 V 12 h 48 v 28 c 0,1.1 -0.9,2 -2,2 z"
+       style="fill:url(#paint0_linear)"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g171"
+       style="filter:url(#filter0_dd)">
+      <path
+         id="path158"
+         d="m 15.2,24.3 -8.80001,8.8 c -0.5,0.5 -0.5,1.2 0,1.6 l 1.8,1.8 C 8.69999,37 9.4,37 9.8,36.5 l 8.8,-8.8 c 0.5,-0.5 0.5,-1.2 0,-1.6 l -1.8,-1.8 c -0.4,-0.4 -1.2,-0.4 -1.6,0 z"
+         style="fill:url(#paint1_linear)"
+         inkscape:connector-curvature="0" />
+      <mask
+         height="13"
+         width="13"
+         y="24"
+         x="6"
+         maskUnits="userSpaceOnUse"
+         mask-type="alpha"
+         id="mask0">
+        <path
+           id="path160"
+           d="m 15.2,24.3 -8.80001,8.8 c -0.5,0.5 -0.5,1.2 0,1.6 l 1.8,1.8 C 8.69999,37 9.4,37 9.8,36.5 l 8.8,-8.8 c 0.5,-0.5 0.5,-1.2 0,-1.6 l -1.8,-1.8 c -0.4,-0.4 -1.2,-0.4 -1.6,0 z"
+           inkscape:connector-curvature="0"
+           style="fill:url(#paint2_linear)" />
+      </mask>
+      <g
+         id="g167"
+         mask="url(#mask0)">
+        <g
+           id="g165"
+           style="filter:url(#filter1_dd)">
+          <path
+             id="path163"
+             d="m 9.8,17.3 8.8,8.8 c 0.5,0.5 0.5,1.2 0,1.6 l -1.8,1.8 c -0.5,0.5 -1.2,0.5 -1.6,0 L 6.39999,20.7 c -0.5,-0.5 -0.5,-1.2 0,-1.6 l 1.8,-1.8 C 8.59999,16.9 9.4,16.9 9.8,17.3 Z"
+             style="fill:url(#paint3_linear)"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <path
+         id="path169"
+         d="m 9.8,17.3 8.8,8.8 c 0.5,0.5 0.5,1.2 0,1.6 l -1.8,1.8 c -0.5,0.5 -1.2,0.5 -1.6,0 L 6.39999,20.7 c -0.5,-0.5 -0.5,-1.2 0,-1.6 l 1.8,-1.8 C 8.59999,16.9 9.4,16.9 9.8,17.3 Z"
+         style="fill:url(#paint4_linear)"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g175"
+       style="filter:url(#filter2_dd)">
+      <path
+         id="path173"
+         d="M 40,32 H 24 c -0.6,0 -1,0.4 -1,1 v 3 c 0,0.6 0.4,1 1,1 h 16 c 0.6,0 1,-0.4 1,-1 v -3 c 0,-0.6 -0.4,-1 -1,-1 z"
+         style="fill:url(#paint5_linear)"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <defs
+     id="defs282">
+    <filter
+       id="filter0_dd"
+       x="3.02499"
+       y="15"
+       width="18.95"
+       height="25.875"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood177" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix179" />
+      <feOffset
+         dy="0.5"
+         id="feOffset181" />
+      <feGaussianBlur
+         stdDeviation="0.5"
+         id="feGaussianBlur183" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"
+         id="feColorMatrix185" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend187" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix189" />
+      <feOffset
+         dy="1"
+         id="feOffset191" />
+      <feGaussianBlur
+         stdDeviation="1.5"
+         id="feGaussianBlur193" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"
+         id="feColorMatrix195" />
+      <feBlend
+         mode="normal"
+         in2="effect1_dropShadow"
+         result="effect2_dropShadow"
+         id="feBlend197" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect2_dropShadow"
+         result="shape"
+         id="feBlend199" />
+    </filter>
+    <filter
+       id="filter1_dd"
+       x="3.02499"
+       y="15"
+       width="18.95"
+       height="18.875"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood202" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix204" />
+      <feOffset
+         dy="0.5"
+         id="feOffset206" />
+      <feGaussianBlur
+         stdDeviation="0.5"
+         id="feGaussianBlur208" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"
+         id="feColorMatrix210" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend212" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix214" />
+      <feOffset
+         dy="1"
+         id="feOffset216" />
+      <feGaussianBlur
+         stdDeviation="1.5"
+         id="feGaussianBlur218" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"
+         id="feColorMatrix220" />
+      <feBlend
+         mode="normal"
+         in2="effect1_dropShadow"
+         result="effect2_dropShadow"
+         id="feBlend222" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect2_dropShadow"
+         result="shape"
+         id="feBlend224" />
+    </filter>
+    <filter
+       id="filter2_dd"
+       x="20"
+       y="30"
+       width="24"
+       height="11"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood227" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix229" />
+      <feOffset
+         dy="0.5"
+         id="feOffset231" />
+      <feGaussianBlur
+         stdDeviation="0.5"
+         id="feGaussianBlur233" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"
+         id="feColorMatrix235" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow"
+         id="feBlend237" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         id="feColorMatrix239" />
+      <feOffset
+         dy="1"
+         id="feOffset241" />
+      <feGaussianBlur
+         stdDeviation="1.5"
+         id="feGaussianBlur243" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"
+         id="feColorMatrix245" />
+      <feBlend
+         mode="normal"
+         in2="effect1_dropShadow"
+         result="effect2_dropShadow"
+         id="feBlend247" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect2_dropShadow"
+         result="shape"
+         id="feBlend249" />
+    </filter>
+    <linearGradient
+       id="paint0_linear"
+       x1="36.4462"
+       y1="47.8257"
+       x2="11.8217"
+       y2="5.1748"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#333333"
+         id="stop252" />
+      <stop
+         offset="1"
+         stop-color="#4D4D4D"
+         id="stop254" />
+    </linearGradient>
+    <linearGradient
+       id="paint1_linear"
+       x1="14.5276"
+       y1="33.9959"
+       x2="10.4841"
+       y2="26.9924"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#999999"
+         id="stop257" />
+      <stop
+         offset="1"
+         stop-color="#B3B3B3"
+         id="stop259" />
+    </linearGradient>
+    <linearGradient
+       id="paint2_linear"
+       x1="14.5276"
+       y1="33.9959"
+       x2="10.4841"
+       y2="26.9924"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#999999"
+         id="stop262" />
+      <stop
+         offset="1"
+         stop-color="#B3B3B3"
+         id="stop264" />
+    </linearGradient>
+    <linearGradient
+       id="paint3_linear"
+       x1="16.2747"
+       y1="30.0336"
+       x2="8.73699"
+       y2="16.9781"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#CCCCCC"
+         id="stop267" />
+      <stop
+         offset="1"
+         stop-color="#E6E6E6"
+         id="stop269" />
+    </linearGradient>
+    <linearGradient
+       id="paint4_linear"
+       x1="16.2747"
+       y1="30.0336"
+       x2="8.73699"
+       y2="16.9781"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#CCCCCC"
+         id="stop272" />
+      <stop
+         offset="1"
+         stop-color="#E6E6E6"
+         id="stop274" />
+    </linearGradient>
+    <linearGradient
+       id="paint5_linear"
+       x1="35.1496"
+       y1="39.9553"
+       x2="28.8504"
+       y2="29.0447"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#CCCCCC"
+         id="stop277" />
+      <stop
+         offset="1"
+         stop-color="#E6E6E6"
+         id="stop279" />
+    </linearGradient>
+  </defs>
+  <rect
+     x="19"
+     y="31.053001"
+     width="29"
+     height="11.947"
+     rx="1.8238994"
+     id="rect29"
+     style="fill:#50e6ff;stroke-width:1;fill-opacity:1;stroke:none;stroke-miterlimit:4;stroke-dasharray:none" />
+  <path
+     d="m 26.63028,37.991385 v 2.54708 h -1.16082 v -7.02393 h 2.13068 c 0.80653,0 1.43185,0.18768 1.87597,0.56322 0.44412,0.37554 0.66618,0.90456 0.66618,1.58706 0,0.68242 -0.23182,1.2408 -0.69554,1.67516 -0.46373,0.43427 -1.0907,0.65141 -1.8809,0.65141 z m 0,-3.51684 v 2.56659 h 0.75437 c 0.49956,0 0.88003,-0.11591 1.14121,-0.34773 0.26127,-0.23182 0.39186,-0.55838 0.39186,-0.97961 0,-0.82623 -0.48005,-1.23925 -1.44006,-1.23925 z m 10.13431,6.06392 h -1.36172 l -1.12161,-1.8809 c -0.10122,-0.17309 -0.2009,-0.32 -0.29884,-0.44084 -0.0947,-0.12411 -0.1926,-0.22534 -0.29383,-0.30368 -0.098,-0.0783 -0.20574,-0.13551 -0.32329,-0.17144 -0.11755,-0.0359 -0.24987,-0.0539 -0.39679,-0.0539 h -0.4702 v 2.85076 H 31.3374 v -7.02393 h 2.31197 c 0.32977,0 0.63345,0.0391 0.91104,0.11755 0.2776,0.0783 0.51918,0.19753 0.72491,0.35748 0.20574,0.15677 0.36578,0.35439 0.48005,0.59277 0.11755,0.2351 0.17637,0.51097 0.17637,0.82778 0,0.24814 -0.0376,0.47676 -0.11271,0.68569 -0.0719,0.20574 -0.17628,0.39022 -0.31344,0.55355 -0.13388,0.15996 -0.29721,0.29712 -0.48981,0.41139 -0.18941,0.11426 -0.40335,0.20245 -0.64165,0.26455 v 0.0195 c 0.12731,0.0719 0.2383,0.15193 0.33305,0.24002 0.0947,0.0849 0.18448,0.17309 0.26939,0.26456 0.0849,0.0914 0.16816,0.19589 0.24978,0.31344 0.0849,0.11426 0.17801,0.24823 0.27924,0.40162 z m -4.26628,-6.07861 v 2.28252 h 0.96986 c 0.17956,0 0.34444,-0.0277 0.49464,-0.0833 0.15348,-0.0555 0.28581,-0.13551 0.39679,-0.24002 0.11099,-0.10451 0.19753,-0.23182 0.25963,-0.38202 0.062,-0.1502 0.093,-0.31845 0.093,-0.50458 0,-0.33633 -0.10615,-0.59915 -0.31836,-0.78856 -0.2123,-0.18941 -0.51762,-0.28408 -0.91596,-0.28408 z m 9.03223,6.07861 h -3.94309 v -7.02393 h 3.78632 v 0.98937 h -2.62049 v 1.98869 h 2.41476 v 0.98454 h -2.41476 v 2.07678 h 2.77726 z"
+     id="pill_text"
+     inkscape:connector-curvature="0"
+     style="fill:#000000;stroke-width:1;stroke:none;stroke-miterlimit:4;stroke-dasharray:none" />
+</svg>
--- 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/Show more
+++ b/Show more