Migrate spelling-0.0.21 changes from main

Migrate spelling-0.0.19 changes from main
polish more now that we don't need hyperlinks
2026-04-06 06:09:50 +00:00 · 2021-02-17 10:56:16 -08:00 · 2021-02-17 10:56:16 -08:00 · 2021-02-17 10:56:16 -08:00 · 2021-02-16 16:38:52 -08:00 · 2021-02-16 16:21:23 -08:00
48 changed files with 2190 additions and 482036 deletions
--- a/.github/actions/spelling/README.md
+++ b/.github/actions/spelling/README.md
@@ -0,0 +1,15 @@
+# check-spelling/check-spelling configuration
+
+File | Purpose | Format | Info
+-|-|-|-
+[allow/*.txt](allow/) | Add words to the dictionary | one word per line (only letters and `'`s allowed) | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)
+[reject.txt](reject.txt) | Remove words from the dictionary (after allow) | grep pattern matching whole dictionary words | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)
+[excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
+[patterns/*.txt](patterns/) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
+[candidate.patterns](candidate.patterns) | Patterns that might be worth adding to [patterns.txt](patterns.txt) | perl regular expression with optional comment block introductions (all matches will be suggested) | [candidates](https://github.com/check-spelling/check-spelling/wiki/Feature:-Suggest-patterns)
+[line_forbidden.patterns](line_forbidden.patterns) | Patterns to flag in checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
+[expect/*.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
+[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
+
+Note: you can replace any of these files with a directory by the same name (minus the suffix)
+and then include multiple files inside that directory (with that suffix) to merge multiple files together.
--- a/.github/actions/spelling/advice.md
+++ b/.github/actions/spelling/advice.md
@@ -0,0 +1,48 @@
+<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
+<details>
+<summary>
+:pencil2: Contributor please read this
+</summary>
+
+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. If it doesn't work for you, you can manually _add_ (one word per line) / _remove_ items to `expect.txt` and the `excludes.txt` files.
+
+If the listed items are:
+
+* ... **misspelled**, then please *correct* them instead of using the command.
+* ... *names*, please add them to `.github/actions/spelling/allow/names.txt`.
+* ... APIs, you can add them to a file in `.github/actions/spelling/allow/`.
+* ... just things you're using, please add them to an appropriate file in `.github/actions/spelling/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/spelling/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><summary>If the flagged items are :exploding_head: false positives</summary>
+
+If items relate to a ...
+* binary file (or some other file you wouldn't want to check at all).
+
+  Please add a file path to the `excludes.txt` file matching the containing file.
+
+  File paths are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
+
+  `^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
+../tree/HEAD/README.md) (on whichever branch you're using).
+
+* well-formed pattern.
+
+  If you can write a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it,
+  try adding it to the `patterns.txt` file.
+
+  Patterns are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
+
+  Note that patterns can't match multiline strings.
+</details>
+
+</details>
--- a/.github/actions/spelling/advice.txt
+++ b/.github/actions/spelling/advice.txt
@@ -1,27 +0,0 @@
-<details>
-<summary>
-:pencil2: Contributor please read this
-</summary>
-
-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/spelling/dictionary/names.txt`.
-* ... APIs, you can add them to a file in `.github/actions/spelling/dictionary/`.
-* ... just things you're using, please add them to an appropriate file in `.github/actions/spelling/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/spelling/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:
-
-:clamp: If you see a bunch of garbage and it relates to a binary-ish string, please add a file path to the `.github/actions/spelling/excludes.txt` file instead of just accepting the garbage.
-
-File paths are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
-
-`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](https://github.com/microsoft/terminal/blob/main/README.md) (on whichever branch you're using).
-</details>
--- a/.github/actions/spelling/dictionary/README.md
+++ b/.github/actions/spelling/dictionary/README.md
@@ -1,4 +1,4 @@
-# Dictionaries are lists of words to accept unconditionally
+# Allow files are lists of words to accept unconditionally

 While check spelling will complain about an expected word
 which is no longer present, you can include things here even if
@@ -8,11 +8,11 @@ E.g., you could include a list of system APIs here, or potential
 contributors (so that if a future commit includes their name,
 it'll be accepted).

-### Files
+## Files

 | File | Description |
 | ---- | ----------- |
-| [Dictionary](dictionary.txt) | Primary US English dictionary |
+| [Allow](allow.txt) | Supplements to the dictionary |
 | [Chinese](chinese.txt) | Chinese words |
 | [Japanese](japanese.txt) | Japanese words |
 | [Microsoft](microsoft.txt) | Microsoft brand items |
--- a/.github/actions/spelling/allow/allow.txt
+++ b/.github/actions/spelling/allow/allow.txt
@@ -0,0 +1,108 @@
+admins
+allcolors
+Apc
+apc
+breadcrumb
+breadcrumbs
+bsd
+calt
+ccmp
+changelog
+clickable
+clig
+CMMI
+copyable
+cybersecurity
+dalet
+Dcs
+dcs
+dialytika
+dje
+downside
+downsides
+dze
+dzhe
+EDDB
+EDDC
+Enum'd
+Fitt
+formattings
+FTCS
+ftp
+fvar
+gantt
+gcc
+geeksforgeeks
+ghe
+github
+gje
+godbolt
+hostname
+hostnames
+https
+hyperlink
+hyperlinking
+hyperlinks
+iconify
+img
+inlined
+It'd
+kje
+libfuzzer
+libuv
+liga
+lje
+Llast
+llvm
+Lmid
+locl
+lol
+lorem
+Lorigin
+maxed
+minimalistic
+mkmk
+mnt
+mru
+nje
+noreply
+ogonek
+ok'd
+overlined
+pipeline
+postmodern
+ptys
+qof
+qps
+rclt
+reimplementation
+reserialization
+reserialize
+reserializes
+rlig
+runtimes
+shcha
+slnt
+Sos
+ssh
+timeline
+timelines
+timestamped
+TLDR
+tokenizes
+tonos
+toolset
+tshe
+ubuntu
+uiatextrange
+UIs
+und
+unregister
+versioned
+vsdevcmd
+We'd
+wildcards
+XBox
+YBox
+yeru
+zhe
--- a/.github/actions/spelling/allow/apis.txt
+++ b/.github/actions/spelling/allow/apis.txt
@@ -0,0 +1,248 @@
+ACCEPTFILES
+ACCESSDENIED
+acl
+aclapi
+alignas
+alignof
+APPLYTOSUBMENUS
+appxrecipe
+bitfield
+bitfields
+BUILDBRANCH
+BUILDMSG
+BUILDNUMBER
+BYCOMMAND
+BYPOSITION
+charconv
+CLASSNOTAVAILABLE
+CLOSEAPP
+cmdletbinding
+COLORPROPERTY
+colspan
+COMDLG
+commandlinetoargv
+comparand
+cstdint
+CXICON
+CYICON
+Dacl
+dataobject
+dcomp
+DERR
+dlldata
+DNE
+DONTADDTORECENT
+DWMSBT
+DWMWA
+DWMWA
+DWORDLONG
+endfor
+ENDSESSION
+enumset
+environstrings
+EXPCMDFLAGS
+EXPCMDSTATE
+filetime
+FILTERSPEC
+FORCEFILESYSTEM
+FORCEMINIMIZE
+frac
+fullkbd
+futex
+GETDESKWALLPAPER
+GETHIGHCONTRAST
+GETMOUSEHOVERTIME
+Hashtable
+HIGHCONTRASTON
+HIGHCONTRASTW
+hotkeys
+href
+hrgn
+HTCLOSE
+hwinsta
+HWINSTA
+IActivation
+IApp
+IAppearance
+IAsync
+IBind
+IBox
+IClass
+IComparable
+IComparer
+IConnection
+ICustom
+IDialog
+IDirect
+IExplorer
+IFACEMETHOD
+IFile
+IGraphics
+IInheritable
+IMap
+IMonarch
+IObject
+iosfwd
+IPackage
+IPeasant
+ISetup
+isspace
+IStorage
+istream
+IStringable
+ITab
+ITaskbar
+itow
+IUri
+IVirtual
+KEYSELECT
+LCID
+llabs
+llu
+localtime
+lround
+Lsa
+lsass
+LSHIFT
+LTGRAY
+MAINWINDOW
+memchr
+memicmp
+MENUCOMMAND
+MENUDATA
+MENUINFO
+MENUITEMINFOW
+mmeapi
+MOUSELEAVE
+mov
+mptt
+msappx
+MULTIPLEUSE
+NCHITTEST
+NCLBUTTONDBLCLK
+NCMOUSELEAVE
+NCMOUSEMOVE
+NCRBUTTONDBLCLK
+NIF
+NIN
+NOAGGREGATION
+NOASYNC
+NOCHANGEDIR
+NOPROGRESS
+NOREDIRECTIONBITMAP
+NOREPEAT
+NOTIFYBYPOS
+NOTIFYICON
+NOTIFYICONDATA
+ntprivapi
+oaidl
+ocidl
+ODR
+offsetof
+ofstream
+onefuzz
+osver
+OSVERSIONINFOEXW
+otms
+OUTLINETEXTMETRICW
+overridable
+PACL
+PAGESCROLL
+PATINVERT
+PEXPLICIT
+PICKFOLDERS
+pmr
+ptstr
+QUERYENDSESSION
+rcx
+REGCLS
+RETURNCMD
+rfind
+ROOTOWNER
+roundf
+RSHIFT
+SACL
+schandle
+semver
+serializer
+SETVERSION
+SHELLEXECUTEINFOW
+shobjidl
+SHOWHIDE
+SHOWMINIMIZED
+SHOWTIP
+SINGLEUSE
+SIZENS
+smoothstep
+snprintf
+spsc
+sregex
+SRWLOC
+SRWLOCK
+STDCPP
+STDMETHOD
+strchr
+strcpy
+streambuf
+strtoul
+Stubless
+Subheader
+Subpage
+syscall
+SYSTEMBACKDROP
+TABROW
+TASKBARCREATED
+TBPF
+THEMECHANGED
+tlg
+TME
+tmp
+tmpdir
+tolower
+toupper
+TRACKMOUSEEVENT
+TTask
+TVal
+UChar
+UFIELD
+ULARGE
+UOI
+UPDATEINIFILE
+userenv
+USEROBJECTFLAGS
+Viewbox
+virtualalloc
+wcsstr
+wcstoui
+winmain
+winsta
+winstamin
+wmemcmp
+wpc
+WSF
+wsregex
+wwinmain
+xchg
+XDocument
+XElement
+xfacet
+xhash
+XIcon
+xiosbase
+xlocale
+xlocbuf
+xlocinfo
+xlocmes
+xlocmon
+xlocnum
+xloctime
+XMax
+xmemory
+XParse
+xpath
+xstddef
+xstring
+xtree
+xutility
+YIcon
+YMax
--- a/.github/actions/spelling/dictionary/chinese.txt
+++ b/.github/actions/spelling/dictionary/chinese.txt
--- a/.github/actions/spelling/allow/colors.txt
+++ b/.github/actions/spelling/allow/colors.txt
@@ -0,0 +1,117 @@
+alice
+aliceblue
+antiquewhite
+blanchedalmond
+blueviolet
+burlywood
+cadetblue
+cornflowerblue
+cornsilk
+cyan
+darkblue
+darkcyan
+darkgoldenrod
+darkgray
+darkgreen
+darkgrey
+darkkhaki
+darkmagenta
+darkolivegreen
+darkorange
+darkorchid
+darkred
+darksalmon
+darkseagreen
+darkslateblue
+darkslategray
+darkslategrey
+darkturquoise
+darkviolet
+deeppink
+deepskyblue
+dimgray
+dimgrey
+dodgerblue
+firebrick
+floralwhite
+forestgreen
+gainsboro
+ghostwhite
+greenyellow
+hotpink
+indian
+indianred
+lavenderblush
+lawngreen
+lemonchiffon
+lightblue
+lightcoral
+lightcyan
+lightgoldenrod
+lightgoldenrodyellow
+lightgray
+lightgreen
+lightgrey
+lightpink
+lightsalmon
+lightseagreen
+lightskyblue
+lightslateblue
+lightslategray
+lightslategrey
+lightsteelblue
+lightyellow
+limegreen
+mediumaquamarine
+mediumblue
+mediumorchid
+mediumpurple
+mediumseagreen
+mediumslateblue
+mediumspringgreen
+mediumturquoise
+mediumvioletred
+midnightblue
+mintcream
+mistyrose
+navajo
+navajowhite
+navyblue
+oldlace
+olivedrab
+orangered
+palegoldenrod
+palegreen
+paleturquoise
+palevioletred
+papayawhip
+peachpuff
+peru
+powderblue
+rebecca
+rebeccapurple
+rosybrown
+royalblue
+saddlebrown
+sandybrown
+seagreen
+sienna
+skyblue
+slateblue
+slategray
+slategrey
+springgreen
+steelblue
+violetred
+webgray
+webgreen
+webgrey
+webmaroon
+webpurple
+whitesmoke
+xaroon
+xray
+xreen
+xrey
+xurple
+yellowgreen
--- a/.github/actions/spelling/dictionary/fonts.txt
+++ b/.github/actions/spelling/dictionary/fonts.txt
@@ -7,3 +7,4 @@ Iosevka
 MDL
 Monofur
 Segoe
+wght
--- a/.github/actions/spelling/dictionary/japanese.txt
+++ b/.github/actions/spelling/dictionary/japanese.txt
--- a/.github/actions/spelling/allow/math.txt
+++ b/.github/actions/spelling/allow/math.txt
@@ -0,0 +1,11 @@
+atan
+CPrime
+HBar
+HPrime
+isnan
+LPrime
+LStep
+powf
+RSub
+sqrtf
+ULP
--- a/.github/actions/spelling/dictionary/microsoft.txt
+++ b/.github/actions/spelling/dictionary/microsoft.txt
@@ -1,28 +1,50 @@
 ACLs
 ADMINS
+advapi
 altform
 altforms
 appendwttlogging
+appx
+appxbundle
+appxerror
+appxmanifest
+ATL
 backplating
 bitmaps
 BOMs
 CPLs
+cpptools
+cppvsdbg
 CPRs
+cryptbase
 DACL
 DACLs
+defaultlib
 diffs
 disposables
 dotnetfeed
 DTDs
 DWINRT
 enablewttlogging
+Intelli
+IVisual
+libucrt
+libucrtd
 LKG
+LOCKFILE
+Lxss
 mfcribbon
 microsoft
 microsoftonline
+MSAA
+msixbundle
+MSVC
+MSVCP
 muxc
 netcore
+Onefuzz
 osgvsowi
+PFILETIME
 pgc
 pgo
 pgosweep
@@ -30,19 +52,31 @@ powerrename
 powershell
 propkey
 pscustomobject
+QWORD
+regedit
 robocopy
 SACLs
+sdkddkver
 Shobjidl
 Skype
+SRW
+sxs
+Sysinternals
 sysnative
 systemroot
 taskkill
 tasklist
 tdbuildteamid
+ucrt
+ucrtd
+unvirtualized
 VCRT
 vcruntime
+Virtualization
 visualstudio
+vscode
 VSTHRD
+winsdkver
 wlk
 wslpath
 wtl
--- a/.github/actions/spelling/dictionary/names.txt
+++ b/.github/actions/spelling/dictionary/names.txt
@@ -1,24 +1,30 @@
 Anup
 austdi
+arkthur
 Ballmer
 bhoj
 Bhojwani
+Bluloco
 carlos
 dhowett
 Diviness
 dsafa
 duhowett
+DXP
 ekg
+eryksun
 ethanschoonover
 Firefox
 Gatta
 glsl
+Gravell
 Grie
 Griese
 Hernan
 Howett
 Illhardt
 iquilezles
+italo
 jantari
 jerrysh
 Kaiyu
@@ -30,8 +36,11 @@ Kourosh
 kowalczyk
 leonmsft
 Lepilleur
+lhecker
 lukesampson
+Macbook
 Manandhar
+masserano
 mbadolato
 Mehrain
 menger
@@ -51,6 +60,7 @@ oldnewthing
 opengl
 osgwiki
 pabhojwa
+panos
 paulcam
 pauldotknopf
 PGP
@@ -59,18 +69,23 @@ Rincewind
 rprichard
 Schoonover
 shadertoy
+Shomnipotence
+simioni
 Somuah
 sonph
 sonpham
 stakx
+talo
 thereses
 Walisch
+WDX
+Wellons
 Wirt
 Wojciech
 zadjii
 Zamor
-zamora
 Zamora
+zamora
 Zoey
 zorio
 Zverovich
--- a/.github/actions/spelling/candidate.patterns
+++ b/.github/actions/spelling/candidate.patterns
@@ -0,0 +1,523 @@
+# marker to ignore all code on line
+^.*/\* #no-spell-check-line \*/.*$
+# marker for ignoring a comment to the end of the line
+// #no-spell-check.*$
+
+# patch hunk comments
+^\@\@ -\d+(?:,\d+|) \+\d+(?:,\d+|) \@\@ .*
+# git index header
+index [0-9a-z]{7,40}\.\.[0-9a-z]{7,40}
+
+# cid urls
+(['"])cid:.*?\g{-1}
+
+# data url in parens
+\(data:[^)]*?(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})[^)]*\)
+# data url in quotes
+([`'"])data:.*?(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,}).*\g{-1}
+# data url
+data:[-a-zA-Z=;:/0-9+]*,\S*
+
+# mailto urls
+mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,}
+
+# magnet urls
+magnet:[?=:\w]+
+
+# magnet urls
+"magnet:[^"]+"
+
+# obs:
+"obs:[^"]*"
+
+# The `\b` here means a break, it's the fancy way to handle urls, but it makes things harder to read
+# In this examples content, I'm using a number of different ways to match things to show various approaches
+# asciinema
+\basciinema\.org/a/[0-9a-zA-Z]+
+
+# apple
+\bdeveloper\.apple\.com/[-\w?=/]+
+# Apple music
+\bembed\.music\.apple\.com/fr/playlist/usr-share/[-\w.]+
+
+# appveyor api
+\bci\.appveyor\.com/api/projects/status/[0-9a-z]+
+# appveyor project
+\bci\.appveyor\.com/project/(?:[^/\s"]*/){2}builds?/\d+/job/[0-9a-z]+
+
+# Amazon
+
+# Amazon
+\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
+# AWS S3
+\b\w*\.s3[^.]*\.amazonaws\.com/[-\w/&#%_?:=]*
+# AWS execute-api
+\b[0-9a-z]{10}\.execute-api\.[-0-9a-z]+\.amazonaws\.com\b
+# AWS ELB
+\b\w+\.[-0-9a-z]+\.elb\.amazonaws\.com\b
+# AWS SNS
+\bsns\.[-0-9a-z]+.amazonaws\.com/[-\w/&#%_?:=]*
+# AWS VPC
+vpc-\w+
+
+# While you could try to match `http://` and `https://` by using `s?` in `https?://`, sometimes there
+# YouTube url
+\b(?:(?:www\.|)youtube\.com|youtu.be)/(?:channel/|embed/|user/|playlist\?list=|watch\?v=|v/|)[-a-zA-Z0-9?&=_%]*
+# YouTube music
+\bmusic\.youtube\.com/youtubei/v1/browse(?:[?&]\w+=[-a-zA-Z0-9?&=_]*)
+# YouTube tag
+<\s*youtube\s+id=['"][-a-zA-Z0-9?_]*['"]
+# YouTube image
+\bimg\.youtube\.com/vi/[-a-zA-Z0-9?&=_]*
+# Google Accounts
+\baccounts.google.com/[-_/?=.:;+%&0-9a-zA-Z]*
+# Google Analytics
+\bgoogle-analytics\.com/collect.[-0-9a-zA-Z?%=&_.~]*
+# Google APIs
+\bgoogleapis\.(?:com|dev)/[a-z]+/(?:v\d+/|)[a-z]+/[-@:./?=\w+|&]+
+# Google Storage
+\b[-a-zA-Z0-9.]*\bstorage\d*\.googleapis\.com(?:/\S*|)
+# Google Calendar
+\bcalendar\.google\.com/calendar(?:/u/\d+|)/embed\?src=[@./?=\w&%]+
+\w+\@group\.calendar\.google\.com\b
+# Google DataStudio
+\bdatastudio\.google\.com/(?:(?:c/|)u/\d+/|)(?:embed/|)(?:open|reporting|datasources|s)/[-0-9a-zA-Z]+(?:/page/[-0-9a-zA-Z]+|)
+# The leading `/` here is as opposed to the `\b` above
+# ... a short way to match `https://` or `http://` since most urls have one of those prefixes
+# Google Docs
+/docs\.google\.com/[a-z]+/(?:ccc\?key=\w+|(?:u/\d+|d/(?:e/|)[0-9a-zA-Z_-]+/)?(?:edit\?[-\w=#.]*|/\?[\w=&]*|))
+# Google Drive
+\bdrive\.google\.com/(?:file/d/|open)[-0-9a-zA-Z_?=]*
+# Google Groups
+\bgroups\.google\.com/(?:(?:forum/#!|d/)(?:msg|topics?|searchin)|a)/[^/\s"]+/[-a-zA-Z0-9$]+(?:/[-a-zA-Z0-9]+)*
+# Google Maps
+\bmaps\.google\.com/maps\?[\w&;=]*
+# Google themes
+themes\.googleusercontent\.com/static/fonts/[^/\s"]+/v\d+/[^.]+.
+# Google CDN
+\bclients2\.google(?:usercontent|)\.com[-0-9a-zA-Z/.]*
+# Goo.gl
+/goo\.gl/[a-zA-Z0-9]+
+# Google Chrome Store
+\bchrome\.google\.com/webstore/detail/[-\w]*(?:/\w*|)
+# Google Books
+\bgoogle\.(?:\w{2,4})/books(?:/\w+)*\?[-\w\d=&#.]*
+# Google Fonts
+\bfonts\.(?:googleapis|gstatic)\.com/[-/?=:;+&0-9a-zA-Z]*
+# Google Forms
+\bforms\.gle/\w+
+# Google Scholar
+\bscholar\.google\.com/citations\?user=[A-Za-z0-9_]+
+# Google Colab Research Drive
+\bcolab\.research\.google\.com/drive/[-0-9a-zA-Z_?=]*
+
+# GitHub SHAs (api)
+\bapi.github\.com/repos(?:/[^/\s"]+){3}/[0-9a-f]+\b
+# GitHub SHAs (markdown)
+(?:\[`?[0-9a-f]+`?\]\(https:/|)/(?:www\.|)github\.com(?:/[^/\s"]+){2,}(?:/[^/\s")]+)(?:[0-9a-f]+(?:[-0-9a-zA-Z/#.]*|)\b|)
+# GitHub SHAs
+\bgithub\.com(?:/[^/\s"]+){2}[@#][0-9a-f]+\b
+# GitHub wiki
+\bgithub\.com/(?:[^/]+/){2}wiki/(?:(?:[^/]+/|)_history|[^/]+(?:/_compare|)/[0-9a-f.]{40,})\b
+# githubusercontent
+/[-a-z0-9]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
+# githubassets
+\bgithubassets.com/[0-9a-f]+(?:[-/\w.]+)
+# gist github
+\bgist\.github\.com/[^/\s"]+/[0-9a-f]+
+# git.io
+\bgit\.io/[0-9a-zA-Z]+
+# GitHub JSON
+"node_id": "[-a-zA-Z=;:/0-9+]*"
+# Contributor
+\[[^\]]+\]\(https://github\.com/[^/\s"]+\)
+# GHSA
+GHSA(?:-[0-9a-z]{4}){3}
+
+# GitLab commit
+\bgitlab\.[^/\s"]*/\S+/\S+/commit/[0-9a-f]{7,16}#[0-9a-f]{40}\b
+# GitLab merge requests
+\bgitlab\.[^/\s"]*/\S+/\S+/-/merge_requests/\d+/diffs#[0-9a-f]{40}\b
+# GitLab uploads
+\bgitlab\.[^/\s"]*/uploads/[-a-zA-Z=;:/0-9+]*
+# GitLab commits
+\bgitlab\.[^/\s"]*/(?:[^/\s"]+/){2}commits?/[0-9a-f]+\b
+
+# binanace
+accounts.binance.com/[a-z/]*oauth/authorize\?[-0-9a-zA-Z&%]*
+
+# bitbucket diff
+\bapi\.bitbucket\.org/\d+\.\d+/repositories/(?:[^/\s"]+/){2}diff(?:stat|)(?:/[^/\s"]+){2}:[0-9a-f]+
+# bitbucket repositories commits
+\bapi\.bitbucket\.org/\d+\.\d+/repositories/(?:[^/\s"]+/){2}commits?/[0-9a-f]+
+# bitbucket commits
+\bbitbucket\.org/(?:[^/\s"]+/){2}commits?/[0-9a-f]+
+
+# bit.ly
+\bbit\.ly/\w+
+
+# bitrise
+\bapp\.bitrise\.io/app/[0-9a-f]*/[\w.?=&]*
+
+# bootstrapcdn.com
+\bbootstrapcdn\.com/[-./\w]+
+
+# cdn.cloudflare.com
+\bcdnjs\.cloudflare\.com/[./\w]+
+
+# circleci
+\bcircleci\.com/gh(?:/[^/\s"]+){1,5}.[a-z]+\?[-0-9a-zA-Z=&]+
+
+# gitter
+\bgitter\.im(?:/[^/\s"]+){2}\?at=[0-9a-f]+
+
+# gravatar
+\bgravatar\.com/avatar/[0-9a-f]+
+
+# ibm
+[a-z.]*ibm\.com/[-_#=:%!?~.\\/\d\w]*
+
+# imgur
+\bimgur\.com/[^.]+
+
+# Internet Archive
+\barchive\.org/web/\d+/(?:[-\w.?,'/\\+&%$#_:]*)
+
+# discord
+/discord(?:app\.com|\.gg)/(?:invite/)?[a-zA-Z0-9]{7,}
+
+# Disqus
+\bdisqus\.com/[-\w/%.()!?&=_]*
+
+# medium link
+\blink\.medium\.com/[a-zA-Z0-9]+
+# medium
+\bmedium\.com/\@?[^/\s"]+/[-\w]+
+
+# microsoft
+\b(?:https?://|)(?:(?:download\.visualstudio|docs|msdn2?|research)\.microsoft|blogs\.msdn)\.com/[-_a-zA-Z0-9()=./%]*
+# powerbi
+\bapp\.powerbi\.com/reportEmbed/[^"' ]*
+# vs devops
+\bvisualstudio.com(?::443|)/[-\w/?=%&.]*
+# microsoft store
+\bmicrosoft\.com/store/apps/\w+
+
+# mvnrepository.com
+\bmvnrepository\.com/[-0-9a-z./]+
+
+# now.sh
+/[0-9a-z-.]+\.now\.sh\b
+
+# oracle
+\bdocs\.oracle\.com/[-0-9a-zA-Z./_?#&=]*
+
+# chromatic.com
+/\S+.chromatic.com\S*[")]
+
+# codacy
+\bapi\.codacy\.com/project/badge/Grade/[0-9a-f]+
+
+# compai
+\bcompai\.pub/v1/png/[0-9a-f]+
+
+# mailgun api
+\.api\.mailgun\.net/v3/domains/[0-9a-z]+\.mailgun.org/messages/[0-9a-zA-Z=@]*
+# mailgun
+\b[0-9a-z]+.mailgun.org
+
+# /message-id/
+/message-id/[-\w@./%]+
+
+# Reddit
+\breddit\.com/r/[/\w_]*
+
+# requestb.in
+\brequestb\.in/[0-9a-z]+
+
+# sched
+\b[a-z0-9]+\.sched\.com\b
+
+# Slack url
+slack://[a-zA-Z0-9?&=]+
+# Slack
+\bslack\.com/[-0-9a-zA-Z/_~?&=.]*
+# Slack edge
+\bslack-edge\.com/[-a-zA-Z0-9?&=%./]+
+# Slack images
+\bslack-imgs\.com/[-a-zA-Z0-9?&=%.]+
+
+# shields.io
+\bshields\.io/[-\w/%?=&.:+;,]*
+
+# stackexchange -- https://stackexchange.com/feeds/sites
+\b(?:askubuntu|serverfault|stack(?:exchange|overflow)|superuser).com/(?:questions/\w+/[-\w]+|a/)
+
+# Sentry
+[0-9a-f]{32}\@o\d+\.ingest\.sentry\.io\b
+
+# Twitter markdown
+\[\@[^[/\]:]*?\]\(https://twitter.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)\)
+# Twitter hashtag
+\btwitter\.com/hashtag/[\w?_=&]*
+# Twitter status
+\btwitter\.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)
+# Twitter profile images
+\btwimg\.com/profile_images/[_\w./]*
+# Twitter media
+\btwimg\.com/media/[-_\w./?=]*
+# Twitter link shortened
+\bt\.co/\w+
+
+# facebook
+\bfburl\.com/[0-9a-z_]+
+# facebook CDN
+\bfbcdn\.net/[\w/.,]*
+# facebook watch
+\bfb\.watch/[0-9A-Za-z]+
+
+# dropbox
+\bdropbox\.com/sh?/[^/\s"]+/[-0-9A-Za-z_.%?=&;]+
+
+# ipfs protocol
+ipfs://[0-9a-z]*
+# ipfs url
+/ipfs/[0-9a-z]*
+
+# w3
+\bw3\.org/[-0-9a-zA-Z/#.]+
+
+# loom
+\bloom\.com/embed/[0-9a-f]+
+
+# regex101
+\bregex101\.com/r/[^/\s"]+/\d+
+
+# figma
+\bfigma\.com/file(?:/[0-9a-zA-Z]+/)+
+
+# freecodecamp.org
+\bfreecodecamp\.org/[-\w/.]+
+
+# image.tmdb.org
+\bimage\.tmdb\.org/[/\w.]+
+
+# mermaid
+\bmermaid\.ink/img/[-\w]+|\bmermaid-js\.github\.io/mermaid-live-editor/#/edit/[-\w]+
+
+# Wikipedia
+\ben\.wikipedia\.org/wiki/[-\w%.#]+
+
+# gitweb
+[^"\s]+/gitweb/\S+;h=[0-9a-f]+
+
+# HyperKitty lists
+/archives/list/[^@/]+\@[^/\s"]*/message/[^/\s"]*/
+
+# lists
+/thread\.html/[^"\s]+
+
+# list-management
+\blist-manage\.com/subscribe(?:[?&](?:u|id)=[0-9a-f]+)+
+
+# kubectl.kubernetes.io/last-applied-configuration
+"kubectl.kubernetes.io/last-applied-configuration": ".*"
+
+# pgp
+\bgnupg\.net/pks/lookup[?&=0-9a-zA-Z]*
+
+# Spotify
+\bopen\.spotify\.com/embed/playlist/\w+
+
+# Mastodon
+\bmastodon\.[-a-z.]*/(?:media/|\@)[?&=0-9a-zA-Z_]*
+
+# scastie
+\bscastie\.scala-lang\.org/[^/]+/\w+
+
+# images.unsplash.com
+\bimages\.unsplash\.com/(?:(?:flagged|reserve)/|)[-\w./%?=%&.;]+
+
+# pastebin
+\bpastebin\.com/[\w/]+
+
+# heroku
+\b\w+\.heroku\.com/source/archive/\w+
+
+# quip
+\b\w+\.quip\.com/\w+(?:(?:#|/issues/)\w+)?
+
+# badgen.net
+\bbadgen\.net/badge/[^")\]'\s]+
+
+# statuspage.io
+\w+\.statuspage\.io\b
+
+# media.giphy.com
+\bmedia\.giphy\.com/media/[^/]+/[\w.?&=]+
+
+# tinyurl
+\btinyurl\.com/\w+
+
+# getopts
+\bgetopts\s+(?:"[^"]+"|'[^']+')
+
+# ANSI color codes
+(?:\\(?:u00|x)1b|\x1b)\[\d+(?:;\d+|)m
+
+# URL escaped characters
+\%[0-9A-F][A-F]
+# IPv6
+\b(?:[0-9a-fA-F]{0,4}:){3,7}[0-9a-fA-F]{0,4}\b
+# c99 hex digits (not the full format, just one I've seen)
+0x[0-9a-fA-F](?:\.[0-9a-fA-F]*|)[pP]
+# Punycode
+\bxn--[-0-9a-z]+
+# sha
+sha\d+:[0-9]*[a-f]{3,}[0-9a-f]*
+# sha-... -- uses a fancy capture
+(['"]|&quot;)[0-9a-f]{40,}\g{-1}
+# hex runs
+\b[0-9a-fA-F]{16,}\b
+# hex in url queries
+=[0-9a-fA-F]*?(?:[A-F]{3,}|[a-f]{3,})[0-9a-fA-F]*?&
+# ssh
+(?:ssh-\S+|-nistp256) [-a-zA-Z=;:/0-9+]{12,}
+
+# PGP
+\b(?:[0-9A-F]{4} ){9}[0-9A-F]{4}\b
+# GPG keys
+\b(?:[0-9A-F]{4} ){5}(?: [0-9A-F]{4}){5}\b
+# Well known gpg keys
+.well-known/openpgpkey/[\w./]+
+
+# uuid:
+\b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b
+# hex digits including css/html color classes:
+(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|u\d+)\b
+# integrity
+integrity="sha\d+-[-a-zA-Z=;:/0-9+]{40,}"
+
+# https://www.gnu.org/software/groff/manual/groff.html
+# man troff content
+\\f[BCIPR]
+# '
+\\\(aq
+
+# .desktop mime types
+^MimeTypes?=.*$
+# .desktop localized entries
+^[A-Z][a-z]+\[[a-z]+\]=.*$
+# Localized .desktop content
+Name\[[^\]]+\]=.*
+
+# IServiceProvider
+\bI(?=(?:[A-Z][a-z]{2,})+\b)
+
+# crypt
+"\$2[ayb]\$.{56}"
+
+# scrypt / argon
+\$(?:scrypt|argon\d+[di]*)\$\S+
+
+# Input to GitHub JSON
+content: "[-a-zA-Z=;:/0-9+]*="
+
+# Python stringprefix / binaryprefix
+# Note that there's a high false positive rate, remove the `?=` and search for the regex to see if the matches seem like reasonable strings
+(?<!')\b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)'(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})
+
+# Regular expressions for (P|p)assword
+\([A-Z]\|[a-z]\)[a-z]+
+
+# JavaScript regular expressions
+# javascript test regex
+/.*/[gim]*\.test\(
+# javascript match regex
+\.match\(/[^/\s"]*/[gim]*\s*
+# javascript match regex
+\.match\(/\\[b].*?/[gim]*\s*\)(?:;|$)
+# javascript regex
+^\s*/\\[b].*/[gim]*\s*(?:\)(?:;|$)|,$)
+# javascript replace regex
+\.replace\(/[^/\s"]*/[gim]*\s*,
+
+# Go regular expressions
+regexp?\.MustCompile\(`[^`]*`\)
+
+# sed regular expressions
+sed 's/(?:[^/]*?[a-zA-Z]{3,}[^/]*?/){2}
+
+# go install
+go install(?:\s+[a-z]+\.[-@\w/.]+)+
+
+# kubernetes pod status lists
+# https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
+\w+(?:-\w+)+\s+\d+/\d+\s+(?:Running|Pending|Succeeded|Failed|Unknown)\s+
+
+# kubectl - pods in CrashLoopBackOff
+\w+-[0-9a-f]+-\w+\s+\d+/\d+\s+CrashLoopBackOff\s+
+
+# kubernetes object suffix
+-[0-9a-f]{10}-\w{5}\s
+
+# posthog secrets
+posthog\.init\((['"])phc_[^"',]+\g{-1},
+
+# xcode
+
+# xcodeproject scenes
+(?:Controller|ID|id)="\w{3}-\w{2}-\w{3}"
+
+# xcode api botches
+customObjectInstantitationMethod
+
+# font awesome classes
+\.fa-[-a-z0-9]+
+
+# Update Lorem based on your content (requires `ge` and `w` from https://github.com/jsoref/spelling; and `review` from https://github.com/check-spelling/check-spelling/wiki/Looking-for-items-locally )
+# grep '^[^#].*lorem' .github/actions/spelling/patterns.txt|perl -pne 's/.*i..\?://;s/\).*//' |tr '|' "\n"|sort -f |xargs -n1 ge|perl -pne 's/^[^:]*://'|sort -u|w|sed -e 's/ .*//'|w|review -
+# Warning, while `(?i)` is very neat and fancy, if you have some binary files that aren't proper unicode, you might run into:
+## Operation "substitution (s///)" returns its argument for non-Unicode code point 0x1C19AE (the code point will vary).
+## You could manually change `(?i)X...` to use `[Xx]...`
+## or you could add the files to your `excludes` file (a version after 0.0.19 should identify the file path)
+# Lorem
+(?:\w|\s|[,.])*\b(?i)(?:amet|consectetur|cursus|dolor|eros|ipsum|lacus|libero|ligula|lorem|magna|neque|nulla|suscipit|tempus)\b(?:\w|\s|[,.])*
+
+# Non-English
+[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
+
+# French
+# This corpus only had capital letters, but you probably want lowercase ones as well.
+\b[LN]'+[a-z]{2,}\b
+
+# latex
+\\(?:n(?:ew|ormal|osub)|r(?:enew)|t(?:able(?:of|)|he|itle))(?=[a-z]+)
+
+# the negative lookahead here is to allow catching 'templatesz' as a misspelling
+# but to otherwise recognize a Windows path with \templates\foo.template or similar:
+\\(?:necessary|r(?:eport|esolve[dr]?|esult)|t(?:arget|emplates?))(?![a-z])
+# ignore long runs of a single character:
+\b([A-Za-z])\g{-1}{3,}\b
+# Note that the next example is no longer necessary if you are using
+# to match a string starting with a `#`, use a character-class:
+[#]backwards
+# version suffix <word>v#
+(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
+# Compiler flags (Scala)
+(?:^|[\t ,>"'`=(])-J-[DPWXY](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
+# Compiler flags
+#(?:^|[\t ,"'`=(])-[DPWXYLlf](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
+
+# Compiler flags (linker)
+,-B
+# curl arguments
+\b(?:\\n|)curl(?:\s+-[a-zA-Z]{1,2}\b)*(?:\s+-[a-zA-Z]{3,})(?:\s+-[a-zA-Z]+)*
+# set arguments
+\bset(?:\s+-[abefimouxE]{1,2})*\s+-[abefimouxE]{3,}(?:\s+-[abefimouxE]+)*
+# tar arguments
+\b(?:\\n|)g?tar(?:\.exe|)(?:(?:\s+--[-a-zA-Z]+|\s+-[a-zA-Z]+|\s[ABGJMOPRSUWZacdfh-pr-xz]+\b)(?:=[^ ]*|))+
+# tput arguments -- https://man7.org/linux/man-pages/man5/terminfo.5.html -- technically they can be more than 5 chars long...
+\btput\s+(?:(?:-[SV]|-T\s*\w+)\s+)*\w{3,5}\b
+# macOS temp folders
+/var/folders/\w\w/[+\w]+/(?:T|-Caches-)/
--- a/.github/actions/spelling/dictionary/apis.txt
+++ b/.github/actions/spelling/dictionary/apis.txt
@@ -1,102 +0,0 @@
-ACCEPTFILES
-ACCESSDENIED
-alignof
-bitfield
-bitfields
-CLASSNOTAVAILABLE
-cmdletbinding
-COLORPROPERTY
-CXICON
-CYICON
-D2DERR_SHADER_COMPILE_FAILED
-DERR
-environstrings
-EXPCMDFLAGS
-EXPCMDSTATE
-frac
-fullkbd
-futex
-GETDESKWALLPAPER
-GETHIGHCONTRAST
-Hashtable
-HIGHCONTRASTON
-HIGHCONTRASTW
-href
-IAppearance
-IAsync
-IBind
-IBox
-IClass
-IConnection
-IComparable
-ICustom
-IDialog
-IDirect
-IExplorer
-IInheritable
-IMap
-IObject
-IPeasant
-IStorage
-ITab
-ITaskbar
-LCID
-llabs
-llu
-localtime
-lround
-LSHIFT
-MULTIPLEUSE
-msappx
-MULTIPLEUSE
-NCHITTEST
-NCLBUTTONDBLCLK
-NCRBUTTONDBLCLK
-NOAGGREGATION
-NOPROGRESS
-NOREDIRECTIONBITMAP
-ntprivapi
-oaidl
-ocidl
-otms
-OUTLINETEXTMETRICW
-overridable
-PAGESCROLL
-pmr
-REGCLS
-RETURNCMD
-REGCLS
-rfind
-roundf
-RSHIFT
-rx
-schandle
-semver
-serializer
-shobjidl
-SIZENS
-smoothstep
-GETDESKWALLPAPER
-snprintf
-spsc
-sregex
-STDCPP
-strchr
-Subheader
-Subpage
-UPDATEINIFILE
-syscall
-TBPF
-THEMECHANGED
-tmp
-tolower
-tx
-UPDATEINIFILE
-userenv
-wcsstr
-wcstoui
-wpc
-wsregex
-XDocument
-XElement
-XParse
--- a/.github/actions/spelling/dictionary/colors.txt
+++ b/.github/actions/spelling/dictionary/colors.txt
@@ -1,782 +0,0 @@
-snow
-ghost-white
-ghostwhite
-white-smoke
-whitesmoke
-gainsboro
-floral-white
-floralwhite
-old-lace
-oldlace
-linen
-antique-white
-antiquewhite
-papaya-whip
-papayawhip
-blanched-almond
-blanchedalmond
-bisque
-peach-puff
-peachpuff
-navajo-white
-navajowhite
-moccasin
-cornsilk
-ivory
-lemon-chiffon
-lemonchiffon
-seashell
-honeydew
-mint-cream
-mintcream
-azure
-alice-blue
-aliceblue
-lavender
-lavender-blush
-lavenderblush
-misty-rose
-mistyrose
-white
-black
-dark-slate-gray
-darkslategray
-dark-slate-grey
-darkslategrey
-dim-gray
-dimgray
-dim-grey
-dimgrey
-slate-gray
-slategray
-slate-grey
-slategrey
-light-slate-gray
-lightslategray
-light-slate-grey
-lightslategrey
-gray
-grey
-xray
-x11gray
-xrey
-x11grey
-web-gray
-webgray
-web-grey
-webgrey
-light-grey
-lightgrey
-light-gray
-lightgray
-midnight-blue
-midnightblue
-navy
-navy-blue
-navyblue
-cornflower-blue
-cornflowerblue
-dark-slate-blue
-darkslateblue
-slate-blue
-slateblue
-medium-slate-blue
-mediumslateblue
-light-slate-blue
-lightslateblue
-medium-blue
-mediumblue
-royal-blue
-royalblue
-blue
-dodger-blue
-dodgerblue
-deep-sky-blue
-deepskyblue
-sky-blue
-skyblue
-light-sky-blue
-lightskyblue
-steel-blue
-steelblue
-light-steel-blue
-lightsteelblue
-light-blue
-lightblue
-powder-blue
-powderblue
-pale-turquoise
-paleturquoise
-dark-turquoise
-darkturquoise
-medium-turquoise
-mediumturquoise
-turquoise
-cyan
-aqua
-light-cyan
-lightcyan
-cadet-blue
-cadetblue
-medium-aquamarine
-mediumaquamarine
-aquamarine
-dark-green
-darkgreen
-dark-olive-green
-darkolivegreen
-dark-sea-green
-darkseagreen
-sea-green
-seagreen
-medium-sea-green
-mediumseagreen
-light-sea-green
-lightseagreen
-pale-green
-palegreen
-spring-green
-springgreen
-lawn-green
-lawngreen
-green
-lime
-xreen
-x11green
-web-green
-webgreen
-chartreuse
-medium-spring-green
-mediumspringgreen
-green-yellow
-greenyellow
-lime-green
-limegreen
-yellow-green
-yellowgreen
-forest-green
-forestgreen
-olive-drab
-olivedrab
-dark-khaki
-darkkhaki
-khaki
-pale-goldenrod
-palegoldenrod
-light-goldenrod-yellow
-lightgoldenrodyellow
-light-yellow
-lightyellow
-yellow
-gold
-light-goldenrod
-lightgoldenrod
-goldenrod
-dark-goldenrod
-darkgoldenrod
-rosy-brown
-rosybrown
-indian-red
-indianred
-saddle-brown
-saddlebrown
-sienna
-peru
-burlywood
-beige
-wheat
-sandy-brown
-sandybrown
-tan
-chocolate
-firebrick
-brown
-dark-salmon
-darksalmon
-salmon
-light-salmon
-lightsalmon
-orange
-dark-orange
-darkorange
-coral
-light-coral
-lightcoral
-tomato
-orange-red
-orangered
-red
-hot-pink
-hotpink
-deep-pink
-deeppink
-pink
-light-pink
-lightpink
-pale-violet-red
-palevioletred
-maroon
-xaroon
-x11maroon
-web-maroon
-webmaroon
-medium-violet-red
-mediumvioletred
-violet-red
-violetred
-magenta
-fuchsia
-violet
-plum
-orchid
-medium-orchid
-mediumorchid
-dark-orchid
-darkorchid
-dark-violet
-darkviolet
-blue-violet
-blueviolet
-purple
-xurple
-x11purple
-web-purple
-webpurple
-medium-purple
-mediumpurple
-thistle
-snow1
-snow2
-snow3
-snow4
-seashell1
-seashell2
-seashell3
-seashell4
-antiquewhite1
-antiquewhite2
-antiquewhite3
-antiquewhite4
-bisque1
-bisque2
-bisque3
-bisque4
-peachpuff1
-peachpuff2
-peachpuff3
-peachpuff4
-navajowhite1
-navajowhite2
-navajowhite3
-navajowhite4
-lemonchiffon1
-lemonchiffon2
-lemonchiffon3
-lemonchiffon4
-cornsilk1
-cornsilk2
-cornsilk3
-cornsilk4
-ivory1
-ivory2
-ivory3
-ivory4
-honeydew1
-honeydew2
-honeydew3
-honeydew4
-lavenderblush1
-lavenderblush2
-lavenderblush3
-lavenderblush4
-mistyrose1
-mistyrose2
-mistyrose3
-mistyrose4
-azure1
-azure2
-azure3
-azure4
-slateblue1
-slateblue2
-slateblue3
-slateblue4
-royalblue1
-royalblue2
-royalblue3
-royalblue4
-blue1
-blue2
-blue3
-blue4
-dodgerblue1
-dodgerblue2
-dodgerblue3
-dodgerblue4
-steelblue1
-steelblue2
-steelblue3
-steelblue4
-deepskyblue1
-deepskyblue2
-deepskyblue3
-deepskyblue4
-skyblue1
-skyblue2
-skyblue3
-skyblue4
-lightskyblue1
-lightskyblue2
-lightskyblue3
-lightskyblue4
-slategray1
-slategray2
-slategray3
-slategray4
-lightsteelblue1
-lightsteelblue2
-lightsteelblue3
-lightsteelblue4
-lightblue1
-lightblue2
-lightblue3
-lightblue4
-lightcyan1
-lightcyan2
-lightcyan3
-lightcyan4
-paleturquoise1
-paleturquoise2
-paleturquoise3
-paleturquoise4
-cadetblue1
-cadetblue2
-cadetblue3
-cadetblue4
-turquoise1
-turquoise2
-turquoise3
-turquoise4
-cyan1
-cyan2
-cyan3
-cyan4
-darkslategray1
-darkslategray2
-darkslategray3
-darkslategray4
-aquamarine1
-aquamarine2
-aquamarine3
-aquamarine4
-darkseagreen1
-darkseagreen2
-darkseagreen3
-darkseagreen4
-seagreen1
-seagreen2
-seagreen3
-seagreen4
-palegreen1
-palegreen2
-palegreen3
-palegreen4
-springgreen1
-springgreen2
-springgreen3
-springgreen4
-green1
-green2
-green3
-green4
-chartreuse1
-chartreuse2
-chartreuse3
-chartreuse4
-olivedrab1
-olivedrab2
-olivedrab3
-olivedrab4
-darkolivegreen1
-darkolivegreen2
-darkolivegreen3
-darkolivegreen4
-khaki1
-khaki2
-khaki3
-khaki4
-lightgoldenrod1
-lightgoldenrod2
-lightgoldenrod3
-lightgoldenrod4
-lightyellow1
-lightyellow2
-lightyellow3
-lightyellow4
-yellow1
-yellow2
-yellow3
-yellow4
-gold1
-gold2
-gold3
-gold4
-goldenrod1
-goldenrod2
-goldenrod3
-goldenrod4
-darkgoldenrod1
-darkgoldenrod2
-darkgoldenrod3
-darkgoldenrod4
-rosybrown1
-rosybrown2
-rosybrown3
-rosybrown4
-indianred1
-indianred2
-indianred3
-indianred4
-sienna1
-sienna2
-sienna3
-sienna4
-burlywood1
-burlywood2
-burlywood3
-burlywood4
-wheat1
-wheat2
-wheat3
-wheat4
-tan1
-tan2
-tan3
-tan4
-chocolate1
-chocolate2
-chocolate3
-chocolate4
-firebrick1
-firebrick2
-firebrick3
-firebrick4
-brown1
-brown2
-brown3
-brown4
-salmon1
-salmon2
-salmon3
-salmon4
-lightsalmon1
-lightsalmon2
-lightsalmon3
-lightsalmon4
-orange1
-orange2
-orange3
-orange4
-darkorange1
-darkorange2
-darkorange3
-darkorange4
-coral1
-coral2
-coral3
-coral4
-tomato1
-tomato2
-tomato3
-tomato4
-orangered1
-orangered2
-orangered3
-orangered4
-red1
-red2
-red3
-red4
-deeppink1
-deeppink2
-deeppink3
-deeppink4
-hotpink1
-hotpink2
-hotpink3
-hotpink4
-pink1
-pink2
-pink3
-pink4
-lightpink1
-lightpink2
-lightpink3
-lightpink4
-palevioletred1
-palevioletred2
-palevioletred3
-palevioletred4
-maroon1
-maroon2
-maroon3
-maroon4
-violetred1
-violetred2
-violetred3
-violetred4
-magenta1
-magenta2
-magenta3
-magenta4
-orchid1
-orchid2
-orchid3
-orchid4
-plum1
-plum2
-plum3
-plum4
-mediumorchid1
-mediumorchid2
-mediumorchid3
-mediumorchid4
-darkorchid1
-darkorchid2
-darkorchid3
-darkorchid4
-purple1
-purple2
-purple3
-purple4
-mediumpurple1
-mediumpurple2
-mediumpurple3
-mediumpurple4
-thistle1
-thistle2
-thistle3
-thistle4
-gray0
-grey0
-gray1
-grey1
-gray2
-grey2
-gray3
-grey3
-gray4
-grey4
-gray5
-grey5
-gray6
-grey6
-gray7
-grey7
-gray8
-grey8
-gray9
-grey9
-gray10
-grey10
-gray11
-grey11
-gray12
-grey12
-gray13
-grey13
-gray14
-grey14
-gray15
-grey15
-gray16
-grey16
-gray17
-grey17
-gray18
-grey18
-gray19
-grey19
-gray20
-grey20
-gray21
-grey21
-gray22
-grey22
-gray23
-grey23
-gray24
-grey24
-gray25
-grey25
-gray26
-grey26
-gray27
-grey27
-gray28
-grey28
-gray29
-grey29
-gray30
-grey30
-gray31
-grey31
-gray32
-grey32
-gray33
-grey33
-gray34
-grey34
-gray35
-grey35
-gray36
-grey36
-gray37
-grey37
-gray38
-grey38
-gray39
-grey39
-gray40
-grey40
-gray41
-grey41
-gray42
-grey42
-gray43
-grey43
-gray44
-grey44
-gray45
-grey45
-gray46
-grey46
-gray47
-grey47
-gray48
-grey48
-gray49
-grey49
-gray50
-grey50
-gray51
-grey51
-gray52
-grey52
-gray53
-grey53
-gray54
-grey54
-gray55
-grey55
-gray56
-grey56
-gray57
-grey57
-gray58
-grey58
-gray59
-grey59
-gray60
-grey60
-gray61
-grey61
-gray62
-grey62
-gray63
-grey63
-gray64
-grey64
-gray65
-grey65
-gray66
-grey66
-gray67
-grey67
-gray68
-grey68
-gray69
-grey69
-gray70
-grey70
-gray71
-grey71
-gray72
-grey72
-gray73
-grey73
-gray74
-grey74
-gray75
-grey75
-gray76
-grey76
-gray77
-grey77
-gray78
-grey78
-gray79
-grey79
-gray80
-grey80
-gray81
-grey81
-gray82
-grey82
-gray83
-grey83
-gray84
-grey84
-gray85
-grey85
-gray86
-grey86
-gray87
-grey87
-gray88
-grey88
-gray89
-grey89
-gray90
-grey90
-gray91
-grey91
-gray92
-grey92
-gray93
-grey93
-gray94
-grey94
-gray95
-grey95
-gray96
-grey96
-gray97
-grey97
-gray98
-grey98
-gray99
-grey99
-gray100
-grey100
-dark-grey
-darkgrey
-dark-gray
-darkgray
-dark-blue
-darkblue
-dark-cyan
-darkcyan
-dark-magenta
-darkmagenta
-dark-red
-darkred
-light-green
-lightgreen
-crimson
-indigo
-olive
-rebecca-purple
-rebeccapurple
-silver
-teal
--- a/.github/actions/spelling/dictionary/dictionary.txt
+++ b/.github/actions/spelling/dictionary/dictionary.txt
--- a/.github/actions/spelling/dictionary/math.txt
+++ b/.github/actions/spelling/dictionary/math.txt
@@ -1,3 +0,0 @@
-powf
-sqrtf
-isnan
--- a/.github/actions/spelling/excludes.txt
+++ b/.github/actions/spelling/excludes.txt
@@ -1,27 +1,39 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
+(?:(?i)\.png$)
+(?:^|/)(?i)COPYRIGHT
+(?:^|/)(?i)LICEN[CS]E
+(?:^|/)3rdparty/
 (?:^|/)dirs$
 (?:^|/)go\.mod$
 (?:^|/)go\.sum$
-(?:^|/)package-lock\.json$
+(?:^|/)package(?:-lock|)\.json$
 (?:^|/)sources(?:|\.dep)$
-SUMS$
+(?:^|/)vendor/
+\.a$
 \.ai$
+\.avi$
 \.bmp$
+\.bz2$
 \.cer$
 \.class$
 \.crl$
 \.crt$
 \.csr$
 \.dll$
+\.docx?$
+\.drawio$
 \.DS_Store$
 \.eot$
 \.eps$
 \.exe$
 \.gif$
+\.gitattributes$
 \.graffle$
 \.gz$
 \.icns$
 \.ico$
 \.jar$
+\.jks$
 \.jpeg$
 \.jpg$
 \.key$
@@ -29,38 +41,77 @@ SUMS$
 \.lock$
 \.map$
 \.min\..
+\.mod$
 \.mp3$
 \.mp4$
+\.o$
+\.ocf$
 \.otf$
 \.pbxproj$
 \.pdf$
 \.pem$
-(?:(?i)\.png$)
+\.png$
 \.psd$
+\.pyc$
 \.runsettings$
+\.s$
 \.sig$
 \.so$
 \.svg$
 \.svgz$
+\.svgz?$
 \.tar$
 \.tgz$
+\.tiff?$
 \.ttf$
 \.vsdx$
+\.wav$
+\.webm$
+\.webp$
 \.woff
+\.woff2?$
 \.xcf$
 \.xls
+\.xlsx?$
 \.xpm$
 \.yml$
 \.zip$
+^\.github/actions/spelling/
+^\.github/fabricbot.json$
+^\.gitignore$
+^\Q.git-blame-ignore-revs\E$
+^\Q.github/workflows/spelling.yml\E$
+^\Qdoc/reference/windows-terminal-logo.ans\E$
+^\Qsamples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj.filters\E$
+^\Qsrc/host/exe/Host.EXE.vcxproj.filters\E$
+^\Qsrc/host/ft_host/chafa.txt\E$
+^\Qsrc/tools/closetest/CloseTest.vcxproj.filters\E$
+^\XamlStyler.json$
+^build/config/
 ^consolegit2gitfilters\.json$
 ^dep/
-^oss/
-^doc/reference/UTF8-torture-test\.txt$
-^src/interactivity/onecore/BgfxEngine\.
-^src/renderer/wddmcon/WddmConRenderer\.
-^src/terminal/parser/ft_fuzzer/VTCommandFuzzer\.cpp$
-^src/types/ut_types/UtilsTests.cpp$
-^src/tools/U8U16Test/(?:fr|ru|zh)\.txt$
-^\.github/actions/spelling/
-^\.gitignore$
 ^doc/reference/master-sequence-list.csv$
+^doc/reference/UTF8-torture-test\.txt$
+^oss/
+^src/host/ft_uia/run\.bat$
+^src/host/runft\.bat$
+^src/host/runut\.bat$
+^src/interactivity/onecore/BgfxEngine\.
+^src/renderer/atlas/
+^src/renderer/wddmcon/WddmConRenderer\.
+^src/terminal/adapter/ut_adapter/run\.bat$
+^src/terminal/parser/delfuzzpayload\.bat$
+^src/terminal/parser/ft_fuzzer/run\.bat$
+^src/terminal/parser/ft_fuzzer/VTCommandFuzzer\.cpp$
+^src/terminal/parser/ft_fuzzwrapper/run\.bat$
+^src/terminal/parser/ut_parser/Base64Test.cpp$
+^src/terminal/parser/ut_parser/run\.bat$
+^src/tools/integrity/packageuwp/ConsoleUWP\.appxSources$
+^src/tools/lnkd/lnkd\.bat$
+^src/tools/pixels/pixels\.bat$
+^src/tools/texttests/fira\.txt$
+^src/tools/U8U16Test/(?:fr|ru|zh)\.txt$
+^src/types/ut_types/UtilsTests.cpp$
+^tools/ReleaseEngineering/ServicingPipeline.ps1$
+ignore$
+SUMS$
--- a/.github/actions/spelling/expect/alphabet.txt
+++ b/.github/actions/spelling/expect/alphabet.txt
@@ -1,16 +1,23 @@
+AAAa
+AAAAA
+AAAAAAAAAAAAA
+AAAAAABBBBBBCCC
+AAAAABBBBBBCCC
+abcd
 abcd
-abcde
-abcdef
-ABCDEFG
-ABCDEFGH
 ABCDEFGHIJ
 abcdefghijk
+ABCDEFGHIJKLMNO
 abcdefghijklmnop
 ABCDEFGHIJKLMNOPQRST
-abcdefghijklmnopqrstuvwxyz
+ABCG
 ABE
+abf
+BBBBB
+BBBBBBBB
+BBBBBCCC
+BBBBCCCCC
 BBGGRR
-BBBBBBBBBBBBBBDDDD
 EFG
 EFGh
 QQQQQQQQQQABCDEFGHIJ
@@ -19,7 +26,6 @@ QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQQ
 QQQQQQQQQQABCDEFGHIJPQRSTQQQQQQQQQQ
 qrstuvwxyz
 qwerty
-QWERTYUIOP
 qwertyuiopasdfg
 YYYYYYYDDDDDDDDDDD
 ZAAZZ
@@ -31,3 +37,4 @@ ZYXWVUT
 ZZBBZ
 ZZZBB
 ZZZBZ
+ZZZZZ
--- a/.github/actions/spelling/expect/expect.txt
+++ b/.github/actions/spelling/expect/expect.txt
--- a/.github/actions/spelling/expect/web.txt
+++ b/.github/actions/spelling/expect/web.txt
@@ -1,17 +1,6 @@
-http
-td
-www
-ecma
-rapidtables
 WCAG
-freedesktop
-ycombinator
-robertelder
-kovidgoyal
-leonerd
-fixterms
-uk
 winui
 appshellintegration
+mdtauk
 gfycat
-what3words
+Guake
--- a/.github/actions/spelling/line_forbidden.patterns
+++ b/.github/actions/spelling/line_forbidden.patterns
@@ -0,0 +1,62 @@
+# reject `m_data` as there's a certain OS which has evil defines that break things if it's used elsewhere
+# \bm_data\b
+
+# If you have a framework that uses `it()` for testing and `fit()` for debugging a specific test,
+# you might not want to check in code where you were debugging w/ `fit()`, in which case, you might want
+# to use this:
+#\bfit\(
+
+# s.b. GitHub
+\bGithub\b
+
+# s.b. GitLab
+\bGitlab\b
+
+# s.b. JavaScript
+\bJavascript\b
+
+# s.b. Microsoft
+\bMicroSoft\b
+
+# s.b. another
+\ban[- ]other\b
+
+# s.b. greater than
+\bgreater then\b
+
+# s.b. into
+#\sin to\s
+
+# s.b. opt-in
+\sopt in\s
+
+# s.b. less than
+\bless then\b
+
+# s.b. otherwise
+\bother[- ]wise\b
+
+# s.b. nonexistent
+\bnon existing\b
+\b[Nn]o[nt][- ]existent\b
+
+# s.b. preexisting
+[Pp]re[- ]existing
+
+# s.b. preempt
+[Pp]re[- ]empt\b
+
+# s.b. preemptively
+[Pp]re[- ]emptively
+
+# s.b. reentrancy
+[Rr]e[- ]entrancy
+
+# s.b. reentrant
+[Rr]e[- ]entrant
+
+# s.b. workaround(s)
+#\bwork[- ]arounds?\b
+
+# Reject duplicate words
+\s([A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})\s\g{-1}\s
--- a/.github/actions/spelling/patterns/patterns.txt
+++ b/.github/actions/spelling/patterns/patterns.txt
@@ -1,11 +1,6 @@
-https://(?:(?:[-a-zA-Z0-9?&=]*\.|)microsoft\.com)/[-a-zA-Z0-9?&=_#\/.]*
-https://aka\.ms/[-a-zA-Z0-9?&=\/_]*
-https://www\.itscj\.ipsj\.or\.jp/iso-ir/[-0-9]+\.pdf
-https://www\.vt100\.net/docs/[-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-]+\.|)github(?:usercontent|)\.com/[-a-zA-Z0-9?%&=_\/.]*
-https://www.xfree86.org/[-a-zA-Z0-9?&=\/_#]*
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
+
+https?://\S+
 [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]|\\x|U\+|#)[a-f0-9A-FGgRr]{2,}[Uu]?[Ll]{0,2}\b
@@ -22,3 +17,80 @@ Base64::s_(?:En|De)code\(L"[^"]+"
 VERIFY_ARE_EQUAL\(L"[^"]+"
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\+/"
 std::memory_order_[\w]+
+D2DERR_SHADER_COMPILE_FAILED
+TIL_FEATURE_[0-9A-Z_]+
+vcvars\w*
+ROY\sG\.\sBIV
+!(?:(?i)ESC)!\[
+!(?:(?i)CSI)!(?:\d+(?:;\d+|)m|[ABCDF])
+
+# Python stringprefix / binaryprefix
+\b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)'
+
+# Automatically suggested patterns
+# hit-count: 3831 file-count: 582
+# IServiceProvider
+\bI(?=(?:[A-Z][a-z]{2,})+\b)
+
+# hit-count: 71 file-count: 35
+# Compiler flags
+(?:^|[\t ,"'`=(])-[D](?=[A-Z]{2,}|[A-Z][a-z])
+(?:^|[\t ,"'`=(])-[X](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
+
+# hit-count: 41 file-count: 28
+# version suffix <word>v#
+(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
+
+# hit-count: 20 file-count: 9
+# hex runs
+\b[0-9a-fA-F]{16,}\b
+
+# hit-count: 10 file-count: 7
+# uuid:
+\b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b
+
+# hit-count: 4 file-count: 4
+# mailto urls
+mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,}
+
+# hit-count: 4 file-count: 1
+# ANSI color codes
+(?:\\(?:u00|x)1b|\x1b)\[\d+(?:;\d+|)m
+
+# hit-count: 2 file-count: 1
+# latex
+\\(?:n(?:ew|ormal|osub)|r(?:enew)|t(?:able(?:of|)|he|itle))(?=[a-z]+)
+
+# hit-count: 1 file-count: 1
+# hex digits including css/html color classes:
+(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|u\d+)\b
+
+# hit-count: 1 file-count: 1
+# Non-English
+[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
+
+# hit-count: 1 file-count: 1
+# French
+# This corpus only had capital letters, but you probably want lowercase ones as well.
+\b[LN]'+[a-z]{2,}\b
+
+# acceptable duplicates
+# ls directory listings
+[-bcdlpsw](?:[-r][-w][-sx]){3}\s+\d+\s+(\S+)\s+\g{-1}\s+\d+\s+
+# C/idl types + English ...
+\s(Guid|long|LONG|that) \g{-1}\s
+
+# javadoc / .net
+(?:[\\@](?:groupname|param)|(?:public|private)(?:\s+static|\s+readonly)*)\s+(\w+)\s+\g{-1}\s
+
+# Commit message -- Signed-off-by and friends
+^\s*(?:(?:Based-on-patch|Co-authored|Helped|Mentored|Reported|Reviewed|Signed-off)-by|Thanks-to): (?:[^<]*<[^>]*>|[^<]*)\s*$
+
+# Autogenerated revert commit message
+^This reverts commit [0-9a-f]{40}\.$
+
+# vtmode
+--vtmode\s+(\w+)\s+\g{-1}\s
+
+# ignore long runs of a single character:
+\b([A-Za-z])\g{-1}{3,}\b
--- a/.github/actions/spelling/reject.txt
+++ b/.github/actions/spelling/reject.txt
@@ -0,0 +1,12 @@
+^attache$
+^attacher$
+^attachers$
+benefitting
+occurences?
+^dependan.*
+^oer$
+Sorce
+^[Ss]pae.*
+^untill$
+^untilling$
+^wether.*
--- a/.github/workflows/spelling.yml
+++ b/.github/workflows/spelling.yml
@@ -1,15 +0,0 @@
-name: Spell checking
-on:
-  pull_request_target:
-  push:
-
-jobs:
-  build:
-    name: Spell checking
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2.0.0
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 5
-    - uses: check-spelling/check-spelling@0.0.17-alpha
--- a/.github/workflows/spelling2.yml
+++ b/.github/workflows/spelling2.yml
@@ -0,0 +1,134 @@
+# spelling.yml is blocked per https://github.com/check-spelling/check-spelling/security/advisories/GHSA-g86g-chm8-7r2p
+name: Spell checking
+
+# Comment management is handled through a secondary job, for details see:
+# https://github.com/check-spelling/check-spelling/wiki/Feature%3A-Restricted-Permissions
+#
+# `jobs.comment-push` runs when a push is made to a repository and the `jobs.spelling` job needs to make a comment
+#   (in odd cases, it might actually run just to collapse a commment, but that's fairly rare)
+#   it needs `contents: write` in order to add a comment.
+#
+# `jobs.comment-pr` runs when a pull_request is made to a repository and the `jobs.spelling` job needs to make a comment
+#   or collapse a comment (in the case where it had previously made a comment and now no longer needs to show a comment)
+#   it needs `pull-requests: write` in order to manipulate those comments.
+
+# Updating pull request branches is managed via comment handling.
+# For details, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-expect-list
+#
+# These elements work together to make it happen:
+#
+# `on.issue_comment`
+#   This event listens to comments by users asking to update the metadata.
+#
+# `jobs.update`
+#   This job runs in response to an issue_comment and will push a new commit
+#   to update the spelling metadata.
+#
+# `with.experimental_apply_changes_via_bot`
+#   Tells the action to support and generate messages that enable it
+#   to make a commit to update the spelling metadata.
+#
+# `with.ssh_key`
+#   In order to trigger workflows when the commit is made, you can provide a
+#   secret (typically, a write-enabled github deploy key).
+#
+#   For background, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-with-deploy-key
+
+on:
+  push:
+    branches:
+    - "**"
+    tags-ignore:
+    - "**"
+  pull_request_target:
+    branches:
+    - "**"
+    tags-ignore:
+    - "**"
+    types:
+    - 'opened'
+    - 'reopened'
+    - 'synchronize'
+  issue_comment:
+    types:
+    - 'created'
+
+jobs:
+  spelling:
+    name: Spell checking
+    permissions:
+      contents: read
+      pull-requests: read
+      actions: read
+    outputs:
+      followup: ${{ steps.spelling.outputs.followup }}
+    runs-on: ubuntu-latest
+    if: "contains(github.event_name, 'pull_request') || github.event_name == 'push'"
+    concurrency:
+      group: spelling-${{ github.event.pull_request.number || github.ref }}
+      # note: If you use only_check_changed_files, you do not want cancel-in-progress
+      cancel-in-progress: true
+    steps:
+    - name: check-spelling
+      id: spelling
+      uses: check-spelling/check-spelling@v0.0.21
+      with:
+        suppress_push_for_open_pull_request: 1
+        checkout: true
+        check_file_names: 1
+        spell_check_this: check-spelling/spell-check-this@prerelease
+        post_comment: 0
+        use_magic_file: 1
+        extra_dictionary_limit: 10
+        extra_dictionaries:
+          cspell:software-terms/src/software-terms.txt
+          cspell:python/src/python/python-lib.txt
+          cspell:node/node.txt
+          cspell:cpp/src/stdlib-c.txt
+          cspell:cpp/src/stdlib-cpp.txt
+          cspell:fullstack/fullstack.txt
+          cspell:filetypes/filetypes.txt
+          cspell:html/html.txt
+          cspell:cpp/src/compiler-msvc.txt
+          cspell:python/src/common/extra.txt
+          cspell:powershell/powershell.txt
+          cspell:aws/aws.txt
+          cspell:cpp/src/lang-keywords.txt
+          cspell:npm/npm.txt
+          cspell:dotnet/dotnet.txt
+          cspell:python/src/python/python.txt
+          cspell:css/css.txt
+          cspell:cpp/src/stdlib-cmath.txt
+        check_extra_dictionaries: ''
+
+  comment-push:
+    name: Report (Push)
+    # If your workflow isn't running on push, you can remove this job
+    runs-on: ubuntu-latest
+    needs: spelling
+    permissions:
+      contents: write
+    if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
+    steps:
+    - name: comment
+      uses: check-spelling/check-spelling@v0.0.21
+      with:
+        checkout: true
+        spell_check_this: check-spelling/spell-check-this@prerelease
+        task: ${{ needs.spelling.outputs.followup }}
+
+  comment-pr:
+    name: Report (PR)
+    # If you workflow isn't running on pull_request*, you can remove this job
+    runs-on: ubuntu-latest
+    needs: spelling
+    permissions:
+      pull-requests: write
+    if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
+    steps:
+    - name: comment
+      uses: check-spelling/check-spelling@v0.0.21
+      with:
+        checkout: true
+        spell_check_this: check-spelling/spell-check-this@prerelease
+        task: ${{ needs.spelling.outputs.followup }}
--- a/src/cascadia/TerminalApp/TerminalSettings.h
+++ b/src/cascadia/TerminalApp/TerminalSettings.h
@@ -50,23 +50,23 @@ namespace winrt::TerminalApp::implementation
        void ColorTable(std::array<uint32_t, 16> colors);
        std::array<uint32_t, 16> ColorTable();

-        GETSET_SETTING(uint32_t, DefaultForeground, DEFAULT_FOREGROUND_WITH_ALPHA);
-        GETSET_SETTING(uint32_t, DefaultBackground, DEFAULT_BACKGROUND_WITH_ALPHA);
-        GETSET_SETTING(uint32_t, SelectionBackground, DEFAULT_FOREGROUND);
-        GETSET_SETTING(int32_t, HistorySize, DEFAULT_HISTORY_SIZE);
-        GETSET_SETTING(int32_t, InitialRows, 30);
-        GETSET_SETTING(int32_t, InitialCols, 80);
+        GETSET_SETTING(TerminalApp::TerminalSettings, uint32_t, DefaultForeground, DEFAULT_FOREGROUND_WITH_ALPHA);
+        GETSET_SETTING(TerminalApp::TerminalSettings, uint32_t, DefaultBackground, DEFAULT_BACKGROUND_WITH_ALPHA);
+        GETSET_SETTING(TerminalApp::TerminalSettings, uint32_t, SelectionBackground, DEFAULT_FOREGROUND);
+        GETSET_SETTING(TerminalApp::TerminalSettings, int32_t, HistorySize, DEFAULT_HISTORY_SIZE);
+        GETSET_SETTING(TerminalApp::TerminalSettings, int32_t, InitialRows, 30);
+        GETSET_SETTING(TerminalApp::TerminalSettings, int32_t, InitialCols, 80);

-        GETSET_SETTING(bool, SnapOnInput, true);
-        GETSET_SETTING(bool, AltGrAliasing, true);
-        GETSET_SETTING(uint32_t, CursorColor, DEFAULT_CURSOR_COLOR);
-        GETSET_SETTING(Microsoft::Terminal::TerminalControl::CursorStyle, CursorShape, Microsoft::Terminal::TerminalControl::CursorStyle::Vintage);
-        GETSET_SETTING(uint32_t, CursorHeight, DEFAULT_CURSOR_HEIGHT);
-        GETSET_SETTING(hstring, WordDelimiters, DEFAULT_WORD_DELIMITERS);
-        GETSET_SETTING(bool, CopyOnSelect, false);
-        GETSET_SETTING(bool, FocusFollowMouse, false);
+        GETSET_SETTING(TerminalApp::TerminalSettings, bool, SnapOnInput, true);
+        GETSET_SETTING(TerminalApp::TerminalSettings, bool, AltGrAliasing, true);
+        GETSET_SETTING(TerminalApp::TerminalSettings, uint32_t, CursorColor, DEFAULT_CURSOR_COLOR);
+        GETSET_SETTING(TerminalApp::TerminalSettings, Microsoft::Terminal::TerminalControl::CursorStyle, CursorShape, Microsoft::Terminal::TerminalControl::CursorStyle::Vintage);
+        GETSET_SETTING(TerminalApp::TerminalSettings, uint32_t, CursorHeight, DEFAULT_CURSOR_HEIGHT);
+        GETSET_SETTING(TerminalApp::TerminalSettings, hstring, WordDelimiters, DEFAULT_WORD_DELIMITERS);
+        GETSET_SETTING(TerminalApp::TerminalSettings, bool, CopyOnSelect, false);
+        GETSET_SETTING(TerminalApp::TerminalSettings, bool, FocusFollowMouse, false);

-        GETSET_SETTING(Windows::Foundation::IReference<uint32_t>, TabColor, nullptr);
+        GETSET_SETTING(TerminalApp::TerminalSettings, Windows::Foundation::IReference<uint32_t>, TabColor, nullptr);

        // When set, StartingTabColor allows to create a terminal with a "sticky" tab color.
        // This color is prioritized above the TabColor (that is usually initialized based on profile settings).
@@ -76,48 +76,42 @@ namespace winrt::TerminalApp::implementation
        // TODO: to ensure that this property is not populated during settings reload,
        // we should consider moving this property to a separate interface,
        // passed to the terminal only upon creation.
-        GETSET_SETTING(Windows::Foundation::IReference<uint32_t>, StartingTabColor, nullptr);
+        GETSET_SETTING(TerminalApp::TerminalSettings, Windows::Foundation::IReference<uint32_t>, StartingTabColor, nullptr);

        // ------------------------ End of Core Settings -----------------------

-        GETSET_SETTING(hstring, ProfileName);
-        GETSET_SETTING(bool, UseAcrylic, false);
-        GETSET_SETTING(double, TintOpacity, 0.5);
-        GETSET_SETTING(hstring, Padding, DEFAULT_PADDING);
-        GETSET_SETTING(hstring, FontFace, DEFAULT_FONT_FACE);
-        GETSET_SETTING(int32_t, FontSize, DEFAULT_FONT_SIZE);
+        GETSET_SETTING(TerminalApp::TerminalSettings, hstring, ProfileName);
+        GETSET_SETTING(TerminalApp::TerminalSettings, bool, UseAcrylic, false);
+        GETSET_SETTING(TerminalApp::TerminalSettings, double, TintOpacity, 0.5);
+        GETSET_SETTING(TerminalApp::TerminalSettings, hstring, Padding, DEFAULT_PADDING);
+        GETSET_SETTING(TerminalApp::TerminalSettings, hstring, FontFace, DEFAULT_FONT_FACE);
+        GETSET_SETTING(TerminalApp::TerminalSettings, int32_t, FontSize, DEFAULT_FONT_SIZE);

-        GETSET_SETTING(winrt::Windows::UI::Text::FontWeight, FontWeight);
+        GETSET_SETTING(TerminalApp::TerminalSettings, winrt::Windows::UI::Text::FontWeight, FontWeight);

-        GETSET_SETTING(hstring, BackgroundImage);
-        GETSET_SETTING(double, BackgroundImageOpacity, 1.0);
+        GETSET_SETTING(TerminalApp::TerminalSettings, hstring, BackgroundImage);
+        GETSET_SETTING(TerminalApp::TerminalSettings, double, BackgroundImageOpacity, 1.0);

-        GETSET_SETTING(winrt::Windows::UI::Xaml::Media::Stretch,
-                       BackgroundImageStretchMode,
-                       winrt::Windows::UI::Xaml::Media::Stretch::UniformToFill);
-        GETSET_SETTING(winrt::Windows::UI::Xaml::HorizontalAlignment,
-                       BackgroundImageHorizontalAlignment,
-                       winrt::Windows::UI::Xaml::HorizontalAlignment::Center);
-        GETSET_SETTING(winrt::Windows::UI::Xaml::VerticalAlignment,
-                       BackgroundImageVerticalAlignment,
-                       winrt::Windows::UI::Xaml::VerticalAlignment::Center);
+        GETSET_SETTING(TerminalApp::TerminalSettings, winrt::Windows::UI::Xaml::Media::Stretch, BackgroundImageStretchMode, winrt::Windows::UI::Xaml::Media::Stretch::UniformToFill);
+        GETSET_SETTING(TerminalApp::TerminalSettings, winrt::Windows::UI::Xaml::HorizontalAlignment, BackgroundImageHorizontalAlignment, winrt::Windows::UI::Xaml::HorizontalAlignment::Center);
+        GETSET_SETTING(TerminalApp::TerminalSettings, winrt::Windows::UI::Xaml::VerticalAlignment, BackgroundImageVerticalAlignment, winrt::Windows::UI::Xaml::VerticalAlignment::Center);

-        GETSET_SETTING(Microsoft::Terminal::TerminalControl::IKeyBindings, KeyBindings, nullptr);
+        GETSET_SETTING(TerminalApp::TerminalSettings, Microsoft::Terminal::TerminalControl::IKeyBindings, KeyBindings, nullptr);

-        GETSET_SETTING(hstring, Commandline);
-        GETSET_SETTING(hstring, StartingDirectory);
-        GETSET_SETTING(hstring, StartingTitle);
-        GETSET_SETTING(bool, SuppressApplicationTitle);
-        GETSET_SETTING(hstring, EnvironmentVariables);
+        GETSET_SETTING(TerminalApp::TerminalSettings, hstring, Commandline);
+        GETSET_SETTING(TerminalApp::TerminalSettings, hstring, StartingDirectory);
+        GETSET_SETTING(TerminalApp::TerminalSettings, hstring, StartingTitle);
+        GETSET_SETTING(TerminalApp::TerminalSettings, bool, SuppressApplicationTitle);
+        GETSET_SETTING(TerminalApp::TerminalSettings, hstring, EnvironmentVariables);

-        GETSET_SETTING(Microsoft::Terminal::TerminalControl::ScrollbarState, ScrollState, Microsoft::Terminal::TerminalControl::ScrollbarState::Visible);
+        GETSET_SETTING(TerminalApp::TerminalSettings, Microsoft::Terminal::TerminalControl::ScrollbarState, ScrollState, Microsoft::Terminal::TerminalControl::ScrollbarState::Visible);

-        GETSET_SETTING(Microsoft::Terminal::TerminalControl::TextAntialiasingMode, AntialiasingMode, Microsoft::Terminal::TerminalControl::TextAntialiasingMode::Grayscale);
+        GETSET_SETTING(TerminalApp::TerminalSettings, Microsoft::Terminal::TerminalControl::TextAntialiasingMode, AntialiasingMode, Microsoft::Terminal::TerminalControl::TextAntialiasingMode::Grayscale);

-        GETSET_SETTING(bool, RetroTerminalEffect, false);
-        GETSET_SETTING(bool, ForceFullRepaintRendering, false);
-        GETSET_SETTING(bool, SoftwareRendering, false);
-        GETSET_SETTING(bool, ForceVTInput, false);
+        GETSET_SETTING(TerminalApp::TerminalSettings, bool, RetroTerminalEffect, false);
+        GETSET_SETTING(TerminalApp::TerminalSettings, bool, ForceFullRepaintRendering, false);
+        GETSET_SETTING(TerminalApp::TerminalSettings, bool, SoftwareRendering, false);
+        GETSET_SETTING(TerminalApp::TerminalSettings, bool, ForceVTInput, false);

        GETSET_PROPERTY(hstring, PixelShaderPath);

--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -273,6 +273,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        }
    }

+    // Method Description:
+    // - updates the content frame to present a view of the profile page
+    // - NOTE: this does not update the selected item.
+    // Arguments:
+    // - profile - the profile object we are getting a view of
    void MainPage::_Navigate(const Editor::ProfileViewModel& profile)
    {
        _lastProfilesNavState = winrt::make<ProfilePageNavigationState>(profile,
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -77,6 +77,7 @@ the MIT License. See LICENSE in the project root for license information. -->
            <muxc:NavigationViewItemHeader x:Uid="Nav_Profiles"/>
    
            <muxc:NavigationViewItem x:Uid="Nav_ProfileDefaults"
+                                     x:Name="BaseLayerMenuItem"
                                     Tag="GlobalProfile_Nav">
                <muxc:NavigationViewItem.Icon>
                    <FontIcon Glyph="&#xE81E;"/>
--- a/src/cascadia/TerminalSettingsEditor/Profiles.idl
+++ b/src/cascadia/TerminalSettingsEditor/Profiles.idl
@@ -18,9 +18,9 @@ namespace Microsoft.Terminal.Settings.Editor
        Boolean BackgroundImageSettingsVisible { get; };

        OBSERVABLE_PROJECTED_SETTING(String, Name);
-        OBSERVABLE_PROJECTED_SETTING(Guid, Guid);
+        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Guid, Guid);
        OBSERVABLE_PROJECTED_SETTING(String, Source);
-        OBSERVABLE_PROJECTED_SETTING(Guid, ConnectionType);
+        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Guid, ConnectionType);
        OBSERVABLE_PROJECTED_SETTING(Boolean, Hidden);
        OBSERVABLE_PROJECTED_SETTING(String, Icon);
        OBSERVABLE_PROJECTED_SETTING(Microsoft.Terminal.Settings.Model.CloseOnExitMode, CloseOnExit);
--- a/src/cascadia/TerminalSettingsEditor/Profiles.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles.xaml
@@ -76,6 +76,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                                                x:Name="CommandlineContainer"
                                                HasSettingValue="{x:Bind State.Profile.HasCommandline, Mode=OneWay}"
                                                ClearSettingValue="{x:Bind State.Profile.ClearCommandline}"
+                                                SettingOverrideSource="{x:Bind State.Profile.CommandlineOverrideSource, Mode=OneWay}"
                                                Visibility="{x:Bind State.Profile.IsBaseLayer, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"
                                                Margin="0,0,0,24">
                            <StackPanel Orientation="Horizontal">
@@ -92,6 +93,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                                                x:Name="StartingDirectoryContainer"
                                                HasSettingValue="{x:Bind State.Profile.HasStartingDirectory, Mode=OneWay}"
                                                ClearSettingValue="{x:Bind State.Profile.ClearStartingDirectory}"
+                                                SettingOverrideSource="{x:Bind State.Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
                                                Margin="0">
                            <StackPanel Orientation="Vertical">
                                <StackPanel Orientation="Horizontal">
@@ -113,7 +115,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                        <!--Icon-->
                        <local:SettingContainer x:Uid="Profile_Icon"
                                                HasSettingValue="{x:Bind State.Profile.HasIcon, Mode=OneWay}"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearIcon}">
+                                                ClearSettingValue="{x:Bind State.Profile.ClearIcon}"
+                                                SettingOverrideSource="{x:Bind State.Profile.IconOverrideSource, Mode=OneWay}">
                            <StackPanel Orientation="Horizontal">
                                <TextBox Text="{x:Bind State.Profile.Icon, Mode=TwoWay}"
                                         FontFamily="Segoe UI, Segoe MDL2 Assets"
@@ -127,7 +130,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                        <!--Tab Title-->
                        <local:SettingContainer x:Uid="Profile_TabTitle"
                                                HasSettingValue="{x:Bind State.Profile.HasTabTitle, Mode=OneWay}"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearTabTitle}">
+                                                ClearSettingValue="{x:Bind State.Profile.ClearTabTitle}"
+                                                SettingOverrideSource="{x:Bind State.Profile.TabTitleOverrideSource, Mode=OneWay}">
                            <TextBox Text="{x:Bind State.Profile.TabTitle, Mode=TwoWay}"
                                     Style="{StaticResource TextBoxSettingStyle}"/>
                        </local:SettingContainer>
@@ -212,6 +216,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                            <local:SettingContainer x:Uid="Profile_ColorScheme"
                                                    HasSettingValue="{x:Bind State.Profile.HasColorSchemeName, Mode=OneWay}"
                                                    ClearSettingValue="{x:Bind State.Profile.ClearColorSchemeName}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.ColorSchemeNameOverrideSource, Mode=OneWay}"
                                                    Margin="0">
                                <ComboBox ItemsSource="{x:Bind ColorSchemeList, Mode=OneWay}"
                                          SelectedItem="{x:Bind CurrentColorScheme, Mode=TwoWay}"
@@ -227,7 +232,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                            <!--Font Face-->
                            <local:SettingContainer x:Uid="Profile_FontFace"
                                                    HasSettingValue="{x:Bind State.Profile.HasFontFace, Mode=OneWay}"
-                                                    ClearSettingValue="{x:Bind State.Profile.ClearFontFace}">
+                                                    ClearSettingValue="{x:Bind State.Profile.ClearFontFace}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.FontFaceOverrideSource, Mode=OneWay}">
                                <TextBox Text="{x:Bind State.Profile.FontFace, Mode=TwoWay}"
                                         Style="{StaticResource TextBoxSettingStyle}"/>
                            </local:SettingContainer>
@@ -235,7 +241,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                            <!--Font Size-->
                            <local:SettingContainer x:Uid="Profile_FontSize"
                                                    HasSettingValue="{x:Bind State.Profile.HasFontSize, Mode=OneWay}"
-                                                    ClearSettingValue="{x:Bind State.Profile.ClearFontSize}">
+                                                    ClearSettingValue="{x:Bind State.Profile.ClearFontSize}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.FontSizeOverrideSource, Mode=OneWay}">
                                <muxc:NumberBox Value="{x:Bind State.Profile.FontSize, Mode=TwoWay}"
                                                Style="{StaticResource NumberBoxSettingStyle}"
                                                AcceptsExpression="False"
@@ -249,7 +256,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                            <local:SettingContainer x:Uid="Profile_FontWeight"
                                                    x:Name="FontWeightContainer"
                                                    HasSettingValue="{x:Bind State.Profile.HasFontWeight, Mode=OneWay}"
-                                                    ClearSettingValue="{x:Bind State.Profile.ClearFontWeight}">
+                                                    ClearSettingValue="{x:Bind State.Profile.ClearFontWeight}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.FontWeightOverrideSource, Mode=OneWay}">
                                <StackPanel>
                                    <ComboBox x:Name="FontWeightComboBox"
                                              ItemsSource="{x:Bind FontWeightList, Mode=OneWay}"
@@ -283,7 +291,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                            <!--Retro Terminal Effect-->
                            <local:SettingContainer x:Uid="Profile_RetroTerminalEffect"
                                                    HasSettingValue="{x:Bind State.Profile.HasRetroTerminalEffect, Mode=OneWay}"
-                                                    ClearSettingValue="{x:Bind State.Profile.ClearRetroTerminalEffect}">
+                                                    ClearSettingValue="{x:Bind State.Profile.ClearRetroTerminalEffect}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.RetroTerminalEffectOverrideSource, Mode=OneWay}">
                                <ToggleSwitch IsOn="{x:Bind State.Profile.RetroTerminalEffect, Mode=TwoWay}"/>
                            </local:SettingContainer>
                        </StackPanel>
@@ -296,6 +305,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                            <local:SettingContainer x:Uid="Profile_CursorShape"
                                                    HasSettingValue="{x:Bind State.Profile.HasCursorShape, Mode=OneWay}"
                                                    ClearSettingValue="{x:Bind State.Profile.ClearCursorShape}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.CursorShapeOverrideSource, Mode=OneWay}"
                                                    Margin="0">
                                <muxc:RadioButtons ItemsSource="{x:Bind CursorShapeList, Mode=OneWay}"
                                                   SelectedItem="{x:Bind CurrentCursorShape, Mode=TwoWay}"
@@ -306,6 +316,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                            <local:SettingContainer x:Uid="Profile_CursorHeight"
                                                    HasSettingValue="{x:Bind State.Profile.HasCursorHeight, Mode=OneWay}"
                                                    ClearSettingValue="{x:Bind State.Profile.ClearCursorHeight}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.CursorHeightOverrideSource, Mode=OneWay}"
                                                    Visibility="{x:Bind IsVintageCursor, Mode=OneWay}">
                                <muxc:NumberBox Value="{x:Bind State.Profile.CursorHeight, Mode=TwoWay}"
                                                Style="{StaticResource NumberBoxSettingStyle}"
@@ -323,6 +334,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                                                    x:Name="BackgroundImageContainer"
                                                    HasSettingValue="{x:Bind State.Profile.HasBackgroundImagePath, Mode=OneWay}"
                                                    ClearSettingValue="{x:Bind State.Profile.ClearBackgroundImagePath}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.BackgroundImagePathOverrideSource, Mode=OneWay}"
                                                    Margin="0">
                                <StackPanel Orientation="Vertical">
                                    <StackPanel Orientation="Horizontal">
@@ -344,6 +356,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                            <local:SettingContainer x:Uid="Profile_BackgroundImageStretchMode"
                                                    HasSettingValue="{x:Bind State.Profile.HasBackgroundImageStretchMode, Mode=OneWay}"
                                                    ClearSettingValue="{x:Bind State.Profile.ClearBackgroundImageStretchMode}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.BackgroundImageStretchModeOverrideSource, Mode=OneWay}"
                                                    Visibility="{x:Bind State.Profile.BackgroundImageSettingsVisible, Mode=OneWay}">
                                <muxc:RadioButtons ItemsSource="{x:Bind BackgroundImageStretchModeList, Mode=OneWay}"
                                                   SelectedItem="{x:Bind CurrentBackgroundImageStretchMode, Mode=TwoWay}"
@@ -354,6 +367,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                            <local:SettingContainer x:Uid="Profile_BackgroundImageAlignment"
                                                    HasSettingValue="{x:Bind State.Profile.HasBackgroundImageAlignment, Mode=OneWay}"
                                                    ClearSettingValue="{x:Bind State.Profile.ClearBackgroundImageAlignment}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.BackgroundImageAlignmentOverrideSource, Mode=OneWay}"
                                                    Visibility="{x:Bind State.Profile.BackgroundImageSettingsVisible, Mode=OneWay}">
                                <Grid HorizontalAlignment="Left">
                                    <Grid.RowDefinitions>
@@ -509,6 +523,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                                                    x:Name="BackgroundImageOpacityContainer"
                                                    HasSettingValue="{x:Bind State.Profile.HasBackgroundImageOpacity, Mode=OneWay}"
                                                    ClearSettingValue="{x:Bind State.Profile.ClearBackgroundImageOpacity}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.BackgroundImageOpacityOverrideSource, Mode=OneWay}"
                                                    Visibility="{x:Bind State.Profile.BackgroundImageSettingsVisible, Mode=OneWay}">
                                <Grid Style="{StaticResource CustomSliderControlGridStyle}">
                                    <Grid.ColumnDefinitions>
@@ -533,6 +548,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                            <local:SettingContainer x:Uid="Profile_UseAcrylic"
                                                    HasSettingValue="{x:Bind State.Profile.HasUseAcrylic, Mode=OneWay}"
                                                    ClearSettingValue="{x:Bind State.Profile.ClearUseAcrylic}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.UseAcrylicOverrideSource, Mode=OneWay}"
                                                    Margin="0">
                                <ToggleSwitch x:Name="UseAcrylicToggleSwitch"
                                              IsOn="{x:Bind State.Profile.UseAcrylic, Mode=TwoWay}"/>
@@ -543,6 +559,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                                                    x:Name="AcrylicOpacityContainer"
                                                    HasSettingValue="{x:Bind State.Profile.HasAcrylicOpacity, Mode=OneWay}"
                                                    ClearSettingValue="{x:Bind State.Profile.ClearAcrylicOpacity}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.AcrylicOpacityOverrideSource, Mode=OneWay}"
                                                    Visibility="{Binding ElementName=UseAcrylicToggleSwitch, Path=IsOn, Mode=OneWay}">
                                <StackPanel x:Name="AcrylicOpacityControl">
                                    <Grid Style="{StaticResource CustomSliderControlGridStyle}">
@@ -569,6 +586,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                            <local:SettingContainer x:Uid="Profile_Padding"
                                                    HasSettingValue="{x:Bind State.Profile.HasPadding, Mode=OneWay}"
                                                    ClearSettingValue="{x:Bind State.Profile.ClearPadding}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.PaddingOverrideSource, Mode=OneWay}"
                                                    Margin="0">
                                <Grid Style="{StaticResource CustomSliderControlGridStyle}">
                                    <Grid.ColumnDefinitions>
@@ -587,7 +605,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                            <!--Scrollbar Visibility-->
                            <local:SettingContainer x:Uid="Profile_ScrollbarVisibility"
                                                    HasSettingValue="{x:Bind State.Profile.HasScrollState, Mode=OneWay}"
-                                                    ClearSettingValue="{x:Bind State.Profile.ClearScrollState}">
+                                                    ClearSettingValue="{x:Bind State.Profile.ClearScrollState}"
+                                                    SettingOverrideSource="{x:Bind State.Profile.ScrollStateOverrideSource, Mode=OneWay}">
                                <muxc:RadioButtons ItemsSource="{x:Bind ScrollStateList, Mode=OneWay}"
                                                   SelectedItem="{x:Bind CurrentScrollState, Mode=TwoWay}"
                                                   ItemTemplate="{StaticResource EnumRadioButtonTemplate}"/>
@@ -605,6 +624,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                        <local:SettingContainer x:Uid="Profile_SuppressApplicationTitle"
                                                HasSettingValue="{x:Bind State.Profile.HasSuppressApplicationTitle, Mode=OneWay}"
                                                ClearSettingValue="{x:Bind State.Profile.ClearSuppressApplicationTitle}"
+                                                SettingOverrideSource="{x:Bind State.Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}"
                                                Margin="0">
                            <ToggleSwitch IsOn="{x:Bind State.Profile.SuppressApplicationTitle, Mode=TwoWay}"/>
                        </local:SettingContainer>
@@ -612,7 +632,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                        <!--Antialiasing Mode-->
                        <local:SettingContainer x:Uid="Profile_AntialiasingMode"
                                                HasSettingValue="{x:Bind State.Profile.HasAntialiasingMode, Mode=OneWay}"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearAntialiasingMode}">
+                                                ClearSettingValue="{x:Bind State.Profile.ClearAntialiasingMode}"
+                                                SettingOverrideSource="{x:Bind State.Profile.AntialiasingModeOverrideSource, Mode=OneWay}">
                            <muxc:RadioButtons ItemsSource="{x:Bind AntiAliasingModeList, Mode=OneWay}"
                                               SelectedItem="{x:Bind CurrentAntiAliasingMode, Mode=TwoWay}"
                                               ItemTemplate="{StaticResource EnumRadioButtonTemplate}"/>
@@ -621,21 +642,24 @@ the MIT License. See LICENSE in the project root for license information. -->
                        <!--AltGr Aliasing-->
                        <local:SettingContainer x:Uid="Profile_AltGrAliasing"
                                                HasSettingValue="{x:Bind State.Profile.HasAltGrAliasing, Mode=OneWay}"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearAltGrAliasing}">
+                                                ClearSettingValue="{x:Bind State.Profile.ClearAltGrAliasing}"
+                                                SettingOverrideSource="{x:Bind State.Profile.AltGrAliasingOverrideSource, Mode=OneWay}">
                            <ToggleSwitch IsOn="{x:Bind State.Profile.AltGrAliasing, Mode=TwoWay}"/>
                        </local:SettingContainer>

                        <!--Snap On Input-->
                        <local:SettingContainer x:Uid="Profile_SnapOnInput"
                                                HasSettingValue="{x:Bind State.Profile.HasSnapOnInput, Mode=OneWay}"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearSnapOnInput}">
+                                                ClearSettingValue="{x:Bind State.Profile.ClearSnapOnInput}"
+                                                SettingOverrideSource="{x:Bind State.Profile.SnapOnInputOverrideSource, Mode=OneWay}">
                            <ToggleSwitch IsOn="{x:Bind State.Profile.SnapOnInput, Mode=TwoWay}"/>
                        </local:SettingContainer>

                        <!--History Size-->
                        <local:SettingContainer x:Uid="Profile_HistorySize"
                                                HasSettingValue="{x:Bind State.Profile.HasHistorySize, Mode=OneWay}"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearHistorySize}">
+                                                ClearSettingValue="{x:Bind State.Profile.ClearHistorySize}"
+                                                SettingOverrideSource="{x:Bind State.Profile.HistorySizeOverrideSource, Mode=OneWay}">
                            <muxc:NumberBox Value="{x:Bind State.Profile.HistorySize, Mode=TwoWay}"
                                            Style="{StaticResource NumberBoxSettingStyle}"
                                            SmallChange="10"
@@ -645,7 +669,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                        <!--Close On Exit-->
                        <local:SettingContainer x:Uid="Profile_CloseOnExit"
                                                HasSettingValue="{x:Bind State.Profile.HasCloseOnExit, Mode=OneWay}"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearCloseOnExit}">
+                                                ClearSettingValue="{x:Bind State.Profile.ClearCloseOnExit}"
+                                                SettingOverrideSource="{x:Bind State.Profile.CloseOnExitOverrideSource, Mode=OneWay}">
                            <muxc:RadioButtons ItemsSource="{x:Bind CloseOnExitModeList, Mode=OneWay}"
                                               SelectedItem="{x:Bind CurrentCloseOnExitMode, Mode=TwoWay}"
                                               ItemTemplate="{StaticResource EnumRadioButtonTemplate}"/>
@@ -654,7 +679,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                        <!--Bell Style-->
                        <local:SettingContainer x:Uid="Profile_BellStyle"
                                                HasSettingValue="{x:Bind State.Profile.HasBellStyle, Mode=OneWay}"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearBellStyle}">
+                                                ClearSettingValue="{x:Bind State.Profile.ClearBellStyle}"
+                                                SettingOverrideSource="{x:Bind State.Profile.BellStyleOverrideSource, Mode=OneWay}">
                            <muxc:RadioButtons ItemsSource="{x:Bind BellStyleList, Mode=OneWay}"
                                               SelectedItem="{x:Bind CurrentBellStyle, Mode=TwoWay}"
                                               ItemTemplate="{StaticResource EnumRadioButtonTemplate}"/>
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
    associated with the data types.
-
+    
    Example:
-
+    
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
    read any of the formats listed below.
-
+    
    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
-
+    
    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
@@ -814,21 +814,13 @@
  <data name="ColorScheme_RenameErrorTip.Title" xml:space="preserve">
    <value>This color scheme name is already in use.</value>
  </data>
-  <data name="SettingContainer_OverrideIntro" xml:space="preserve">
-    <value>This overrides the value in {}.</value>
-    <comment>"{}" is the object being overridden. Generally, it will be the name of another profile.</comment>
-  </data>
-  <data name="SettingContainer_ResetButtonHelpText" xml:space="preserve">
-    <value>Reset</value>
-  </data>
-  <data name="SettingContainer_OverrideTarget" xml:space="preserve">
-    <value>a lower layer</value>
-    <comment>This is the object of "SettingContainer_OverrideIntro".</comment>
-  </data>
  <data name="Globals_FocusFollowMouse.Header" xml:space="preserve">
    <value>Enable Focus Follow Mouse mode</value>
  </data>
  <data name="Globals_FocusFollowMouse.HelpText" xml:space="preserve">
    <value>When checked, the terminal will the focus pane on mouse hover.</value>
  </data>
-</root>
+  <data name="SettingContainer_OverrideMessageBaseLayer" xml:space="preserve">
+    <value>Reset to base layer value</value>
+  </data>
+</root>
--- a/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp
+++ b/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp
@@ -5,6 +5,7 @@
 #include "SettingContainer.h"
 #include "SettingContainer.g.cpp"
 #include "LibraryResources.h"
+#include "../TerminalSettingsModel/LegacyProfileGeneratorNamespaces.h"

 using namespace winrt::Windows::UI::Xaml;

@@ -13,6 +14,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
    DependencyProperty SettingContainer::_HeaderProperty{ nullptr };
    DependencyProperty SettingContainer::_HelpTextProperty{ nullptr };
    DependencyProperty SettingContainer::_HasSettingValueProperty{ nullptr };
+    DependencyProperty SettingContainer::_SettingOverrideSourceProperty{ nullptr };

    SettingContainer::SettingContainer()
    {
@@ -51,37 +53,26 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                    xaml_typename<Editor::SettingContainer>(),
                    PropertyMetadata{ box_value(false), PropertyChangedCallback{ &SettingContainer::_OnHasSettingValueChanged } });
        }
+        if (!_SettingOverrideSourceProperty)
+        {
+            _SettingOverrideSourceProperty =
+                DependencyProperty::Register(
+                    L"SettingOverrideSource",
+                    xaml_typename<bool>(),
+                    xaml_typename<Editor::SettingContainer>(),
+                    PropertyMetadata{ nullptr });
+        }
    }

-    void SettingContainer::_OnHasSettingValueChanged(DependencyObject const& d, DependencyPropertyChangedEventArgs const& args)
+    void SettingContainer::_OnHasSettingValueChanged(DependencyObject const& d, DependencyPropertyChangedEventArgs const& /*args*/)
    {
+        // update visibility for override message and reset button
        const auto& obj{ d.try_as<Editor::SettingContainer>() };
-        const auto& newVal{ unbox_value<bool>(args.NewValue()) };
-
-        // update visibility for reset button
-        if (const auto& resetButton{ obj.GetTemplateChild(L"ResetButton") })
-        {
-            if (const auto& elem{ resetButton.try_as<UIElement>() })
-            {
-                elem.Visibility(newVal ? Visibility::Visible : Visibility::Collapsed);
-            }
-        }
-
-        // update visibility for override message
-        if (const auto& overrideMsg{ obj.GetTemplateChild(L"OverrideMessage") })
-        {
-            if (const auto& elem{ overrideMsg.try_as<UIElement>() })
-            {
-                elem.Visibility(newVal ? Visibility::Visible : Visibility::Collapsed);
-            }
-        }
+        get_self<SettingContainer>(obj)->_UpdateOverrideSystem();
    }

    void SettingContainer::OnApplyTemplate()
    {
-        // This message is only populated if `HasSettingValue` is true.
-        const auto& overrideMsg{ _GenerateOverrideMessageText() };
-
        if (const auto& child{ GetTemplateChild(L"ResetButton") })
        {
            if (const auto& button{ child.try_as<Controls::Button>() })
@@ -115,37 +106,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                    }
                });

-                // apply tooltip and name (automation property)
-                const auto& name{ RS_(L"SettingContainer_ResetButtonHelpText") };
-                Controls::ToolTipService::SetToolTip(child, box_value(name));
-                Automation::AutomationProperties::SetName(child, name);
-                Automation::AutomationProperties::SetHelpText(child, overrideMsg);
-
-                // initialize visibility for reset button
-                button.Visibility(HasSettingValue() ? Visibility::Visible : Visibility::Collapsed);
+                // apply name (automation property)
+                Automation::AutomationProperties::SetName(child, RS_(L"SettingContainer_OverrideMessageBaseLayer"));
            }
        }

-        if (const auto& child{ GetTemplateChild(L"OverrideMessage") })
-        {
-            if (const auto& tb{ child.try_as<Controls::TextBlock>() })
-            {
-                if (!overrideMsg.empty())
-                {
-                    // Create the override message
-                    // TODO GH#6800: the override target will be replaced with hyperlink/text directing the user to another profile.
-                    tb.Text(overrideMsg);
-
-                    // initialize visibility for reset button
-                    tb.Visibility(Visibility::Visible);
-                }
-                else
-                {
-                    // we have no message to render
-                    tb.Visibility(Visibility::Collapsed);
-                }
-            }
-        }
+        _UpdateOverrideSystem();

        if (const auto& content{ Content() })
        {
@@ -172,12 +138,78 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        }
    }

-    hstring SettingContainer::_GenerateOverrideMessageText()
+    // Method Description:
+    // - Updates the override system visibility and text
+    // Arguments:
+    // - <none>
+    void SettingContainer::_UpdateOverrideSystem()
    {
-        if (HasSettingValue())
+        if (const auto& child{ GetTemplateChild(L"ResetButton") })
        {
-            return hstring{ fmt::format(std::wstring_view{ RS_(L"SettingContainer_OverrideIntro") }, RS_(L"SettingContainer_OverrideTarget")) };
+            if (const auto& button{ child.try_as<Controls::Button>() })
+            {
+                if (HasSettingValue())
+                {
+                    // We want to be smart about showing the override system.
+                    // Don't just show it if the user explicitly set the setting.
+                    // If the tooltip is empty, we'll hide the entire override system.
+                    hstring tooltip;
+
+                    const auto& settingSrc{ SettingOverrideSource() };
+                    if (!settingSrc)
+                    {
+                        // no source; we're using the system-default value
+                        tooltip = L"";
+                    }
+                    else if (const auto& profile{ settingSrc.try_as<Model::Profile>() })
+                    {
+                        tooltip = _GenerateOverrideMessage(profile);
+                    }
+                    else
+                    {
+                        // unknown source
+                        tooltip = L"";
+                    }
+
+                    Controls::ToolTipService::SetToolTip(button, box_value(tooltip));
+                    button.Visibility(tooltip.empty() ? Visibility::Collapsed : Visibility::Visible);
+                }
+                else
+                {
+                    // a value is not being overridden; hide the override system
+                    button.Visibility(Visibility::Collapsed);
+                }
+            }
+        }
+    }
+
+    // Method Description:
+    // - Helper function for generating the override message
+    // Arguments:
+    // - profile: the profile that defines the setting (aka SettingOverrideSource)
+    // Return Value:
+    // - text specifying where the setting was defined. If empty, we don't want to show the system.
+    hstring SettingContainer::_GenerateOverrideMessage(const Model::Profile& profile)
+    {
+        const auto originTag{ profile.Origin() };
+        if (originTag == Model::OriginTag::InBox)
+        {
+            // in-box profile
+            return L"";
+        }
+        else if (originTag == Model::OriginTag::Generated)
+        {
+            // from a dynamic profile generator
+            // TODO #1690: add special handling for proto-extensions here
+            return L"";
+        }
+        else
+        {
+            // base layer
+            // TODO GH#3818: When we add profile inheritance as a setting,
+            //               we'll need an extra conditional check to see if this
+            //               is the base layer or some other profile
+            return RS_(L"SettingContainer_OverrideMessageBaseLayer");
        }
-        return {};
    }
 }
--- a/src/cascadia/TerminalSettingsEditor/SettingContainer.h
+++ b/src/cascadia/TerminalSettingsEditor/SettingContainer.h
@@ -53,12 +53,14 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        DEPENDENCY_PROPERTY(Windows::Foundation::IInspectable, Header);
        DEPENDENCY_PROPERTY(hstring, HelpText);
        DEPENDENCY_PROPERTY(bool, HasSettingValue);
+        DEPENDENCY_PROPERTY(IInspectable, SettingOverrideSource);
        TYPED_EVENT(ClearSettingValue, Editor::SettingContainer, Windows::Foundation::IInspectable);

    private:
        static void _InitializeProperties();
        static void _OnHasSettingValueChanged(Windows::UI::Xaml::DependencyObject const& d, Windows::UI::Xaml::DependencyPropertyChangedEventArgs const& e);
-        hstring _GenerateOverrideMessageText();
+        static hstring _GenerateOverrideSystem(const Model::Profile& profile);
+        void _UpdateOverrideSystem();
    };
 }

--- a/src/cascadia/TerminalSettingsEditor/SettingContainer.idl
+++ b/src/cascadia/TerminalSettingsEditor/SettingContainer.idl
@@ -16,6 +16,9 @@ namespace Microsoft.Terminal.Settings.Editor
        Boolean HasSettingValue;
        static Windows.UI.Xaml.DependencyProperty HasSettingValueProperty { get; };

+        IInspectable SettingOverrideSource;
+        static Windows.UI.Xaml.DependencyProperty SettingOverrideSourceProperty { get; };
+
        event Windows.Foundation.TypedEventHandler<SettingContainer, Object> ClearSettingValue;
    };
 }
--- a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
+++ b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
@@ -27,10 +27,6 @@ the MIT License. See LICENSE in the project root for license information. -->
        <Setter Property="FontFamily" Value="Segoe MDL2 Assets"/>
    </Style>

-    <Style x:Key="SettingContainerOverrideTextStyle" TargetType="TextBlock">
-        <Setter Property="FontStyle" Value="Italic"/>
-    </Style>
-
    <Style TargetType="local:SettingContainer">
        <Setter Property="Margin" Value="0,24,0,0"/>
        <Setter Property="IsTabStop" Value="False"/>
@@ -51,10 +47,6 @@ the MIT License. See LICENSE in the project root for license information. -->

                        <!--This is where the actual setting control will go-->
                        <ContentPresenter Content="{TemplateBinding Content}"/>
-
-                        <!--The text displayed when a setting is being overridden-->
-                        <TextBlock x:Name="OverrideMessage"
-                                   Style="{StaticResource SettingContainerOverrideTextStyle}"/>
                    </StackPanel>
                </ControlTemplate>
            </Setter.Value>
--- a/src/cascadia/TerminalSettingsEditor/ViewModelHelpers.h
+++ b/src/cascadia/TerminalSettingsEditor/ViewModelHelpers.h
@@ -65,10 +65,10 @@ public:                                                   \
        {                                            \
            _NotifyChanges(L"Has" #name, L#name);    \
        }                                            \
-    }
+    }                                                \
+    auto name##OverrideSource() { return target.name##OverrideSource(); }

 // Defines a setting that reflects another object's same-named
 // setting, but which cannot be erased.
 #define PERMANENT_OBSERVABLE_PROJECTED_SETTING(target, name) \
-    _BASE_OBSERVABLE_PROJECTED_SETTING(target, name)         \
-    void Clear##name() {}
+    _BASE_OBSERVABLE_PROJECTED_SETTING(target, name)
--- a/src/cascadia/TerminalSettingsEditor/ViewModelHelpers.idl.h
+++ b/src/cascadia/TerminalSettingsEditor/ViewModelHelpers.idl.h
@@ -10,4 +10,13 @@
        set;                                     \
    };                                           \
    Boolean Has##Name { get; };                  \
-    void Clear##Name()
+    void Clear##Name();                          \
+    Microsoft.Terminal.Settings.Model.Profile Name##OverrideSource { get; }
+
+#define PERMANENT_OBSERVABLE_PROJECTED_SETTING(Type, Name) \
+    Type Name                                              \
+    {                                                      \
+        get;                                               \
+        set;                                               \
+    };                                                     \
+    Boolean Has##Name { get; }
--- a/src/cascadia/TerminalSettingsEditor/pch.h
+++ b/src/cascadia/TerminalSettingsEditor/pch.h
@@ -41,6 +41,7 @@
 #include <winrt/Windows.UI.Xaml.Controls.h>
 #include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
 #include <winrt/Windows.UI.Xaml.Data.h>
+#include <winrt/Windows.UI.Xaml.Documents.h>
 #include <winrt/Windows.UI.Xaml.Input.h>
 #include <winrt/Windows.UI.Xaml.Interop.h>
 #include <winrt/Windows.UI.Xaml.Markup.h>
--- a/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
+++ b/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
@@ -332,6 +332,13 @@ winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings CascadiaSettings::
    resultPtr->_ResolveDefaultProfile();
    resultPtr->_UpdateActiveProfiles();

+    // tag these profiles as in-box
+    for (const auto& profile : resultPtr->AllProfiles())
+    {
+        const auto& profileImpl{ winrt::get_self<implementation::Profile>(profile) };
+        profileImpl->Origin(OriginTag::InBox);
+    }
+
    return *resultPtr;
 }

--- a/src/cascadia/TerminalSettingsModel/DefaultProfileUtils.cpp
+++ b/src/cascadia/TerminalSettingsModel/DefaultProfileUtils.cpp
@@ -20,14 +20,15 @@ winrt::Microsoft::Terminal::Settings::Model::Profile CreateDefaultProfile(const
    const winrt::guid profileGuid{ Microsoft::Console::Utils::CreateV5Uuid(TERMINAL_PROFILE_NAMESPACE_GUID,
                                                                           gsl::as_bytes(gsl::make_span(name))) };

-    auto newProfile = winrt::make<winrt::Microsoft::Terminal::Settings::Model::implementation::Profile>(profileGuid);
-    newProfile.Name(name);
+    auto newProfile = winrt::make_self<winrt::Microsoft::Terminal::Settings::Model::implementation::Profile>(profileGuid);
+    newProfile->Name(winrt::hstring{ name });

    std::wstring iconPath{ PACKAGED_PROFILE_ICON_PATH };
    iconPath.append(Microsoft::Console::Utils::GuidToString(profileGuid));
    iconPath.append(PACKAGED_PROFILE_ICON_EXTENSION);

-    newProfile.Icon(iconPath);
+    newProfile->Icon(winrt::hstring{ iconPath });
+    newProfile->Origin(winrt::Microsoft::Terminal::Settings::Model::OriginTag::Generated);

-    return newProfile;
+    return *newProfile;
 }
--- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.h
+++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.h
@@ -62,32 +62,32 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
        void UnparsedDefaultProfile(const hstring& value);
        void ClearUnparsedDefaultProfile();

-        GETSET_SETTING(int32_t, InitialRows, DEFAULT_ROWS);
-        GETSET_SETTING(int32_t, InitialCols, DEFAULT_COLS);
-        GETSET_SETTING(bool, AlwaysShowTabs, true);
-        GETSET_SETTING(bool, ShowTitleInTitlebar, true);
-        GETSET_SETTING(bool, ConfirmCloseAllTabs, true);
-        GETSET_SETTING(winrt::Windows::UI::Xaml::ElementTheme, Theme, winrt::Windows::UI::Xaml::ElementTheme::Default);
-        GETSET_SETTING(winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode, TabWidthMode, winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode::Equal);
-        GETSET_SETTING(bool, ShowTabsInTitlebar, true);
-        GETSET_SETTING(hstring, WordDelimiters, DEFAULT_WORD_DELIMITERS);
-        GETSET_SETTING(bool, CopyOnSelect, false);
-        GETSET_SETTING(winrt::Microsoft::Terminal::TerminalControl::CopyFormat, CopyFormatting, 0);
-        GETSET_SETTING(bool, WarnAboutLargePaste, true);
-        GETSET_SETTING(bool, WarnAboutMultiLinePaste, true);
-        GETSET_SETTING(Model::LaunchPosition, InitialPosition, nullptr, nullptr);
-        GETSET_SETTING(Model::LaunchMode, LaunchMode, LaunchMode::DefaultMode);
-        GETSET_SETTING(bool, SnapToGridOnResize, true);
-        GETSET_SETTING(bool, ForceFullRepaintRendering, false);
-        GETSET_SETTING(bool, SoftwareRendering, false);
-        GETSET_SETTING(bool, ForceVTInput, false);
-        GETSET_SETTING(bool, DebugFeaturesEnabled, _getDefaultDebugFeaturesValue());
-        GETSET_SETTING(bool, StartOnUserLogin, false);
-        GETSET_SETTING(bool, AlwaysOnTop, false);
-        GETSET_SETTING(Model::TabSwitcherMode, TabSwitcherMode, Model::TabSwitcherMode::InOrder);
-        GETSET_SETTING(bool, DisableAnimations, false);
-        GETSET_SETTING(hstring, StartupActions, L"");
-        GETSET_SETTING(bool, FocusFollowMouse, false);
+        GETSET_SETTING(Model::GlobalAppSettings, int32_t, InitialRows, DEFAULT_ROWS);
+        GETSET_SETTING(Model::GlobalAppSettings, int32_t, InitialCols, DEFAULT_COLS);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, AlwaysShowTabs, true);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, ShowTitleInTitlebar, true);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, ConfirmCloseAllTabs, true);
+        GETSET_SETTING(Model::GlobalAppSettings, winrt::Windows::UI::Xaml::ElementTheme, Theme, winrt::Windows::UI::Xaml::ElementTheme::Default);
+        GETSET_SETTING(Model::GlobalAppSettings, winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode, TabWidthMode, winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode::Equal);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, ShowTabsInTitlebar, true);
+        GETSET_SETTING(Model::GlobalAppSettings, hstring, WordDelimiters, DEFAULT_WORD_DELIMITERS);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, CopyOnSelect, false);
+        GETSET_SETTING(Model::GlobalAppSettings, winrt::Microsoft::Terminal::TerminalControl::CopyFormat, CopyFormatting, 0);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, WarnAboutLargePaste, true);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, WarnAboutMultiLinePaste, true);
+        GETSET_SETTING(Model::GlobalAppSettings, Model::LaunchPosition, InitialPosition, nullptr, nullptr);
+        GETSET_SETTING(Model::GlobalAppSettings, Model::LaunchMode, LaunchMode, LaunchMode::DefaultMode);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, SnapToGridOnResize, true);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, ForceFullRepaintRendering, false);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, SoftwareRendering, false);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, ForceVTInput, false);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, DebugFeaturesEnabled, _getDefaultDebugFeaturesValue());
+        GETSET_SETTING(Model::GlobalAppSettings, bool, StartOnUserLogin, false);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, AlwaysOnTop, false);
+        GETSET_SETTING(Model::GlobalAppSettings, Model::TabSwitcherMode, TabSwitcherMode, Model::TabSwitcherMode::InOrder);
+        GETSET_SETTING(Model::GlobalAppSettings, bool, DisableAnimations, false);
+        GETSET_SETTING(Model::GlobalAppSettings, hstring, StartupActions, L"");
+        GETSET_SETTING(Model::GlobalAppSettings, bool, FocusFollowMouse, false);

    private:
        guid _defaultProfile;
--- a/src/cascadia/TerminalSettingsModel/IInheritable.h
+++ b/src/cascadia/TerminalSettingsModel/IInheritable.h
@@ -83,12 +83,13 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 // Use this macro to quickly implement both getters and the setter for an
 // inheritable setting property. This is similar to the GETSET_PROPERTY macro, except...
 // - Has(): checks if the user explicitly set a value for this setting
+// - SourceGetter(): return the object that provides the resolved value
 // - Getter(): return the resolved value
 // - Setter(): set the value directly
 // - Clear(): clear the user set value
 // - the setting is saved as an optional, where nullopt means
 //   that we must inherit the value from our parent
-#define GETSET_SETTING(type, name, ...)                                     \
+#define GETSET_SETTING(projectedType, type, name, ...)                      \
 public:                                                                     \
    /* Returns true if the user explicitly set the value, false otherwise*/ \
    bool Has##name() const                                                  \
@@ -96,6 +97,22 @@ public:                                                                     \
        return _##name.has_value();                                         \
    }                                                                       \
                                                                            \
+    projectedType name##OverrideSource()                                    \
+    {                                                                       \
+        /*user set value was not set*/                                      \
+        /*iterate through parents to find one with a value*/                \
+        for (auto& parent : _parents)                                       \
+        {                                                                   \
+            if (auto source{ parent->_get##name##OverrideSourceImpl() })    \
+            {                                                               \
+                return source;                                              \
+            }                                                               \
+        }                                                                   \
+                                                                            \
+        /*no value was found*/                                              \
+        return nullptr;                                                     \
+    }                                                                       \
+                                                                            \
    /* Returns the resolved value for this setting */                       \
    /* fallback: user set value --> inherited value --> system set value */ \
    type name() const                                                       \
@@ -138,13 +155,34 @@ private:                                                                    \
                                                                            \
        /*no value was found*/                                              \
        return std::nullopt;                                                \
+    }                                                                       \
+    projectedType _get##name##OverrideSourceImpl() const                    \
+    {                                                                       \
+        /*we have a value*/                                                 \
+        if (_##name)                                                        \
+        {                                                                   \
+            return *this;                                                   \
+        }                                                                   \
+                                                                            \
+        /*user set value was not set*/                                      \
+        /*iterate through parents to find one with a value*/                \
+        for (auto& parent : _parents)                                       \
+        {                                                                   \
+            if (auto source{ parent->_get##name##OverrideSourceImpl() })    \
+            {                                                               \
+                return source;                                              \
+            }                                                               \
+        }                                                                   \
+                                                                            \
+        /*no value was found*/                                              \
+        return nullptr;                                                     \
    }

 // This macro is similar to the one above, but is reserved for optional settings
 // like Profile.Foreground (where null is interpreted
 // as an acceptable value, rather than "inherit")
 // "type" is exposed as an IReference
-#define GETSET_NULLABLE_SETTING(type, name, ...)                            \
+#define GETSET_NULLABLE_SETTING(projectedType, type, name, ...)             \
 public:                                                                     \
    /* Returns true if the user explicitly set the value, false otherwise*/ \
    bool Has##name() const                                                  \
@@ -152,6 +190,22 @@ public:                                                                     \
        return _##name.has_value();                                         \
    }                                                                       \
                                                                            \
+    projectedType name##OverrideSource()                                    \
+    {                                                                       \
+        /*user set value was not set*/                                      \
+        /*iterate through parents to find one with a value*/                \
+        for (auto parent : _parents)                                        \
+        {                                                                   \
+            if (auto source{ parent->_get##name##OverrideSourceImpl() })    \
+            {                                                               \
+                return source;                                              \
+            }                                                               \
+        }                                                                   \
+                                                                            \
+        /*no source was found*/                                             \
+        return nullptr;                                                     \
+    }                                                                       \
+                                                                            \
    /* Returns the resolved value for this setting */                       \
    /* fallback: user set value --> inherited value --> system set value */ \
    winrt::Windows::Foundation::IReference<type> name() const               \
@@ -210,4 +264,25 @@ private:                                                                    \
                                                                            \
        /*no value was found*/                                              \
        return std::nullopt;                                                \
+    }                                                                       \
+    projectedType _get##name##OverrideSourceImpl() const                    \
+    {                                                                       \
+        /*we have a value*/                                                 \
+        if (_##name)                                                        \
+        {                                                                   \
+            return *this;                                                   \
+        }                                                                   \
+                                                                            \
+        /*user set value was not set*/                                      \
+        /*iterate through parents to find one with a value*/                \
+        for (auto& parent : _parents)                                       \
+        {                                                                   \
+            if (auto source{ parent->_get##name##OverrideSourceImpl() })    \
+            {                                                               \
+                return source;                                              \
+            }                                                               \
+        }                                                                   \
+                                                                            \
+        /*no value was found*/                                              \
+        return nullptr;                                                     \
    }
--- a/src/cascadia/TerminalSettingsModel/IInheritable.idl.h
+++ b/src/cascadia/TerminalSettingsModel/IInheritable.idl.h
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+
+#define INHERITABLE_SETTING(Type, Name) \
+    Type Name                         \
+    {                                 \
+        get;                          \
+        set;                          \
+    };                                \
+    Boolean Has##Name { get; };       \
+    void Clear##Name();               \
+    Microsoft.Terminal.Settings.Model.Profile Name##OverrideSource { get; }
--- a/src/cascadia/TerminalSettingsModel/Profile.cpp
+++ b/src/cascadia/TerminalSettingsModel/Profile.cpp
@@ -113,6 +113,7 @@ winrt::com_ptr<Profile> Profile::CopySettings(winrt::com_ptr<Profile> source)
    profile->_PixelShaderPath = source->_PixelShaderPath;
    profile->_BackgroundImageAlignment = source->_BackgroundImageAlignment;
    profile->_ConnectionType = source->_ConnectionType;
+    profile->_Origin = source->_Origin;

    return profile;
 }
--- a/src/cascadia/TerminalSettingsModel/Profile.h
+++ b/src/cascadia/TerminalSettingsModel/Profile.h
@@ -61,58 +61,60 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
        hstring ExpandedBackgroundImagePath() const;
        static guid GetGuidOrGenerateForJson(const Json::Value& json) noexcept;

-        GETSET_SETTING(guid, Guid, _GenerateGuidForProfile(Name(), Source()));
-        GETSET_SETTING(hstring, Name, L"Default");
-        GETSET_SETTING(hstring, Source);
-        GETSET_SETTING(bool, Hidden, false);
-        GETSET_SETTING(guid, ConnectionType);
+        GETSET_PROPERTY(OriginTag, Origin, OriginTag::Custom);
+
+        GETSET_SETTING(Model::Profile, guid, Guid, _GenerateGuidForProfile(Name(), Source()));
+        GETSET_SETTING(Model::Profile, hstring, Name, L"Default");
+        GETSET_SETTING(Model::Profile, hstring, Source);
+        GETSET_SETTING(Model::Profile, bool, Hidden, false);
+        GETSET_SETTING(Model::Profile, guid, ConnectionType);

        // Default Icon: Segoe MDL2 CommandPrompt icon
-        GETSET_SETTING(hstring, Icon, L"\uE756");
+        GETSET_SETTING(Model::Profile, hstring, Icon, L"\uE756");

-        GETSET_SETTING(CloseOnExitMode, CloseOnExit, CloseOnExitMode::Graceful);
-        GETSET_SETTING(hstring, TabTitle);
-        GETSET_NULLABLE_SETTING(Windows::UI::Color, TabColor, nullptr);
-        GETSET_SETTING(bool, SuppressApplicationTitle, false);
+        GETSET_SETTING(Model::Profile, CloseOnExitMode, CloseOnExit, CloseOnExitMode::Graceful);
+        GETSET_SETTING(Model::Profile, hstring, TabTitle);
+        GETSET_NULLABLE_SETTING(Model::Profile, Windows::UI::Color, TabColor, nullptr);
+        GETSET_SETTING(Model::Profile, bool, SuppressApplicationTitle, false);

-        GETSET_SETTING(bool, UseAcrylic, false);
-        GETSET_SETTING(double, AcrylicOpacity, 0.5);
-        GETSET_SETTING(Microsoft::Terminal::TerminalControl::ScrollbarState, ScrollState, Microsoft::Terminal::TerminalControl::ScrollbarState::Visible);
+        GETSET_SETTING(Model::Profile, bool, UseAcrylic, false);
+        GETSET_SETTING(Model::Profile, double, AcrylicOpacity, 0.5);
+        GETSET_SETTING(Model::Profile, Microsoft::Terminal::TerminalControl::ScrollbarState, ScrollState, Microsoft::Terminal::TerminalControl::ScrollbarState::Visible);

-        GETSET_SETTING(hstring, FontFace, DEFAULT_FONT_FACE);
-        GETSET_SETTING(int32_t, FontSize, DEFAULT_FONT_SIZE);
-        GETSET_SETTING(Windows::UI::Text::FontWeight, FontWeight, DEFAULT_FONT_WEIGHT);
-        GETSET_SETTING(hstring, Padding, DEFAULT_PADDING);
+        GETSET_SETTING(Model::Profile, hstring, FontFace, DEFAULT_FONT_FACE);
+        GETSET_SETTING(Model::Profile, int32_t, FontSize, DEFAULT_FONT_SIZE);
+        GETSET_SETTING(Model::Profile, Windows::UI::Text::FontWeight, FontWeight, DEFAULT_FONT_WEIGHT);
+        GETSET_SETTING(Model::Profile, hstring, Padding, DEFAULT_PADDING);

-        GETSET_SETTING(hstring, Commandline, L"cmd.exe");
-        GETSET_SETTING(hstring, StartingDirectory);
+        GETSET_SETTING(Model::Profile, hstring, Commandline, L"cmd.exe");
+        GETSET_SETTING(Model::Profile, hstring, StartingDirectory);

-        GETSET_SETTING(hstring, BackgroundImagePath);
-        GETSET_SETTING(double, BackgroundImageOpacity, 1.0);
-        GETSET_SETTING(Windows::UI::Xaml::Media::Stretch, BackgroundImageStretchMode, Windows::UI::Xaml::Media::Stretch::UniformToFill);
-        GETSET_SETTING(ConvergedAlignment, BackgroundImageAlignment, ConvergedAlignment::Horizontal_Center | ConvergedAlignment::Vertical_Center);
+        GETSET_SETTING(Model::Profile, hstring, BackgroundImagePath);
+        GETSET_SETTING(Model::Profile, double, BackgroundImageOpacity, 1.0);
+        GETSET_SETTING(Model::Profile, Windows::UI::Xaml::Media::Stretch, BackgroundImageStretchMode, Windows::UI::Xaml::Media::Stretch::UniformToFill);
+        GETSET_SETTING(Model::Profile, ConvergedAlignment, BackgroundImageAlignment, ConvergedAlignment::Horizontal_Center | ConvergedAlignment::Vertical_Center);

-        GETSET_SETTING(Microsoft::Terminal::TerminalControl::TextAntialiasingMode, AntialiasingMode, Microsoft::Terminal::TerminalControl::TextAntialiasingMode::Grayscale);
-        GETSET_SETTING(bool, RetroTerminalEffect, false);
-        GETSET_SETTING(hstring, PixelShaderPath, L"");
-        GETSET_SETTING(bool, ForceFullRepaintRendering, false);
-        GETSET_SETTING(bool, SoftwareRendering, false);
+        GETSET_SETTING(Model::Profile, Microsoft::Terminal::TerminalControl::TextAntialiasingMode, AntialiasingMode, Microsoft::Terminal::TerminalControl::TextAntialiasingMode::Grayscale);
+        GETSET_SETTING(Model::Profile, bool, RetroTerminalEffect, false);
+        GETSET_SETTING(Model::Profile, hstring, PixelShaderPath, L"");
+        GETSET_SETTING(Model::Profile, bool, ForceFullRepaintRendering, false);
+        GETSET_SETTING(Model::Profile, bool, SoftwareRendering, false);

-        GETSET_SETTING(hstring, ColorSchemeName, L"Campbell");
+        GETSET_SETTING(Model::Profile, hstring, ColorSchemeName, L"Campbell");

-        GETSET_NULLABLE_SETTING(Windows::UI::Color, Foreground, nullptr);
-        GETSET_NULLABLE_SETTING(Windows::UI::Color, Background, nullptr);
-        GETSET_NULLABLE_SETTING(Windows::UI::Color, SelectionBackground, nullptr);
-        GETSET_NULLABLE_SETTING(Windows::UI::Color, CursorColor, nullptr);
+        GETSET_NULLABLE_SETTING(Model::Profile, Windows::UI::Color, Foreground, nullptr);
+        GETSET_NULLABLE_SETTING(Model::Profile, Windows::UI::Color, Background, nullptr);
+        GETSET_NULLABLE_SETTING(Model::Profile, Windows::UI::Color, SelectionBackground, nullptr);
+        GETSET_NULLABLE_SETTING(Model::Profile, Windows::UI::Color, CursorColor, nullptr);

-        GETSET_SETTING(int32_t, HistorySize, DEFAULT_HISTORY_SIZE);
-        GETSET_SETTING(bool, SnapOnInput, true);
-        GETSET_SETTING(bool, AltGrAliasing, true);
+        GETSET_SETTING(Model::Profile, int32_t, HistorySize, DEFAULT_HISTORY_SIZE);
+        GETSET_SETTING(Model::Profile, bool, SnapOnInput, true);
+        GETSET_SETTING(Model::Profile, bool, AltGrAliasing, true);

-        GETSET_SETTING(Microsoft::Terminal::TerminalControl::CursorStyle, CursorShape, Microsoft::Terminal::TerminalControl::CursorStyle::Bar);
-        GETSET_SETTING(uint32_t, CursorHeight, DEFAULT_CURSOR_HEIGHT);
+        GETSET_SETTING(Model::Profile, Microsoft::Terminal::TerminalControl::CursorStyle, CursorShape, Microsoft::Terminal::TerminalControl::CursorStyle::Bar);
+        GETSET_SETTING(Model::Profile, uint32_t, CursorHeight, DEFAULT_CURSOR_HEIGHT);

-        GETSET_SETTING(Model::BellStyle, BellStyle, BellStyle::Audible);
+        GETSET_SETTING(Model::Profile, Model::BellStyle, BellStyle, BellStyle::Audible);

    private:
        static std::wstring EvaluateStartingDirectory(const std::wstring& directory);
--- a/src/cascadia/TerminalSettingsModel/Profile.idl
+++ b/src/cascadia/TerminalSettingsModel/Profile.idl
@@ -1,8 +1,18 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

+#include "IInheritable.idl.h"
+
 namespace Microsoft.Terminal.Settings.Model
 {
+    // This tag is used to identify the context in which the Profile was created
+    enum OriginTag
+    {
+        Custom = 0,
+        InBox,
+        Generated
+    };
+
    enum CloseOnExitMode
    {
        Never = 0,
@@ -35,160 +45,57 @@ namespace Microsoft.Terminal.Settings.Model
        Profile();
        Profile(Guid guid);

-        Boolean HasName();
-        void ClearName();
-        String Name;
+        OriginTag Origin { get; };
+
+        INHERITABLE_SETTING(String, Name);

        Boolean HasGuid();
        Guid Guid;

-        Boolean HasSource();
-        void ClearSource();
-        String Source;
+        INHERITABLE_SETTING(String, Source);

        Boolean HasConnectionType();
        Guid ConnectionType;

-        Boolean HasHidden();
-        void ClearHidden();
-        Boolean Hidden;
+        INHERITABLE_SETTING(Boolean, Hidden);
+        INHERITABLE_SETTING(String, Icon);
+        INHERITABLE_SETTING(CloseOnExitMode, CloseOnExit);
+        INHERITABLE_SETTING(String, TabTitle);
+        INHERITABLE_SETTING(Windows.Foundation.IReference<Windows.UI.Color>, TabColor);
+        INHERITABLE_SETTING(Boolean, SuppressApplicationTitle);
+        INHERITABLE_SETTING(Boolean, UseAcrylic);
+        INHERITABLE_SETTING(Double, AcrylicOpacity);
+        INHERITABLE_SETTING(Microsoft.Terminal.TerminalControl.ScrollbarState, ScrollState);
+        INHERITABLE_SETTING(String, FontFace);
+        INHERITABLE_SETTING(Int32, FontSize);
+        INHERITABLE_SETTING(Windows.UI.Text.FontWeight, FontWeight);
+        INHERITABLE_SETTING(String, Padding);
+        INHERITABLE_SETTING(String, Commandline);

-        Boolean HasIcon();
-        void ClearIcon();
-        String Icon;
-
-        Boolean HasCloseOnExit();
-        void ClearCloseOnExit();
-        CloseOnExitMode CloseOnExit;
-
-        Boolean HasTabTitle();
-        void ClearTabTitle();
-        String TabTitle;
-
-        Boolean HasTabColor();
-        void ClearTabColor();
-        Windows.Foundation.IReference<Windows.UI.Color> TabColor;
-
-        Boolean HasSuppressApplicationTitle();
-        void ClearSuppressApplicationTitle();
-        Boolean SuppressApplicationTitle;
-
-        Boolean HasUseAcrylic();
-        void ClearUseAcrylic();
-        Boolean UseAcrylic;
-
-        Boolean HasAcrylicOpacity();
-        void ClearAcrylicOpacity();
-        Double AcrylicOpacity;
-
-        Boolean HasScrollState();
-        void ClearScrollState();
-        Microsoft.Terminal.TerminalControl.ScrollbarState ScrollState;
-
-        Boolean HasFontFace();
-        void ClearFontFace();
-        String FontFace;
-
-        Boolean HasFontSize();
-        void ClearFontSize();
-        Int32 FontSize;
-
-        Boolean HasFontWeight();
-        void ClearFontWeight();
-        Windows.UI.Text.FontWeight FontWeight;
-
-        Boolean HasPadding();
-        void ClearPadding();
-        String Padding;
-
-        Boolean HasCommandline();
-        void ClearCommandline();
-        String Commandline;
-
-        Boolean HasStartingDirectory();
-        void ClearStartingDirectory();
-        String StartingDirectory;
+        INHERITABLE_SETTING(String, StartingDirectory);
        String EvaluatedStartingDirectory { get; };

-        Boolean HasBackgroundImagePath();
-        void ClearBackgroundImagePath();
-        String BackgroundImagePath;
+        INHERITABLE_SETTING(String, BackgroundImagePath);
        String ExpandedBackgroundImagePath { get; };

-        Boolean HasBackgroundImageOpacity();
-        void ClearBackgroundImageOpacity();
-        Double BackgroundImageOpacity;
-
-        Boolean HasBackgroundImageStretchMode();
-        void ClearBackgroundImageStretchMode();
-        Windows.UI.Xaml.Media.Stretch BackgroundImageStretchMode;
-
-        Boolean HasBackgroundImageAlignment();
-        void ClearBackgroundImageAlignment();
-        ConvergedAlignment BackgroundImageAlignment;
-
-        Boolean HasAntialiasingMode();
-        void ClearAntialiasingMode();
-        Microsoft.Terminal.TerminalControl.TextAntialiasingMode AntialiasingMode;
-
-        Boolean HasRetroTerminalEffect();
-        void ClearRetroTerminalEffect();
-        Boolean RetroTerminalEffect;
-
-        Boolean HasPixelShaderPath();
-        void ClearPixelShaderPath();
-        String PixelShaderPath;
-
-        Boolean HasForceFullRepaintRendering();
-        void ClearForceFullRepaintRendering();
-        Boolean ForceFullRepaintRendering;
-
-        Boolean HasSoftwareRendering();
-        void ClearSoftwareRendering();
-        Boolean SoftwareRendering;
-
-        Boolean HasColorSchemeName();
-        void ClearColorSchemeName();
-        String ColorSchemeName;
-
-        Boolean HasForeground();
-        void ClearForeground();
-        Windows.Foundation.IReference<Windows.UI.Color> Foreground;
-
-        Boolean HasBackground();
-        void ClearBackground();
-        Windows.Foundation.IReference<Windows.UI.Color> Background;
-
-        Boolean HasSelectionBackground();
-        void ClearSelectionBackground();
-        Windows.Foundation.IReference<Windows.UI.Color> SelectionBackground;
-
-        Boolean HasCursorColor();
-        void ClearCursorColor();
-        Windows.Foundation.IReference<Windows.UI.Color> CursorColor;
-
-        Boolean HasHistorySize();
-        void ClearHistorySize();
-        Int32 HistorySize;
-
-        Boolean HasSnapOnInput();
-        void ClearSnapOnInput();
-        Boolean SnapOnInput;
-
-        Boolean HasAltGrAliasing();
-        void ClearAltGrAliasing();
-        Boolean AltGrAliasing;
-
-        Boolean HasCursorShape();
-        void ClearCursorShape();
-        Microsoft.Terminal.TerminalControl.CursorStyle CursorShape;
-
-        Boolean HasCursorHeight();
-        void ClearCursorHeight();
-        UInt32 CursorHeight;
-
-        Boolean HasBellStyle();
-        void ClearBellStyle();
-        BellStyle BellStyle;
+        INHERITABLE_SETTING(Double, BackgroundImageOpacity);
+        INHERITABLE_SETTING(Windows.UI.Xaml.Media.Stretch, BackgroundImageStretchMode);
+        INHERITABLE_SETTING(ConvergedAlignment, BackgroundImageAlignment);
+        INHERITABLE_SETTING(Microsoft.Terminal.TerminalControl.TextAntialiasingMode, AntialiasingMode);
+        INHERITABLE_SETTING(Boolean, RetroTerminalEffect);
+        INHERITABLE_SETTING(String, PixelShaderPath);
+        INHERITABLE_SETTING(Boolean, ForceFullRepaintRendering);
+        INHERITABLE_SETTING(Boolean, SoftwareRendering);
+        INHERITABLE_SETTING(String, ColorSchemeName);
+        INHERITABLE_SETTING(Windows.Foundation.IReference<Windows.UI.Color>, Foreground);
+        INHERITABLE_SETTING(Windows.Foundation.IReference<Windows.UI.Color>, Background);
+        INHERITABLE_SETTING(Windows.Foundation.IReference<Windows.UI.Color>, SelectionBackground);
+        INHERITABLE_SETTING(Windows.Foundation.IReference<Windows.UI.Color>, CursorColor);
+        INHERITABLE_SETTING(Int32, HistorySize);
+        INHERITABLE_SETTING(Boolean, SnapOnInput);
+        INHERITABLE_SETTING(Boolean, AltGrAliasing);
+        INHERITABLE_SETTING(Microsoft.Terminal.TerminalControl.CursorStyle, CursorShape);
+        INHERITABLE_SETTING(UInt32, CursorHeight);
+        INHERITABLE_SETTING(BellStyle, BellStyle);
    }
 }
Author	SHA1	Message	Date
Dustin L. Howett	b4cda5fb81	Migrate spelling-0.0.21 changes from main	2021-02-17 10:56:16 -08:00
Dustin L. Howett	a00a23dd0a	Migrate spelling-0.0.19 changes from main	2021-02-17 10:56:16 -08:00
Carlos Zamora	526eb92655	polish more now that we don't need hyperlinks	2021-02-17 10:56:16 -08:00
Carlos Zamora	f8c40812a0	PROJECTED_SETTING --> INHERITABLE_SETTING	2021-02-16 16:38:52 -08:00
Carlos Zamora	40d8742a97	redesign: remove text; update reset btn	2021-02-16 16:21:23 -08:00
Carlos Zamora	08e1050cd4	code format	2021-02-09 14:43:42 -08:00
Carlos Zamora	1ba476e09c	Merge branch 'main' into dev/cazamor/sui/inheritance-hyperlinks	2021-02-09 14:35:50 -08:00
Carlos Zamora	a99afb6f9d	fix build; update TerminalSettings	2021-02-09 13:32:59 -08:00
Carlos Zamora	4f3ca9a739	Merge branch 'main' into dev/cazamor/sui/inheritance-hyperlinks	2021-02-09 13:20:46 -08:00
Carlos Zamora	ac9b5498f6	polish; ready for review	2021-02-09 11:33:27 -08:00
Carlos Zamora	64c776ee61	working prototype	2021-02-08 19:18:52 -08:00
Carlos Zamora	576a3f0900	TSE: implement message generation	2021-02-08 17:38:45 -08:00
Carlos Zamora	309746b8d1	fix TSM	2021-02-08 17:37:40 -08:00
Carlos Zamora	4c2f59a012	TSM: implement tagging mechanism for profiles	2021-02-08 11:30:01 -08:00
Carlos Zamora	dd764a8f27	TSM: add getter for source object	2021-02-08 11:29:23 -08:00