Update 'restart connection' action to reset internal state (#19971 )

## Summary of the Pull Request I was becoming frustrated with getting in a state where a CLI app (i.e. Copilot CLI) enters some VT state (like mouse mode) then doesn't unset it when it accidentally exits. I normally use "Restart connection" to keep the buffer and connect again. Problem is, "restart connection" didn't actually reset the internal state! So I would type and get a bunch of lingering VT escape sequences. This bug is tracked over in #18425 in a more generic way. This fixes that bug by doing the following: - update `ITermDispatch::HardReset()` -->`HardReset(bool erase)` - `erase=true` does what `HardReset()` already did - `erase=false` skips over clearing the screen and resetting the cursor position - expose `HardReset(false)` as `HardResetWithoutErase()` by piping it up through `Terminal` --> `ControlCore` --> `TermControl` - update the restart connection handler - `TerminalPage::_restartPaneConnection()` now calls `HardResetWithoutErase()` before setting the new connection - this is also the same route for the "Enter to restart connection" scenario (text displayed when connection ends) Relevant notes from PR discussion: - `PSEUDOCONSOLE_INHERIT_CURSOR` is passed into the new connection via `_restartPaneConnection()` --> `_duplicateConnectionForRestart()` --> `_CreateConnectionFromSettings(profile, *controlSettings.DefaultSettings(), true)` ## Validation Steps Performed - Used this to enter mouse tracking mode: `Write-Host -NoNewline "`e[?1003h`e[?1006h"` - mouse selection doesn't work as usual (expected) - invoke "restart connection" action - mouse selection works as usual Closes #18425 (cherry picked from commit ec939aabda) Service-Card-Id: PVTI_lADOAF3p4s4BBcTlzgpBL5w Service-Version: 1.24
Fix selection markers appearing on scroll (#20045 )
2026-04-11 16:51:00 +00:00 · 2026-04-02 19:15:01 -05:00 · 2026-04-02 19:11:42 -05:00 · 2026-03-31 17:44:53 -05:00 · 2026-03-31 17:23:53 -05:00 · 2026-03-31 17:23:52 -05:00
626 changed files with 13667 additions and 36625 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true

 contact_links:
  - name: Microsoft Security Response Center 🔐
--- a/.github/actions/spelling/allow/allow.txt
+++ b/.github/actions/spelling/allow/allow.txt
@@ -67,14 +67,11 @@ servicebus
 slnt
 stakeholders
 subpage
-subpages
 sustainability
 sxn
 Tencent
 toolset
-Uids
 UEFI
-UIDs
 uiatextrange
 und
 vsdevcmd
--- a/.github/actions/spelling/expect/74d92373e136649071b3c04dc8773f18deaf5e04.txt
+++ b/.github/actions/spelling/expect/74d92373e136649071b3c04dc8773f18deaf5e04.txt
@@ -1 +0,0 @@
-ftcs
--- a/.github/actions/spelling/expect/expect.txt
+++ b/.github/actions/spelling/expect/expect.txt
@@ -256,6 +256,7 @@ conterm
 contsf
 contypes
 conwinuserrefs
+coordnew
 COPYCOLOR
 COPYDATA
 COPYDATASTRUCT
@@ -495,7 +496,6 @@ DSBUFFERDESC
 DSBVOLUME
 dsm
 dsound
-DSRCPR
 DSSCL
 DSwap
 DTo
@@ -541,6 +541,7 @@ EPres
 EQU
 ERASEBKGND
 ERRORONEXIT
+ESFCIB
 esrp
 ESV
 ETW
@@ -572,7 +573,6 @@ FGHIJ
 fgidx
 FGs
 FILEDESCRIPTION
-filehops
 FILESUBTYPE
 FILESYSPATH
 FILEW
@@ -604,6 +604,7 @@ FONTSTRING
 FONTTYPE
 FONTWIDTH
 FONTWINDOW
+foob
 FORCEOFFFEEDBACK
 FORCEONFEEDBACK
 FRAMECHANGED
@@ -620,8 +621,10 @@ FUNCTIONCALL
 fuzzmain
 fuzzmap
 fuzzwrapper
+fuzzyfinder
 fwdecl
 fwe
+fwlink
 fzf
 gci
 gcx
@@ -805,7 +808,6 @@ IMPEXP
 inbox
 inclusivity
 INCONTEXT
-INDEXID
 INFOEX
 inheritcursor
 ININPUTSYNCCALL
@@ -865,7 +867,6 @@ KILLACTIVE
 KILLFOCUS
 kinda
 KIYEOK
-KKP
 KLF
 KLMNO
 KOK
@@ -885,7 +886,6 @@ LBUTTONDOWN
 LBUTTONUP
 lcb
 lci
-LCMAP
 LCONTROL
 LCTRL
 lcx
@@ -910,7 +910,6 @@ LNM
 LOADONCALL
 LOBYTE
 localappdata
-LOCATIONCHANGE
 locsrc
 Loewen
 LOGBRUSH
@@ -962,6 +961,7 @@ lsb
 lsconfig
 lstatus
 lstrcmp
+lstrcmpi
 LTEXT
 lto
 ltsc
@@ -1020,7 +1020,6 @@ minkernel
 MINMAXINFO
 minwin
 minwindef
-misprediction
 MMBB
 mmcc
 MMCPL
@@ -1036,7 +1035,6 @@ MOUSEACTIVATE
 MOUSEFIRST
 MOUSEHWHEEL
 MOVESTART
-msaa
 msb
 msbuildcache
 msctls
@@ -1129,6 +1127,7 @@ NOREPOSITION
 NORMALDISPLAY
 NOSCRATCH
 NOSEARCH
+noselect
 NOSELECTION
 NOSENDCHANGING
 NOSIZE
@@ -1146,7 +1145,6 @@ NOYIELD
 NOZORDER
 NPFS
 nrcs
-NRNW
 NSTATUS
 ntapi
 ntdef
@@ -1187,6 +1185,7 @@ onecoreuuid
 ONECOREWINDOWS
 onehalf
 oneseq
+oob
 openbash
 opencode
 opencon
@@ -1590,7 +1589,6 @@ SLGP
 SLIST
 slmult
 sln
-slnx
 slpit
 SManifest
 SMARTQUOTE
@@ -1771,9 +1769,7 @@ UINTs
 uld
 uldash
 uldb
-ULONGLONG
 ulwave
-Unaccess
 Unadvise
 unattend
 UNCPRIORITY
@@ -1984,8 +1980,8 @@ WRITECONSOLEINPUT
 WRITECONSOLEOUTPUT
 WRITECONSOLEOUTPUTSTRING
 wrkstr
-wrl
 WRL
+wrl
 wrp
 WRunoff
 WSLENV
--- a/.github/workflows/spelling2.yml
+++ b/.github/workflows/spelling2.yml
@@ -93,7 +93,7 @@ jobs:
    steps:
      - name: check-spelling
        id: spelling
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@v0.0.25
        with:
          suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
          checkout: true
@@ -153,7 +153,7 @@ jobs:
    if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
    steps:
      - name: comment
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@v0.0.25
        with:
          checkout: true
          spell_check_this: microsoft/terminal@main
@@ -171,7 +171,7 @@ jobs:
    if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
    steps:
      - name: comment
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@v0.0.25
        with:
          checkout: true
          spell_check_this: microsoft/terminal@main
@@ -197,7 +197,7 @@ jobs:
      cancel-in-progress: false
    steps:
      - name: apply spelling updates
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@v0.0.25
        with:
          experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
          checkout: true
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
--- a/OpenConsole.slnx
+++ b/OpenConsole.slnx
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@
    - [Via Chocolatey (unofficial)](#via-chocolatey-unofficial)
    - [Via Scoop (unofficial)](#via-scoop-unofficial)
 - [Installing Windows Terminal Canary](#installing-windows-terminal-canary)
+- [Windows Terminal Roadmap](#windows-terminal-roadmap)
 - [Terminal \& Console Overview](#terminal--console-overview)
  - [Windows Terminal](#windows-terminal)
  - [The Windows Console Host](#the-windows-console-host)
@@ -168,15 +169,20 @@ The Portable ZIP distribution is a portable application. It will not automatical

 | Distribution  | Architecture    | Link                                                 |
 |---------------|:---------------:|------------------------------------------------------|
-| App Installer | x64, arm64, x86 | [Download](https://aka.ms/terminal-canary-installer) |
-| Portable ZIP  | x64             | [Download](https://aka.ms/terminal-canary-zip-x64)   |
-| Portable ZIP  | ARM64           | [Download](https://aka.ms/terminal-canary-zip-arm64) |
-| Portable ZIP  | x86             | [Download](https://aka.ms/terminal-canary-zip-x86)   |
+| App Installer | x64, arm64, x86 | [download](https://aka.ms/terminal-canary-installer) |
+| Portable ZIP  | x64             | [download](https://aka.ms/terminal-canary-zip-x64)   |
+| Portable ZIP  | ARM64           | [download](https://aka.ms/terminal-canary-zip-arm64) |
+| Portable ZIP  | x86             | [download](https://aka.ms/terminal-canary-zip-x86)   |

 _Learn more about the [types of Windows Terminal distributions](https://learn.microsoft.com/windows/terminal/distributions)._

 ---

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

 Please take a few minutes to review the overview below before diving into the
@@ -369,7 +375,7 @@ winget configure .config\configuration.winget

 ## Building the Code

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

 ### Building in PowerShell
--- a/build/StoreSubmission/Preview/PDPs/de-DE/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/de-DE/PDP.xml
@@ -56,12 +56,11 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme der Com
  <ReleaseNotes>
    Version __VERSION_NUMBER__

-– Endlich die Möglichkeit, nach beliebigen Einstellungen zu suchen!
-– Ein neuer nativer Editor für Tastenkombinationen, Aktionen und Einträge in der Befehlspalette.
-– Neue Community-Übersetzungen für Serbisch und Ukrainisch
-– Unterstützung für das „Kitty“-Tastaturprotokoll für hochauflösende Eingabecodierung
+- Wir haben der Benutzeroberfläche durchschnittliche Einstellungen hinzugefügt, die nur einmal in der JSON-Datei vorhanden waren, einschließlich einer neuen Seite zum Anpassen des Layouts Ihres Menüs "Neue Registerkarte"!
+- Wir haben die Fensterverwaltung zurückgesetzt, um die Zuverlässigkeit zu verbessern; Melden Sie alle Fehler, die mit dem alias "wt.exe" auftreten.
+- Profile zeigen jetzt ein Symbol an, wenn sie ausgeblendet wurden oder auf programme verweisen, die deinstalliert wurden.

-Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
+Weitere Details finden Sie auf unserer GitHub-Releasesseite.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/en-US/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/en-US/PDP.xml
@@ -54,12 +54,11 @@ This is an open source project and we welcome community participation. To partic
    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
  </DevStudio>
  <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe}{Locked=Kitty} App Release Note" -->Version __VERSION_NUMBER__
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Version __VERSION_NUMBER__

- Finally, the ability to search for any setting!
- A new native editor for key bindings, actions and command palette entries.
- New community localizations to Serbian and Ukrainian
- Support for the "Kitty" keyboard protocol for high-fidelity input encoding
+- A whole new Extensions page that shows what has been installed into your Terminal
+- Command Palette now shows up in your native language as well as English
+- New VT features such as synchronized rendering, new color schemes, configuration for quick mouse actions like zooming, and more

 Please see our GitHub releases page for additional details.
  </ReleaseNotes>
--- a/build/StoreSubmission/Preview/PDPs/es-ES/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/es-ES/PDP.xml
@@ -54,14 +54,13 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
    
  </DevStudio>
  <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    Versión __VERSION_NUMBER__

- Por último, la capacidad de buscar cualquier configuración.
- Nuevo editor nativo para asignaciones de teclas, acciones y entradas de la paleta de comandos.
- Nuevas localizaciones comunitarias para serbio y ucraniano
- Soporte para el protocolo de teclado "Kitty" para codificación de entrada de alta fidelidad
+- Hemos agregado decenas de configuraciones a la interfaz de usuario que solo existían una vez en el archivo JSON, incluida una página nueva para personalizar el diseño del menú Nueva pestaña.
+- Tenemos administración de ventanas rearchitecdas para mejorar la confiabilidad; envíe los errores que encuentre con el alias de wt.exe.
+- Ahora, los perfiles muestran un icono si se han ocultado o hacen referencia a programas que se han desinstalado.

-Consulta la página de versiones de GitHub para más información.
+Consulte nuestra página de versiones de GitHub para obtener más detalles.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/fr-FR/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/fr-FR/PDP.xml
@@ -54,14 +54,13 @@ Il s’agit d’un projet open source et nous vous invitons à participer dans l
    
  </DevStudio>
  <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    __VERSION_NUMBER__ de version

- Enfin, la possibilité de rechercher n’importe quel paramètre !
- Un nouvel éditeur natif pour les raccourcis clavier, les actions et les entrées de la palette de commandes.
- De nouvelles localisations communautaires en serbe et en ukrainien
- Une prise en charge du protocole clavier « Kitty » pour un encodage d’entrée à haute fidélité
+- Nous avons ajouté des milliers de paramètres à l’interface utilisateur qui n’existaient auparavant que dans le fichier JSON, y compris une nouvelle page pour personnaliser la disposition de votre menu Nouvel onglet !
+- Nous avons réarchitialiser la gestion des fenêtres pour améliorer la fiabilité ; entrez les bogues rencontrés avec l’alias wt.exe
+- Les profils affichent désormais une icône s’ils ont été masqués ou s’ils font référence à des programmes qui ont été désinstallés.

-Consultez notre page des versions de GitHub pour plus de détails.
+Pour plus d’informations, consultez notre page des mises en production GitHub.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/it-IT/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/it-IT/PDP.xml
@@ -56,12 +56,11 @@ Si tratta di un progetto open source e la partecipazione della community è molt
  <ReleaseNotes>
    Versione __VERSION_NUMBER__

- Finalmente è possibile cercare qualsiasi impostazione
- Nuovo editor nativo per le associazioni di tasti, le azioni e le voci del riquadro comandi.
- Nuove localizzazioni della community in serbo e ucraino
- Supporto per il protocollo di tastiera "Kitty" per una codifica dell'input ad alta fedeltà
+- Sono state aggiunte decine di impostazioni all'interfaccia utente che una volta esisteva solo nel file JSON, inclusa una nuova pagina per personalizzare il layout del menu Nuova scheda.
+- È stata riattivata la gestione delle finestre per migliorare l'affidabilità; inserire eventuali bug riscontrati con l'alias wt.exe
+- I profili ora mostrano un'icona se sono stati nascosti o fanno riferimento ai programmi che sono stati disinstallati.

-Per altri dettagli, vedi la pagina delle release di GitHub.
+Per altri dettagli, vedere la pagina delle versioni di GitHub.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/ja-JP/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/ja-JP/PDP.xml
@@ -56,12 +56,11 @@
  <ReleaseNotes>
    バージョン __VERSION_NUMBER__

- 最後に、任意の設定を検索する機能です。
- キー バインド、アクション、コマンド パレット エントリ用の新しいネイティブ エディター。
- セルビア語とウクライナ語への新しいコミュニティ ローカライズ
- 高忠実度入力エンコード用の "Kitty" キーボード プロトコルのサポート
+- [新しいタブ] メニューのレイアウトをカスタマイズするための新しいページを含む、一度だけ JSON ファイルに存在した UI に多数の設定を追加しました。
+- 信頼性を向上させるためにウィンドウ管理を再選択しました。wt.exe エイリアスで発生したバグを報告してください
+- プロファイルが非表示になっているか、アンインストールされたプログラムを参照している場合にアイコンが表示されるようになりました。

-詳細については、GitHub リリース ページをご覧ください。
+詳細については、GitHub リリース ページを参照してください。
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/ko-KR/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/ko-KR/PDP.xml
@@ -56,12 +56,11 @@
  <ReleaseNotes>
    버전 __VERSION_NUMBER__

- 드디어 모든 설정을 검색할 수 있게 되었어요!
- 키 바인딩, 작업, 명령 팔레트 항목을 위한 새로운 기본 편집기가 추가되었습니다.
- 세르비아어와 우크라이나어 커뮤니티 지역화를 새롭게 지원합니다.
- 고품질 입력 인코딩을 위해 "Kitty" 키보드 프로토콜을 지원합니다.
+- 새 탭 메뉴의 레이아웃을 사용자 지정하기 위한 새 페이지를 포함하여 JSON 파일에 한 번만 존재했던 UI에 수천 개의 설정을 추가했습니다.
+- 안정성을 개선하기 위해 창 관리를 다시 보관했습니다. wt.exe 별칭에 발생한 버그를 제출하세요.
+- 프로필이 숨겨졌거나 제거된 프로그램을 참조하는 경우 이제 프로필에 아이콘이 표시됩니다.

-자세한 정보는 GitHub 릴리스 페이지를 참고하세요.
+자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/pt-BR/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/pt-BR/PDP.xml
@@ -54,14 +54,13 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
    
  </DevStudio>
  <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    Versão __VERSION_NUMBER__

- Finalmente, a possibilidade de pesquisar qualquer configuração!
- Um novo editor nativo para combinações de teclas, ações e entradas na paleta de comandos.
- Novas localizações da comunidade para sérvio e ucraniano
- Suporte para o protocolo de teclado "Kitty" para codificação de entrada de alta fidelidade
+- Adicionamos várias configurações à interface do usuário que só existiam no arquivo JSON, incluindo uma nova página para personalizar o layout do menu Nova Guia!
+- Temos o gerenciamento de janelas rearmado para melhorar a confiabilidade; registre todos os bugs encontrados com o wt.exe alias
+- Os perfis agora mostram um ícone se eles foram ocultos ou se referem a programas que foram desinstalados.

-Confira nossa página de lançamentos no GitHub para obter mais detalhes.
+Consulte nossa página de versões do GitHub para obter detalhes adicionais.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml
@@ -56,12 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !

-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml
@@ -56,12 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !

-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml
@@ -56,12 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !

-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/ru-RU/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/ru-RU/PDP.xml
@@ -56,10 +56,9 @@
  <ReleaseNotes>
    Версия __VERSION_NUMBER__

-– Наконец-то появилась возможность поиска любых параметров!
-– Новый собственный редактор для настраиваемых сочетаний клавиш, действий и записей палитры команд.
-– Новые локализации сообщества на сербский и украинский языки
-– Поддержка протокола клавиатуры Kitty для высокоточного кодирования ввода
+- Мы добавили в пользовательский интерфейс десятки параметров, которые существовали только в JSON-файле, включая новую страницу для настройки макета меню "Новая вкладка".
+- Для повышения надежности мы переупоряхлили управление окнами; создайте все ошибки, обнаруженные с wt.exe псевдонимом
+- Профили теперь показывают значок, если они скрыты или ссылаются на программы, которые были удалены.

 Дополнительные сведения см. на странице выпусков GitHub.
  </ReleaseNotes>
--- a/build/StoreSubmission/Preview/PDPs/sr-Cyrl-RS/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/sr-Cyrl-RS/PDP.xml
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProductDescription language="sr-cyrl-rs" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
-  <AppStoreName _locID="App_AppStoreName">
-    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
-    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
-    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
-    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
-    <!-- Windows Terminal -->
-  </AppStoreName>
-  <Keywords>
-    <!-- Valid length: 30 character limit, up to 7 elements -->
-    <Keyword _locID="App_keyword1">
-      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Терминал</Keyword>
-    <Keyword _locID="App_keyword2">
-      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->Конзола</Keyword>
-    <Keyword _locID="App_keyword3">
-      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->
-    </Keyword>
-    <Keyword _locID="App_keyword4">
-      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->
-    </Keyword>
-    <Keyword _locID="App_keyword5">
-      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->
-    </Keyword>
-    <Keyword _locID="App_keyword6">
-      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->
-    </Keyword>
-    <Keyword _locID="App_keyword7">
-      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->
-    </Keyword>
-  </Keywords>
-  <Description _locID="App_Description">
-    <!-- _locComment_text="{MaxLength=10000} App Description" -->Ово је изградња прегледа апликације Windows терминал. Она садржи најновије могућности које се још увек развијају. Windows терминал је модерна, брза, ефикасна, моћна и продуктивна апликација терминала за кориснике алата из командне линије и љуски као што су Command Prompt, PowerShell, и WSL. Неке од његових главних функционалности су вишеструке картице, панели, подршка за Уникод и UTF-8, GPU убрзани механизам за исцртавање текста, произвољне теме, стилови и конфигурације.
-
-Ово је пројекат отвореног кода и учешће заједнице је добродошло. Ако желите да учествујете, молимо вас да посетите https://github.com/microsoft/terminal </Description>
-  <ShortDescription _locID="App_ShortDescription">
-    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
-    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
-  </ShortDescription>
-  <ShortTitle _locID="App_ShortTitle">
-    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
-    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
-  </ShortTitle>
-  <SortTitle _locID="App_SortTitle">
-    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
-    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
-  </SortTitle>
-  <VoiceTitle _locID="App_VoiceTitle">
-    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
-    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
-  </VoiceTitle>
-  <DevStudio _locID="App_DevStudio">
-    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
-    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
-  </DevStudio>
-  <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe}{Locked=Kitty} App Release Note" -->Верзија __VERSION_NUMBER__
-
- Коначно, могућност претраге било ког подешавања!
- Нови својствени едитор ставки пречица на тастатури, акција и командне палете
- Нова локализација заједнице на српски и украјински језик
- Подршка за „Kitty” протокол тастатуре који омогућава верно кодирање уноса
-
-За више детаља, молимо вас да посетите нашу GitHub страницу издања.
-  </ReleaseNotes>
-  <ScreenshotCaptions>
-    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
-    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
-    <Caption DesktopImage="acrylic-emoji.png" _locID="App_caption1">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 1" -->
-    </Caption>
-    <Caption DesktopImage="panes.png" _locID="App_caption2">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 2" -->
-    </Caption>
-    <Caption DesktopImage="htop.png" _locID="App_caption3">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 3" -->
-    </Caption>
-  </ScreenshotCaptions>
-  <AdditionalAssets>
-    <!-- Valid elements:-->
-    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
-    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
-    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
-    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
-    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
-    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
-    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
-    <PosterArt FileName="Store Poster Art.png" />
-    <BoxArt FileName="Store Box Art.png" />
-    <PromotionalArt16x9 FileName="Store Thumbnail.png" />
-  </AdditionalAssets>
-  <Trailers>
-    <!-- Maximum number of trailers permitted: 15 -->
-    <Trailer FileName="CC0605_CommandLine_Teaser_WEB_MASTER_H264_1080p_23.976_-16LKFS_-3dbTP_ST.mp4">
-      <Title _locID="App_trailerTitle1">
-        <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->Нови Windows терминал</Title>
-      <Images>
-        <!-- Current maximum of 1 image per trailer permitted. -->
-        <Image FileName="Store Thumbnail.png">
-          <!-- _locComment_text="{Locked} Trailer screenshot 1 description" -->
-        </Image>
-      </Images>
-    </Trailer>
-  </Trailers>
-  <AppFeatures>
-    <!-- Valid length: 200 character limit, up to 20 elements -->
-    <AppFeature _locID="App_feature1">
-      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Вишеструке картице</AppFeature>
-    <AppFeature _locID="App_feature2">
-      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Пуна Уникод подршка</AppFeature>
-    <AppFeature _locID="App_feature3">
-      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->GPU-убрзано исцртавање текста</AppFeature>
-    <AppFeature _locID="App_feature4">
-      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->Потпуна прилагодљивост</AppFeature>
-    <AppFeature _locID="App_feature5">
-      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->Подела панела</AppFeature>
-    <AppFeature _locID="App_feature6">
-      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature7">
-      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature8">
-      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature9">
-      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature10">
-      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature11">
-      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature12">
-      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature13">
-      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature14">
-      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature15">
-      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature16">
-      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature17">
-      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature18">
-      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature19">
-      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature20">
-      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
-    </AppFeature>
-  </AppFeatures>
-  <RecommendedHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-    <Recommendation _locID="App_RecommendedHW1">
-      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->Тастатура</Recommendation>
-  </RecommendedHardware>
-  <MinimumHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-  </MinimumHardware>
-  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
-    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Copyright (c) Microsoft Corporation</CopyrightAndTrademark>
-  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
-    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
-  </AdditionalLicenseTerms>
-  <WebsiteURL _locID="App_WebsiteURL">
-    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/microsoft/terminal</WebsiteURL>
-  <SupportContactInfo _locID="App_SupportContactInfo">
-    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/microsoft/terminal/issues/new</SupportContactInfo>
-  <PrivacyPolicyURL _locID="App_PrivacyURL">
-    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
-</ProductDescription>
--- a/build/StoreSubmission/Preview/PDPs/uk-UA/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/uk-UA/PDP.xml
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProductDescription language="en-us" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
-  <AppStoreName _locID="App_AppStoreName">
-    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
-    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
-    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
-    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
-    <!-- Windows Terminal -->
-  </AppStoreName>
-  <Keywords>
-    <!-- Valid length: 30 character limit, up to 7 elements -->
-    <Keyword _locID="App_keyword1">
-      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Термінал</Keyword>
-    <Keyword _locID="App_keyword2">
-      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->Консоль</Keyword>
-    <Keyword _locID="App_keyword3">
-      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->
-    </Keyword>
-    <Keyword _locID="App_keyword4">
-      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->
-    </Keyword>
-    <Keyword _locID="App_keyword5">
-      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->
-    </Keyword>
-    <Keyword _locID="App_keyword6">
-      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->
-    </Keyword>
-    <Keyword _locID="App_keyword7">
-      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->
-    </Keyword>
-  </Keywords>
-  <Description _locID="App_Description">
-    <!-- _locComment_text="{MaxLength=10000} App Description" -->Це попередня збірка терміналу Windows, яка містить найновіші функції в міру їх розробки. Термінал Windows - це сучасний, швидкий, ефективний, потужний та продуктивний термінальний застосунок для користувачів інструментів командного рядка та оболонок, таких як командний рядок, PowerShell та WSL. Його основні функції включають кілька вкладок, панелей, підтримку символів Unicode та UTF-8, механізм візуалізації тексту з прискоренням GPU, а також користувацькі теми, стилі та конфігурації.
-
-Це проєкт з відкритим кодом, і ми вітаємо участь спільноти. Щоб взяти участь, будь ласка, відвідайте https://github.com/microsoft/terminal </Description>
-  <ShortDescription _locID="App_ShortDescription">
-    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
-    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
-  </ShortDescription>
-  <ShortTitle _locID="App_ShortTitle">
-    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
-    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
-  </ShortTitle>
-  <SortTitle _locID="App_SortTitle">
-    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
-    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
-  </SortTitle>
-  <VoiceTitle _locID="App_VoiceTitle">
-    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
-    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
-  </VoiceTitle>
-  <DevStudio _locID="App_DevStudio">
-    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
-    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
-  </DevStudio>
-  <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Версія __VERSION_NUMBER__
-
- Нарешті, можливість пошуку будь-якого налаштування!
- Новий вбудований редактор для прив'язки клавіш, дій та палітри команд.
- Нові локалізації спільноти на сербську та українську мови.
- Підтримка протоколу клавіатури "Kitty" для високоточного кодування введення.
-
-Будь ласка, перегляньте нашу сторінку релізів GitHub для отримання додаткової інформації.
-  </ReleaseNotes>
-  <ScreenshotCaptions>
-    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
-    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
-    <Caption DesktopImage="acrylic-emoji.png" _locID="App_caption1">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 1" -->
-    </Caption>
-    <Caption DesktopImage="panes.png" _locID="App_caption2">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 2" -->
-    </Caption>
-    <Caption DesktopImage="htop.png" _locID="App_caption3">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 3" -->
-    </Caption>
-  </ScreenshotCaptions>
-  <AdditionalAssets>
-    <!-- Valid elements:-->
-    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
-    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
-    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
-    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
-    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
-    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
-    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
-    <PosterArt FileName="Store Poster Art.png" />
-    <BoxArt FileName="Store Box Art.png" />
-    <PromotionalArt16x9 FileName="Store Thumbnail.png" />
-  </AdditionalAssets>
-  <Trailers>
-    <!-- Maximum number of trailers permitted: 15 -->
-    <Trailer FileName="CC0605_CommandLine_Teaser_WEB_MASTER_H264_1080p_23.976_-16LKFS_-3dbTP_ST.mp4">
-      <Title _locID="App_trailerTitle1">
-        <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->Новий термінал Windows</Title>
-      <Images>
-        <!-- Current maximum of 1 image per trailer permitted. -->
-        <Image FileName="Store Thumbnail.png">
-          <!-- _locComment_text="{Locked} Trailer screenshot 1 description" -->
-        </Image>
-      </Images>
-    </Trailer>
-  </Trailers>
-  <AppFeatures>
-    <!-- Valid length: 200 character limit, up to 20 elements -->
-    <AppFeature _locID="App_feature1">
-      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Наявність вкладок</AppFeature>
-    <AppFeature _locID="App_feature2">
-      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Повна підтримка Юнікоду</AppFeature>
-    <AppFeature _locID="App_feature3">
-      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->Рендеринг тексту з прискоренням GPU</AppFeature>
-    <AppFeature _locID="App_feature4">
-      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->Широкі можливості кастомізації</AppFeature>
-    <AppFeature _locID="App_feature5">
-      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->Розділення панелей</AppFeature>
-    <AppFeature _locID="App_feature6">
-      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature7">
-      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature8">
-      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature9">
-      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature10">
-      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature11">
-      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature12">
-      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature13">
-      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature14">
-      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature15">
-      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature16">
-      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature17">
-      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature18">
-      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature19">
-      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature20">
-      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
-    </AppFeature>
-  </AppFeatures>
-  <RecommendedHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-    <Recommendation _locID="App_RecommendedHW1">
-      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->Клавіатура</Recommendation>
-  </RecommendedHardware>
-  <MinimumHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-  </MinimumHardware>
-  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
-    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Права (c) Корпорація Майкрософт</CopyrightAndTrademark>
-  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
-    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
-  </AdditionalLicenseTerms>
-  <WebsiteURL _locID="App_WebsiteURL">
-    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/microsoft/terminal</WebsiteURL>
-  <SupportContactInfo _locID="App_SupportContactInfo">
-    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/microsoft/terminal/issues/new</SupportContactInfo>
-  <PrivacyPolicyURL _locID="App_PrivacyURL">
-    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
-</ProductDescription>
--- a/build/StoreSubmission/Preview/PDPs/zh-CN/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/zh-CN/PDP.xml
@@ -54,14 +54,13 @@
    
  </DevStudio>
  <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    版本 __VERSION_NUMBER__

- 终于可以搜索任何设置了!
- 新增用于键绑定、操作和命令面板条目的原生编辑器。
- 新增塞尔维亚语和乌克兰语社区本地化支持
- 支持 "Kitty" 键盘协议，实现高保真输入编码
+- 我们向用户界面添加了许多设置，这些设置仅存在于 JSON 文件中，包括用于自定义“新建标签页”菜单布局的新页面！
+- 我们已重新检测窗口管理以提高可靠性;请将遇到的任何 bug 归档为 wt.exe 别名
+- 如果配置文件已隐藏或引用已卸载的程序，则它们现在将显示一个图标。

-有关其他详细信息，请参阅我们的 GitHub 发布页面。
+有关其他详细信息，请参阅 GitHub 发布页面。
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/zh-TW/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/zh-TW/PDP.xml
@@ -54,14 +54,13 @@
    
  </DevStudio>
  <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    版本 __VERSION_NUMBER__

- 終於，提供可搜尋任何設定的功能!
- 全新原生編輯器，支援按鍵繫結、動作及命令選擇區項目。
- 新增社群本地語系化，包含塞爾維亞語與烏克蘭語
- 支援高保真度輸入編碼的「Kitty」鍵盤通訊協定
+- 我們已新增數十個只存在於 JSON 檔案中的設定到 UI，包括自定義 [新索引標籤] 功能表版面配置的新頁面！
+- 我們已重新設定視窗管理，以改善可靠性;請提出您在 wt.exe 別名遇到的任何錯誤
+- 設定文件現在會在隱藏或參照已卸載的程式時顯示圖示。

-如需更多詳細資料，請參閱我們的 GitHub 發行版本頁面。
+如需詳細數據，請參閱我們的 GitHub 版本頁面。
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/de-DE/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/de-DE/PDP.xml
@@ -56,9 +56,12 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme an der
  <ReleaseNotes>
    Version __VERSION_NUMBER__

-– Eine komplett neue Erweiterungsseite, die anzeigt, was in Ihrem Terminal installiert ist
-– Die Befehlspalette wird jetzt sowohl in Ihrer Muttersprache als auch auf Englisch angezeigt
-– Neue VT-Features wie synchronisiertes Rendering, neue Farbschemas, Konfiguration für schnelle Mausaktionen wie Zoomen und mehr
+– Wir haben umgeschrieben, wie Konsolenanwendungen im Terminal gehostet werden! Melden Sie alle auftretenden Fehler.
+– Terminal unterstützt jetzt Sixels!
+– Sie können jetzt einen angedockten Bereich öffnen, der Ausschnitte von Befehlen enthält, die Sie gespeichert haben, um sie später zu verwenden.
+– Für Benutzer der Eingabeaufforderung der neuesten Version von Windows 11 wird möglicherweise ein QuickInfo-Symbol angezeigt, das installierbare Software von WinGet vorschlägt.
+– Ausgewählter Text wird jetzt viel sichtbarer (und anpassbarer!).
+- Eine Reihe von Zuverlässigkeitsfehlern, Benutzerfreundlichkeitsproblemen und Ärgernissen wurden behoben.

 Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/en-US/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/en-US/PDP.xml
@@ -56,9 +56,9 @@ This is an open source project and we welcome community participation. To partic
  <ReleaseNotes _locID="App_ReleaseNotes">
    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Version __VERSION_NUMBER__

- A whole new Extensions page that shows what has been installed into your Terminal
- Command Palette now shows up in your native language as well as English
- New VT features such as synchronized rendering, new color schemes, configuration for quick mouse actions like zooming, and more
+- We've added dozens of settings to the UI that once only existed in the JSON file, including a new page for customizing the layout of your New Tab menu!
+- We have rearchitected window management to improve reliability; please file any bugs you encounter with the wt.exe alias
+- Profiles now show an icon if they've been hidden or refer to programs which were uninstalled.

 Please see our GitHub releases page for additional details.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/es-ES/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/es-ES/PDP.xml
@@ -56,9 +56,12 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
  <ReleaseNotes>
    Versión __VERSION_NUMBER__

- Página Extensiones completamente nueva que muestra lo que se ha instalado en tu terminal
- La paleta de comandos ahora se muestra en tu idioma nativo, así como en inglés
- Nuevas características de VT, como la representación sincronizada, nuevos esquemas de color, configuración para acciones rápidas del ratón, como el zoom, y más
+- Hemos reescrito cómo se hospedan las aplicaciones de consola en Terminal. Informe de los errores que encuentre.
+- Terminal ahora admite síxeles.
+- Ahora puede abrir un panel acoplado que contenga fragmentos de comandos que haya guardado para usarlos más adelante
+- Los usuarios del símbolo del sistema de la versión más reciente de Windows 11 pueden ver un icono de "sugerencia rápida" que sugiere software instalable de WinGet
+- El texto seleccionado ahora será mucho más visible (y personalizable)
+- Se han corregido varios errores de fiabilidad, problemas de comodidad y molestias.

 Consulte la página de versiones de GitHub para más información.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/fr-FR/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/fr-FR/PDP.xml
@@ -56,11 +56,14 @@ Il s’agit d’un projet open source et nous encourageons la participation à l
  <ReleaseNotes>
    Version __VERSION_NUMBER__

- Une toute nouvelle page Extensions qui affiche ce qui a été installé dans votre Terminal
- La palette de commandes s’affiche désormais dans votre langue native, ainsi qu’en anglais
- De nouvelles fonctionnalités VT, telles que le rendu synchronisé, de nouveaux schémas de couleurs, une configuration pour des actions rapides de la souris comme le zoom, et bien plus encore
+– Nous avons réécrit la manière dont les applications de console sont hébergées dans Terminal ! Veuillez signaler tout bogue que vous rencontrez.
+– Terminal prend désormais en charge Sixels !
+– Vous pouvez maintenant ouvrir un panneau ancré contenant des extraits de commandes que vous avez enregistrées pour les utiliser ultérieurement
+– Les utilisateurs de l’invite de commande sur la dernière version de Windows 11 peuvent voir une icône « astuce rapide » qui suggère un logiciel installable à partir de WinGet
+– Le texte sélectionné sera désormais beaucoup plus visible (et personnalisable !)
+– Un certain nombre de bogues de fiabilité, de problèmes de commodité et de désagréments ont été corrigés.

-Consultez notre page des versions de GitHub pour plus de détails.
+Veuillez consulter notre page des versions GitHub pour découvrir d’autres détails.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/it-IT/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/it-IT/PDP.xml
@@ -56,9 +56,12 @@ Si tratta di un progetto open source e la partecipazione della community è molt
  <ReleaseNotes>
    Versione __VERSION_NUMBER__

- Una pagina Estensioni completamente nuova che mostra ciò che è stato installato nel terminale
- Il riquadro comandi ora viene visualizzato nella tua lingua di origine oltre che in inglese
- Nuove funzionalità VT come il rendering sincronizzato, le nuove combinazioni di colori, la configurazione per azioni rapide del mouse come lo zoom e altro ancora
+- Abbiamo cambiato il modo in cui le applicazioni della console vengono ospitate all’interno di Terminale. Segnala eventuali bug riscontrati.
+- Ora Terminale supporta i Sixel.
+- Puoi aprire un pannello ancorato contenente frammenti di comandi salvati per usarli in seguito
+- Gli utenti che usano il prompt dei comandi nella versione più recente di Windows 11 potrebbero visualizzare un’icona di “suggerimento rapido” che consiglia il software installabile da WinGet
+- Il testo selezionato sarà ora molto più visibile, oltre che personalizzabile.
+- Sono stati risolti diversi bug di affidabilità e problemi di ordine pratico.

 Per altri dettagli, vedi la pagina delle release di GitHub.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/ja-JP/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/ja-JP/PDP.xml
@@ -56,9 +56,12 @@
  <ReleaseNotes>
    バージョン __VERSION_NUMBER__

- お使いのターミナルに何がインストールされているかを表示する新しい [拡張機能] ページ
- コマンド パレットがネイティブ言語と英語で表示されるようになりました
- 同期レンダリング、新しい配色、ズームなどのクイック マウス操作の構成などの、新しい VT 機能
+- ターミナル内でのコンソール アプリケーションのホスト方法を書き換えました。発生したバグを報告してください。
+- ターミナルで Sixels がサポートされるようになりました。
+- 後で使用するために保存したコマンドのスニペットを含むドッキング パネルを開けるようになりました
+- 最新の Windows 11 リリースのコマンド プロンプト ユーザーには、WinGet からインストール可能なソフトウェアを提案する "クイック ヒント" アイコンが表示される場合があります
+- 選択したテキストが大幅に見やすくなりました (カスタマイズも可能です)
+- 信頼性に関するバグ、利便性の問題、不快な問題の多くが修正されました。

 詳細については、GitHub リリース ページをご覧ください。
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/ko-KR/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/ko-KR/PDP.xml
@@ -56,11 +56,14 @@
  <ReleaseNotes>
    버전 __VERSION_NUMBER__

- 터미널에 설치된 항목을 보여 주는 완전히 새로운 확장 페이지
- 이제 영어뿐만 아니라 모국어로도 표시되는 명령 팔레트
- 동기화된 렌더링, 새로운 색 구성표, 확대/축소와 같은 빠른 마우스 동작을 위한 구성 등 새로운 VT 기능 추가
+- 콘솔 애플리케이션이 터미널 내에서 호스팅되는 방법을 다시 작성했습니다. 버그가 발생하면 보고해 주세요.
+- 터미널에서 이제 Sixels를 지원합니다.
+- 이제 나중에 사용하기 위해 저장한 명령 조각이 포함된 도킹된 패널을 열 수 있습니다.
+- 최신 Windows 11 릴리스의 명령 프롬프트 사용자는 WinGet에서 설치 가능한 소프트웨어를 추천하는 "간단한 팁" 아이콘을 볼 수 있습니다.
+- 이제 선택한 텍스트가 훨씬 더 잘 보입니다(사용자 지정 가능).
+- 여러 안정성 버그, 편의성 문제, 불편 사항이 수정되었습니다.

-자세한 정보는 GitHub 릴리스 페이지를 참고하세요.
+자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/pt-BR/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/pt-BR/PDP.xml
@@ -54,11 +54,14 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
    
  </DevStudio>
  <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    Versão __VERSION_NUMBER__

-– Uma nova página de Extensões que mostra o que foi instalado no seu Terminal
-– A Paleta de Comandos agora aparece no seu idioma nativo, além do inglês
-– Novos recursos da VT, como renderização sincronizada, novos esquemas de cores, configuração para ações rápidas do mouse, como zoom, e muito mais
+– Reescrevemos a forma como os aplicativos de console são hospedados no Terminal! Relate os bugs encontrados.
+– O terminal agora oferece suporte ao Sixels!
+– Agora você pode abrir um painel acoplado contendo snippets de comandos que você salvou para usar mais tarde
+– Os usuários do Prompt de Comando na versão mais recente do Windows 11 podem ver um ícone de "dica rápida", que sugere softwares instaláveis a partir do WinGet
+– O texto selecionado agora ficará muito mais visível (e personalizável!)
+– Vários bugs de confiabilidade, problemas de conveniência e incômodos foram resolvidos.

 Confira nossa página de lançamentos no GitHub para obter mais detalhes.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml
@@ -56,11 +56,14 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
+- Ţëямΐŉαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
+- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
+- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!

-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml
@@ -56,11 +56,14 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
+- Ţëямΐŉαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
+- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
+- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!

-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml
@@ -56,11 +56,14 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
+- Ţëямΐŉαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
+- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
+- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!

-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/ru-RU/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/ru-RU/PDP.xml
@@ -56,9 +56,12 @@
  <ReleaseNotes>
    Версия __VERSION_NUMBER__

-– Новая страница расширений, на которой отображается информация о том, что было установлено в вашем терминале
-– Палитра команд теперь доступна на вашем языке, а также на английском
-– Новые функции VT, например синхронизированная отрисовка, новые цветовые схемы, настройка быстрых действий мыши, таких как масштабирование, и т. д.
+– Мы переписали, как консольные приложения размещаются внутри Терминала! Сообщайте о любых ошибках, с которыми вы столкнулись.
+– Терминал теперь поддерживает форматы Sixel!
+– Теперь вы можете открыть закрепленную панель, содержащую фрагменты команд, которые вы сохранили для использования в дальнейшем
+– Пользователи командной строки в новейшем выпуске Windows 11 могут увидеть значок "краткой подсказки", который предлагает устанавливаемые программы из WinGet
+– Выделенный текст теперь станет более видимым (и настраиваемым!)
+– Исправлено несколько ошибок надежности, проблем с удобством, а также устранены раздражающие моменты.

 Дополнительные сведения см. на странице выпусков GitHub.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/sr-Cyrl-RS/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/sr-Cyrl-RS/PDP.xml
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProductDescription language="sr-cyrl-rs" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
-  <AppStoreName _locID="App_AppStoreName">
-    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
-    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
-    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
-    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
-    <!-- Windows Terminal -->
-  </AppStoreName>
-  <Keywords>
-    <!-- Valid length: 30 character limit, up to 7 elements -->
-    <Keyword _locID="App_keyword1">
-      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Терминал</Keyword>
-    <Keyword _locID="App_keyword2">
-      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->Конзола</Keyword>
-    <Keyword _locID="App_keyword3">
-      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->
-    </Keyword>
-    <Keyword _locID="App_keyword4">
-      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->
-    </Keyword>
-    <Keyword _locID="App_keyword5">
-      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->
-    </Keyword>
-    <Keyword _locID="App_keyword6">
-      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->
-    </Keyword>
-    <Keyword _locID="App_keyword7">
-      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->
-    </Keyword>
-  </Keywords>
-  <Description _locID="App_Description">
-    <!-- _locComment_text="{MaxLength=10000} App Description" -->Windows терминал је модерна, брза, ефикасна, моћна и продуктивна апликација терминала за кориснике алата из командне линије и љуски као што су Command Prompt, PowerShell, и WSL. Неке од његових главних функционалности су вишеструке картице, панели, подршка за Уникод и UTF-8, GPU убрзани механизам за исцртавање текста, произвољне теме, стилови и конфигурације.
-
-Ово је пројекат отвореног кода и учешће заједнице је добродошло. Ако желите да учествујете, молимо вас да посетите https://github.com/microsoft/terminal </Description>
-  <ShortDescription _locID="App_ShortDescription">
-    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
-    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
-  </ShortDescription>
-  <ShortTitle _locID="App_ShortTitle">
-    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
-    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
-  </ShortTitle>
-  <SortTitle _locID="App_SortTitle">
-    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
-    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
-  </SortTitle>
-  <VoiceTitle _locID="App_VoiceTitle">
-    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
-    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
-  </VoiceTitle>
-  <DevStudio _locID="App_DevStudio">
-    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
-    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
-  </DevStudio>
-  <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Верзија __VERSION_NUMBER__
-
- Попуно нова страница Проширења која приказује шта је све инсталирано у ваш Терминал
- Палета команди се сада приказује и на вашем матерњем језику, као и на енглеском
- Нове VT функционалности као што су синхронизовано исцртавање, нове шеме боја, конфигурација за брзе акције мишем, као што је зумирање, и још тога
-
-За више детаља, молимо вас да посетите нашу GitHub страницу издања.
-  </ReleaseNotes>
-  <ScreenshotCaptions>
-    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
-    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
-    <Caption DesktopImage="acrylic-emoji.png" _locID="App_caption1">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 1" -->
-    </Caption>
-    <Caption DesktopImage="panes.png" _locID="App_caption2">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 2" -->
-    </Caption>
-    <Caption DesktopImage="htop.png" _locID="App_caption3">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 3" -->
-    </Caption>
-  </ScreenshotCaptions>
-  <AdditionalAssets>
-    <!-- Valid elements:-->
-    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
-    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
-    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
-    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
-    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
-    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
-    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
-    <PosterArt FileName="Store Poster Art.png" />
-    <BoxArt FileName="Store Box Art.png" />
-    <PromotionalArt16x9 FileName="Store Thumbnail.png" />
-  </AdditionalAssets>
-  <Trailers>
-    <!-- Maximum number of trailers permitted: 15 -->
-    <Trailer FileName="CC0605_CommandLine_Teaser_WEB_MASTER_H264_1080p_23.976_-16LKFS_-3dbTP_ST.mp4">
-      <Title _locID="App_trailerTitle1">
-        <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->Нови Windows терминал</Title>
-      <Images>
-        <!-- Current maximum of 1 image per trailer permitted. -->
-        <Image FileName="Store Thumbnail.png">
-          <!-- _locComment_text="{Locked} Trailer screenshot 1 description" -->
-        </Image>
-      </Images>
-    </Trailer>
-  </Trailers>
-  <AppFeatures>
-    <!-- Valid length: 200 character limit, up to 20 elements -->
-    <AppFeature _locID="App_feature1">
-      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Вишеструке картице</AppFeature>
-    <AppFeature _locID="App_feature2">
-      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Пуна Уникод подршка</AppFeature>
-    <AppFeature _locID="App_feature3">
-      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->GPU-убрзано исцртавање текста</AppFeature>
-    <AppFeature _locID="App_feature4">
-      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->Потпуна прилагодљивост</AppFeature>
-    <AppFeature _locID="App_feature5">
-      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->Подела панела</AppFeature>
-    <AppFeature _locID="App_feature6">
-      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature7">
-      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature8">
-      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature9">
-      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature10">
-      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature11">
-      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature12">
-      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature13">
-      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature14">
-      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature15">
-      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature16">
-      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature17">
-      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature18">
-      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature19">
-      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature20">
-      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
-    </AppFeature>
-  </AppFeatures>
-  <RecommendedHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-    <Recommendation _locID="App_RecommendedHW1">
-      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->Тастатура</Recommendation>
-  </RecommendedHardware>
-  <MinimumHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-  </MinimumHardware>
-  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
-    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Copyright (c) Microsoft Corporation</CopyrightAndTrademark>
-  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
-    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
-  </AdditionalLicenseTerms>
-  <WebsiteURL _locID="App_WebsiteURL">
-    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/microsoft/terminal</WebsiteURL>
-  <SupportContactInfo _locID="App_SupportContactInfo">
-    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/microsoft/terminal/issues/new</SupportContactInfo>
-  <PrivacyPolicyURL _locID="App_PrivacyURL">
-    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
-</ProductDescription>
--- a/build/StoreSubmission/Stable/PDPs/uk-UA/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/uk-UA/PDP.xml
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProductDescription language="en-us" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
-  <AppStoreName _locID="App_AppStoreName">
-    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
-    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
-    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
-    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
-    <!-- Windows Terminal -->
-  </AppStoreName>
-  <Keywords>
-    <!-- Valid length: 30 character limit, up to 7 elements -->
-    <Keyword _locID="App_keyword1">
-      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Термінал</Keyword>
-    <Keyword _locID="App_keyword2">
-      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->Консоль</Keyword>
-    <Keyword _locID="App_keyword3">
-      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->
-    </Keyword>
-    <Keyword _locID="App_keyword4">
-      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->
-    </Keyword>
-    <Keyword _locID="App_keyword5">
-      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->
-    </Keyword>
-    <Keyword _locID="App_keyword6">
-      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->
-    </Keyword>
-    <Keyword _locID="App_keyword7">
-      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->
-    </Keyword>
-  </Keywords>
-  <Description _locID="App_Description">
-      <!-- _locComment_text="{MaxLength=10000} {Locked=Windows} App Description" -->Термінал Windows - це сучасний, швидкий, ефективний, потужний та продуктивний термінальний застосунок для користувачів інструментів командного рядка та оболонок, таких як командний рядок, PowerShell та WSL. Його основні функції включають кілька вкладок, панелей, підтримку символів Unicode та UTF-8, механізм візуалізації тексту з прискоренням GPU, а також користувацькі теми, стилі та конфігурації.
-
-Це проєкт з відкритим кодом, і ми вітаємо участь спільноти. Щоб взяти участь, будь ласка, відвідайте https://github.com/microsoft/terminal </Description>
-  <ShortDescription _locID="App_ShortDescription">
-    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
-    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
-  </ShortDescription>
-  <ShortTitle _locID="App_ShortTitle">
-    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
-    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
-  </ShortTitle>
-  <SortTitle _locID="App_SortTitle">
-    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
-    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
-  </SortTitle>
-  <VoiceTitle _locID="App_VoiceTitle">
-    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
-    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
-  </VoiceTitle>
-  <DevStudio _locID="App_DevStudio">
-    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
-    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
-  </DevStudio>
-  <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Версія __VERSION_NUMBER__
-
- Цілком нова сторінка розширень, яка показує, що було встановлено у вашому Терміналі
- Палітра команд тепер відображається вашою рідною мовою, так само, як і англійською
- Нові VT функції, такі як синхронізований рендеринг, нові колірні схеми, налаштування для швидких дій миші, таких як масштабування, тощо
-
-Будь ласка, перегляньте нашу сторінку релізів GitHub для отримання додаткової інформації.
-  </ReleaseNotes>
-  <ScreenshotCaptions>
-    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
-    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
-    <Caption DesktopImage="acrylic-emoji.png" _locID="App_caption1">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 1" -->
-    </Caption>
-    <Caption DesktopImage="panes.png" _locID="App_caption2">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 2" -->
-    </Caption>
-    <Caption DesktopImage="htop.png" _locID="App_caption3">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 3" -->
-    </Caption>
-  </ScreenshotCaptions>
-  <AdditionalAssets>
-    <!-- Valid elements:-->
-    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
-    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
-    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
-    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
-    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
-    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
-    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
-    <PosterArt FileName="Store Poster Art.png" />
-    <BoxArt FileName="Store Box Art.png" />
-    <PromotionalArt16x9 FileName="Store Thumbnail.png" />
-  </AdditionalAssets>
-  <Trailers>
-    <!-- Maximum number of trailers permitted: 15 -->
-    <Trailer FileName="CC0605_CommandLine_Teaser_WEB_MASTER_H264_1080p_23.976_-16LKFS_-3dbTP_ST.mp4">
-      <Title _locID="App_trailerTitle1">
-        <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->Новий термінал Windows</Title>
-      <Images>
-        <!-- Current maximum of 1 image per trailer permitted. -->
-        <Image FileName="Store Thumbnail.png">
-          <!-- _locComment_text="{Locked} Trailer screenshot 1 description" -->
-        </Image>
-      </Images>
-    </Trailer>
-  </Trailers>
-  <AppFeatures>
-    <!-- Valid length: 200 character limit, up to 20 elements -->
-    <AppFeature _locID="App_feature1">
-      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Наявність вкладок</AppFeature>
-    <AppFeature _locID="App_feature2">
-      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Повна підтримка Юнікоду</AppFeature>
-    <AppFeature _locID="App_feature3">
-      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->Рендеринг тексту з прискоренням GPU</AppFeature>
-    <AppFeature _locID="App_feature4">
-      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->Широкі можливості кастомізації</AppFeature>
-    <AppFeature _locID="App_feature5">
-      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->Розділення панелей</AppFeature>
-    <AppFeature _locID="App_feature6">
-      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature7">
-      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature8">
-      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature9">
-      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature10">
-      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature11">
-      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature12">
-      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature13">
-      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature14">
-      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature15">
-      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature16">
-      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature17">
-      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature18">
-      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature19">
-      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature20">
-      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
-    </AppFeature>
-  </AppFeatures>
-  <RecommendedHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-    <Recommendation _locID="App_RecommendedHW1">
-      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->Клавіатура</Recommendation>
-  </RecommendedHardware>
-  <MinimumHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-  </MinimumHardware>
-  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
-    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Права (c) Корпорація Майкрософт</CopyrightAndTrademark>
-  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
-    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
-  </AdditionalLicenseTerms>
-  <WebsiteURL _locID="App_WebsiteURL">
-    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/microsoft/terminal</WebsiteURL>
-  <SupportContactInfo _locID="App_SupportContactInfo">
-    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/microsoft/terminal/issues/new</SupportContactInfo>
-  <PrivacyPolicyURL _locID="App_PrivacyURL">
-    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
-</ProductDescription>
--- a/build/StoreSubmission/Stable/PDPs/zh-CN/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/zh-CN/PDP.xml
@@ -56,9 +56,12 @@
  <ReleaseNotes>
    Version __VERSION_NUMBER__

- 一个全新的“扩展”页，显示已安装到终端的内容
- 命令面板现在以你的母语和英语显示
- 新的 VT 功能，例如同步渲染、新配色方案、快速鼠标操作(如缩放)的配置等
+- 我们已改变主机应用程序在终端内的托管方式!请报告遇到的任何 bug。
+- 终端现在支持 Sixels!
+- 现在可以打开一个停靠面板，其中包含已保存供以后使用的命令片段
+- 最新 Windows 11 版本上的命令提示用户可能会看到“快速提示”图标，该图标建议从 WinGet 安装软件
+- 所选文本现在将具有更高的可见性(和可自定义性!)
+- 修复了许多可靠性 bug、便利性问题和令人烦恼的问题。

 有关其他详细信息，请参阅我们的 GitHub 发布页面。
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/zh-TW/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/zh-TW/PDP.xml
@@ -54,13 +54,16 @@
    
  </DevStudio>
  <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    版本 __VERSION_NUMBER__

- 全新的延伸模組頁面會顯示已安裝在您終端機中的內容
- 命令選擇區現在以您的母語和英文顯示
- 新的 VT 功能，例如同步轉譯、新的色彩配置、快速滑鼠動作 (例如縮放) 設定等等
+- 我們已重寫主機應用程式在終端機內託管的方式!請報告您遇到的錯誤。
+- 終端機現在支援 Sixels!
+- 現在，您可以開啟包含已儲存命令程式碼片段的固定面板，以供稍後使用
+- 最新 Windows 11 版本中的 [命令提示] 使用者可能會看到「快速提示」圖示，建議可自 WinGet 安裝的軟體
+- 選取的文字現在會更明顯 (且可自訂!)
+- 已修正一些可靠性錯誤、便利性問題和令人困擾的問題。

-如需更多詳細資料，請參閱我們的 GitHub 發行版本頁面。
+如需更多詳細資訊，請參閱我們的 GitHub 發行頁面。
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/packages.config
+++ b/build/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Taef" version="10.100.251104001" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.93.240607003" targetFramework="native" />
  <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
  <package id="Microsoft.Debugging.Tools.PdbStr" version="20220617.1556.0" targetFramework="native" />
  <package id="Microsoft.Debugging.Tools.SrcTool" version="20220617.1556.0" targetFramework="native" />
--- a/build/pgo/Terminal.PGO.props
+++ b/build/pgo/Terminal.PGO.props
@@ -9,7 +9,7 @@

  <PropertyGroup>
    <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>main</PGOBranch>
+    <PGOBranch>release-1.24</PGOBranch>

    <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
    <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>
--- a/build/pipelines/ci.yml
+++ b/build/pipelines/ci.yml
@@ -87,13 +87,6 @@ stages:
            buildConfigurations: [Release]
            buildEverything: true
            keepAllExpensiveBuildOutputs: false
-            ${{ if eq(parameters.runTests, true) }}:
-              # Copy the appx files into the bin drop because the LocalTests need them
-              afterBuildSteps:
-                - pwsh: |-
-                    $deps = ./build/scripts/Get-DependenciesFromAppxRecipe.ps1 -Path "$(Terminal.BinDir)/TestHostApp/TestHostApp.build.appxrecipe"
-                    $dir = New-Item -Type Directory "$(Terminal.BinDir)/_testDeps"
-                    $deps | Copy-Item -Destination $dir -Verbose

    - ${{ if eq(parameters.runTests, true) }}:
      - stage: Test_${{ platform }}
--- a/build/pipelines/daily-loc-submission.yml
+++ b/build/pipelines/daily-loc-submission.yml
@@ -23,7 +23,7 @@ parameters:
    default: true

 pool:
-  vmImage: windows-latest
+  vmImage: windows-2019

 resources:
  repositories:
@@ -51,8 +51,8 @@ steps:
  displayName: 'Touchdown Build - 7105, PRODEXT'
  inputs:
    teamId: 7105
-    FederatedIdentityTDBuildServiceConnection: $(TouchdownServiceConnection)
-    authType: FederatedIdentityTDBuild
+    TDBuildServiceConnection: $(TouchdownServiceConnection)
+    authType: SubjectNameIssuer
    resourceFilePath: |
     **\en-US\*.resw
     build\StoreSubmission\Stable\PDPs\en-us\PDP.xml
--- a/build/pipelines/feature-flag-ci.yml
+++ b/build/pipelines/feature-flag-ci.yml
@@ -31,7 +31,7 @@ stages:
        - template: ./templates-v2/job-build-project.yml
          parameters:
            pool: # This only runs in CI
-              name: SHINE-OSS-L
+                name: SHINE-OSS-L
            buildPlatforms: [x64]
            buildConfigurations: [Release]
            buildEverything: true
--- a/build/pipelines/ob-nightly.yml
+++ b/build/pipelines/ob-nightly.yml
@@ -28,7 +28,7 @@ extends:
    official: true
    branding: Canary
    buildTerminal: true
-    pgoBuildMode: Optimize
+    pgoBuildMode: None # BODGY - OneBranch is on VS 17.10, which is known to be the worst
    codeSign: true
    signingIdentity:
      serviceName: $(SigningServiceName)
--- a/build/pipelines/pgo.yml
+++ b/build/pipelines/pgo.yml
@@ -75,7 +75,7 @@ stages:
        parameters:
          jobName: MergePGD
          pool:
-            vmImage: 'windows-latest'
+            vmImage: 'windows-2022'
          buildConfiguration: Release
          buildPlatforms: ${{ parameters.buildPlatforms }}
          artifactStem: -instrumentation
@@ -83,7 +83,7 @@ stages:
      - template: ./templates-v2/job-pgo-build-nuget-and-publish.yml
        parameters:
          pool:
-            vmImage: 'windows-latest'
+            vmImage: 'windows-2022'
          dependsOn: MergePGD
          buildConfiguration: Release
          artifactStem: -instrumentation
--- a/build/pipelines/templates-v2/job-build-package-wpf.yml
+++ b/build/pipelines/templates-v2/job-build-package-wpf.yml
@@ -46,7 +46,6 @@ jobs:
          BuildConfiguration: ${{ config }}
  dependsOn: ${{ parameters.dependsOn }}
  variables:
-    BuildPlatform: Any CPU
    OutputBuildPlatform: AnyCPU
    Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
    JobOutputDirectory: $(Build.ArtifactStagingDirectory)\nupkg
@@ -76,9 +75,9 @@ jobs:
  - template: .\steps-restore-nuget.yml

  - task: VSBuild@1
-    displayName: Build solution OpenConsole.slnx for WPF Control (Pack)
+    displayName: Build solution OpenConsole.sln for WPF Control (Pack)
    inputs:
-      solution: 'OpenConsole.slnx'
+      solution: 'OpenConsole.sln'
      msbuildArgs: >-
        /p:WindowsTerminalReleaseBuild=true;Version=$(XES_PACKAGEVERSIONNUMBER)
        /p:NoBuild=true
--- a/build/pipelines/templates-v2/job-build-project.yml
+++ b/build/pipelines/templates-v2/job-build-project.yml
@@ -71,9 +71,6 @@ parameters:
  - name: enableCaching
    type: boolean
    default: false
-  - name: afterBuildSteps
-    type: stepList
-    default: []

 jobs:
 - job: ${{ parameters.jobName }}
@@ -133,11 +130,11 @@ jobs:
          $SignFragments += "wpfdotnet"
        }
        If ([bool]::Parse("${{ parameters.buildWPF }}")) {
-          $BuildTargets += "Terminal\Control\TerminalControl"
+          $BuildTargets += "Terminal\Control\Microsoft_Terminal_Control"
          $SignFragments += "wpf"
        }
        If ([bool]::Parse("${{ parameters.buildConPTY }}")) {
-          $BuildTargets += "Conhost\Host_EXE;Conhost\winconptydll"
+          $BuildTargets += "Conhost\Host_EXE;Conhost\winconpty_DLL"
          $SignFragments += "conpty"
        }
        Write-Host "Targets: $($BuildTargets -Join ";")"
@@ -173,9 +170,9 @@ jobs:
  - ${{ parameters.beforeBuildSteps }}

  - task: VSBuild@1
-    displayName: Build OpenConsole.slnx
+    displayName: Build OpenConsole.sln
    inputs:
-      solution: 'OpenConsole.slnx'
+      solution: 'OpenConsole.sln'
      msbuildArgs: >-
        /p:WindowsTerminalOfficialBuild=true;WindowsTerminalBranding=${{ parameters.branding }};PGOBuildMode=${{ parameters.pgoBuildMode }}
        ${{ parameters.additionalBuildOptions }}
@@ -213,8 +210,6 @@ jobs:
          contents: $(Build.SourcesDirectory)/MSBuildCacheLogs/**
          TargetFolder: $(Terminal.BinDir)/MSBuildCacheLogs

-  - ${{ parameters.afterBuildSteps }}
-
  # This saves ~2GiB per architecture. We won't need these later.
  # Removes:
  # - All .lib that do not have an associated .exp (which would indicate that they are import libs)
--- a/build/pipelines/templates-v2/job-check-code-format.yml
+++ b/build/pipelines/templates-v2/job-check-code-format.yml
@@ -1,7 +1,7 @@
 jobs:
 - job: CodeFormatCheck
  displayName: Check Code Format
-  pool: { vmImage: windows-latest }
+  pool: { vmImage: windows-2022 }

  steps:
  - checkout: self
--- a/build/pipelines/templates-v2/job-test-project.yml
+++ b/build/pipelines/templates-v2/job-test-project.yml
@@ -58,24 +58,6 @@ jobs:
        filePath: build\scripts\Run-Tests.ps1
        arguments: -MatchPattern '*feature.test*.dll' -Platform '$(OutputBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(Terminal.BinDir)"

-    # Load-bearing: This needs to be Windows PowerShell, not pwsh, due to Add-AppxPackage not working in pwsh.
-    - powershell: |-
-        $deps = Get-ChildItem -Recurse "$(Terminal.BinDir)/_testDeps"
-        $deps | % {
-          Write-Host "Installing $($_.FullName)..."
-          Add-AppxPackage -Path $_.FullName -ErrorAction:Ignore
-        }
-      displayName: 'Install LocalTest Dependencies'
-
-    - task: PowerShell@2
-      displayName: 'Run Local Tests'
-      inputs:
-        pwsh: true
-        targetType: filePath
-        filePath: build\scripts\Run-Tests.ps1
-        arguments: -MatchPattern '*LocalTests*.dll' -Platform '$(OutputBuildPlatform)' -Configuration '$(BuildConfiguration)' -LogPath '${{ parameters.testLogPath }}' -Root "$(Terminal.BinDir)"
-      condition: and(succeeded(), ne(variables['PGOBuildMode'], 'Instrument'))
-
  - task: PowerShell@2
    displayName: 'Convert Test Logs from WTL to xUnit format'
    condition: always()
--- a/build/pipelines/templates-v2/steps-restore-nuget.yml
+++ b/build/pipelines/templates-v2/steps-restore-nuget.yml
@@ -19,16 +19,14 @@ steps:
    restoreSolution: build/packages.config
    restoreDirectory: '$(Build.SourcesDirectory)\packages'

- task: VSBuild@1
+- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
  displayName: Restore NuGet packages for solution
  inputs:
-    solution: 'OpenConsole.slnx'
-    msbuildArgs: /t:Restore
-    platform: $(BuildPlatform)
-    configuration: $(BuildConfiguration)
-    msbuildArchitecture: x64
-  env:
-    SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+    command: restore
+    feedsToUse: config
+    configPath: NuGet.config
+    restoreSolution: OpenConsole.sln
+    restoreDirectory: '$(Build.SourcesDirectory)\packages'

 - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
  displayName: Restore NuGet packages for global nuget
--- a/build/scripts/Get-DependenciesFromAppxRecipe.ps1
+++ b/build/scripts/Get-DependenciesFromAppxRecipe.ps1
@@ -1,17 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory=$true, ValueFromPipeline=$true,
-      HelpMessage="Path to the .appxrecipe to parse")]
-    [string]
-    $Path
-)
-
-$Recipe = [xml](Get-Content $Path)
-$ResolvedSDKReferences = $Recipe.Project.ItemGroup.ResolvedSDKReference
-
-$ResolvedSDKReferences |
-    Where-Object Architecture -eq $Recipe.Project.PropertyGroup.PackageArchitecture |
-    ForEach-Object {
-        $l = [Uri]::UnescapeDataString($_.AppxLocation)
-        Get-Item $l
-    }
--- a/consolegit2gitfilters.json
+++ b/consolegit2gitfilters.json
@@ -26,12 +26,7 @@
    "/doc/user-docs/",
    "/src/tools/ansi-color/",
    "/src/tools/ColorTool/",
-    "/src/tools/scratch/",
-    "/src/tools/ConsoleBench/",
-    "/src/tools/schemes-fragment/",
    "/scratch/",
-    "/tools/ReleaseEngineering/",
-    "/policies/",
    "Scratch.sln",
  ],
  "SuffixFilters": [
@@ -49,11 +44,6 @@
    ".rec",
    ".err",
    "XamlStyler.json",
-    ".xlsx",
-    ".vcxproj",
-    ".vcxproj.filters",
-    ".Build.props",
-    ".Build.targets",
-    "OpenConsole.slnx"
+    ".xlsx"
  ]
 }
--- a/custom.props
+++ b/custom.props
@@ -3,9 +3,9 @@
  <!-- This file is read by XES, which we use in our Release builds. -->
  <PropertyGroup Label="Version">
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
-    <XesBaseYearForStoreVersion>2026</XesBaseYearForStoreVersion>
+    <XesBaseYearForStoreVersion>2025</XesBaseYearForStoreVersion>
    <VersionMajor>1</VersionMajor>
-    <VersionMinor>26</VersionMinor>
+    <VersionMinor>24</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
    <VersionInfoCulture>1033</VersionInfoCulture>
    <!-- The default has a spacing problem -->
--- a/dep/Console/ntcsrdll.h
+++ b/dep/Console/ntcsrdll.h
@@ -7,17 +7,9 @@ Licensed under the MIT license.

 #include <ntcsrmsg.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 NTSTATUS CsrClientCallServer(
    PCSR_API_MSG m,
    PCSR_CAPTURE_HEADER CaptureBuffer OPTIONAL,
    ULONG ApiNumber,
    ULONG ArgLength
 );
-
-#ifdef __cplusplus
-}
-#endif
--- a/dep/Console/ntlpcapi.h
+++ b/dep/Console/ntlpcapi.h
@@ -5,10 +5,6 @@ Licensed under the MIT license.

 #pragma once

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define OB_FILE_OBJECT_TYPE 1

 typedef struct _PORT_MESSAGE {
@@ -128,7 +124,3 @@ NTSTATUS NtAlpcQueryInformationMessage(
    ULONG Length,
    PULONG ReturnLength
 );
-
-#ifdef __cplusplus
-}
-#endif
--- a/dep/nuget/packages.config
+++ b/dep/nuget/packages.config
@@ -3,13 +3,13 @@
 <packages>
  <!-- Native packages -->
  <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
-  <package id="Microsoft.Taef" version="10.100.251104001" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.93.240607003" targetFramework="native" />
  <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
  <package id="Microsoft.Internal.Windows.Terminal.ThemeHelpers" version="0.8.250811004" targetFramework="native" />
  <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="2.3.2262" targetFramework="native" developmentDependency="true" />
  <package id="Microsoft.UI.Xaml" version="2.8.4" targetFramework="native" />
  <package id="Microsoft.Web.WebView2" version="1.0.1661.34" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.250325.1" targetFramework="native" developmentDependency="true" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.240122.1" targetFramework="native" developmentDependency="true" />
  <package id="Microsoft.WindowsPackageManager.ComInterop" version="1.8.1911" targetFramework="native" developmentDependency="true" />

  <!-- Managed packages -->
--- a/dep/vcpkg-overlay-ports/fmt/0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
+++ b/dep/vcpkg-overlay-ports/fmt/0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
@@ -1,45 +0,0 @@
-From c3be070b7ee42639554555c27dce10c9de7af76c Mon Sep 17 00:00:00 2001
-From: "J. Berger" <mail@janaberger.de>
-Date: Sat, 1 Nov 2025 17:38:30 +0100
-Subject: [PATCH] When using MSVC x86 to compile v12.0.0 or v12.1.0,
- conversions from __int64 to a 32bit unsigned int trigger warnings. (#4594)
-
-This is a follow-up for PR #4572.
---
- include/fmt/format.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/fmt/format.h b/include/fmt/format.h
-index 4a653007..65e19d2d 100644
--- a/include/fmt/format.h
-+++ b/include/fmt/format.h
-@@ -2534,7 +2534,7 @@ FMT_CONSTEXPR20 auto write_fixed(OutputIt out, const DecimalFP& f,
-     auto grouping = Grouping(loc, specs.localized());
-     size += grouping.count_separators(exp);
-     return write_padded<Char, align::right>(
-        out, specs, to_unsigned(size), [&](iterator it) {
-+        out, specs, static_cast<size_t>(size), [&](iterator it) {
-           if (s != sign::none) *it++ = detail::getsign<Char>(s);
-           it = write_significand(it, f.significand, significand_size, exp,
-                                  decimal_point, grouping);
-@@ -2550,7 +2550,7 @@ FMT_CONSTEXPR20 auto write_fixed(OutputIt out, const DecimalFP& f,
-   bool pointy = num_zeros != 0 || significand_size != 0 || specs.alt();
-   size += 1 + (pointy ? 1 : 0) + num_zeros;
-   return write_padded<Char, align::right>(
-      out, specs, to_unsigned(size), [&](iterator it) {
-+      out, specs, static_cast<size_t>(size), [&](iterator it) {
-         if (s != sign::none) *it++ = detail::getsign<Char>(s);
-         *it++ = Char('0');
-         if (!pointy) return it;
-@@ -2594,7 +2594,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
-     *it++ = Char(exp_char);
-     return write_exponent<Char>(exp, it);
-   };
-  auto usize = to_unsigned(size);
-+  size_t usize = static_cast<size_t>(size);
-   return specs.width > 0
-              ? write_padded<Char, align::right>(out, specs, usize, write)
-              : base_iterator(out, write(reserve(out, usize)));
-- 
-2.52.0.vfs.0.5
-
--- a/dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch
+++ b/dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 88c12148..967b53dd 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -260,7 +260,7 @@ if (FMT_MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
+   join(netfxpath
+        "C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\"
+        ".NETFramework\\v4.0")
+-  file(WRITE run-msbuild.bat "
+  file(WRITE "${CMAKE_BINARY_DIR}/run-msbuild.bat" "
+     ${MSBUILD_SETUP}
+     ${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*")
+ endif ()
--- a/dep/vcpkg-overlay-ports/fmt/portfile.cmake
+++ b/dep/vcpkg-overlay-ports/fmt/portfile.cmake
@@ -2,10 +2,10 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO fmtlib/fmt
    REF "${VERSION}"
-    SHA512 f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2
+    SHA512 573b7de1bd224b7b1b60d44808a843db35d4bc4634f72a9edcb52cf68e99ca66c744fd5d5c97b4336ba70b94abdabac5fc253b245d0d5cd8bbe2a096bf941e39
    HEAD_REF master
    PATCHES
-        0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
+        fix-write-batch.patch
 )

 vcpkg_cmake_configure(
@@ -22,6 +22,13 @@ vcpkg_cmake_config_fixup()
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()

+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fmt/base.h"
+        "defined(FMT_SHARED)"
+        "1"
+    )
+endif()
+
 file(REMOVE_RECURSE
    "${CURRENT_PACKAGES_DIR}/debug/include"
    "${CURRENT_PACKAGES_DIR}/debug/share"
--- a/dep/vcpkg-overlay-ports/fmt/vcpkg.json
+++ b/dep/vcpkg-overlay-ports/fmt/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "fmt",
-  "version": "12.1.0",
+  "version": "11.1.4",
  "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.",
  "homepage": "https://github.com/fmtlib/fmt",
  "license": "MIT",
--- a/dep/vcpkg-overlay-ports/jsoncpp/0001-No-trailing-space-for-BuildStyledStreamWriter.patch
+++ b/dep/vcpkg-overlay-ports/jsoncpp/0001-No-trailing-space-for-BuildStyledStreamWriter.patch
@@ -1,57 +0,0 @@
-From fae5556fd4d4850f948aeabee25ddf0280494725 Mon Sep 17 00:00:00 2001
-From: lizz <lizz@sensetime.com>
-Date: Fri, 10 Apr 2020 23:02:21 +0800
-Subject: [PATCH] No trailing space for BuiltStyledStreamWriter
-
-Signed-off-by: lizz <lizz@sensetime.com>
---
- src/lib_json/json_writer.cpp | 10 +++++++++-
- src/test_lib_json/main.cpp   |  4 ++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
-index ee45c43..e22eb17 100644
--- a/src/lib_json/json_writer.cpp
-+++ b/src/lib_json/json_writer.cpp
-@@ -990,7 +990,15 @@ void BuiltStyledStreamWriter::writeValue(Value const& value) {
-         writeCommentBeforeValue(childValue);
-         writeWithIndent(
-             valueToQuotedStringN(name.data(), name.length(), emitUTF8_));
-        *sout_ << colonSymbol_;
-+        size_t n = colonSymbol_.size();
-+        if ((childValue.type() == objectValue && !childValue.empty()) ||
-+            (childValue.type() == arrayValue && !childValue.empty() &&
-+             ((cs_ == CommentStyle::All) || isMultilineArray(childValue)))) {
-+          // Line-ending colon, so trim any trailing space from it
-+          for (; n && colonSymbol_[n - 1] == ' '; --n)
-+            ;
-+        }
-+        sout_->write(colonSymbol_.data(), n);
-         writeValue(childValue);
-         if (++it == members.end()) {
-           writeCommentAfterValueOnSameLine(childValue);
-diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
-index 55ab224..28cb043 100644
--- a/src/test_lib_json/main.cpp
-+++ b/src/test_lib_json/main.cpp
-@@ -2533,7 +2533,7 @@ JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeNumericValue) {
- JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeArrays) {
-   Json::StreamWriterBuilder writer;
-   const Json::String expected("{\n"
-                              "\t\"property1\" : \n"
-+                              "\t\"property1\" :\n"
-                               "\t[\n"
-                               "\t\t\"value1\",\n"
-                               "\t\t\"value2\"\n"
-@@ -2553,7 +2553,7 @@ JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeArrays) {
- JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeNestedObjects) {
-   Json::StreamWriterBuilder writer;
-   const Json::String expected("{\n"
-                              "\t\"object1\" : \n"
-+                              "\t\"object1\" :\n"
-                               "\t{\n"
-                               "\t\t\"bool\" : true,\n"
-                               "\t\t\"nested\" : 123\n"
-- 
-2.52.0.vfs.0.5
-
--- a/dep/vcpkg-overlay-ports/jsoncpp/portfile.cmake
+++ b/dep/vcpkg-overlay-ports/jsoncpp/portfile.cmake
@@ -1,36 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO open-source-parsers/jsoncpp
-    REF "${VERSION}"
-    SHA512 006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08
-    HEAD_REF master
-    PATCHES
-        0001-No-trailing-space-for-BuildStyledStreamWriter.patch
-)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSONCPP_STATIC)
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DJSONCPP_WITH_CMAKE_PACKAGE=ON
-        -DBUILD_STATIC_LIBS=${JSONCPP_STATIC}
-        -DJSONCPP_STATIC_WINDOWS_RUNTIME=${STATIC_CRT}
-        -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON
-        -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-        -DJSONCPP_WITH_TESTS=OFF
-        -DJSONCPP_WITH_EXAMPLE=OFF
-        -DBUILD_OBJECT_LIBS=OFF
-)
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/jsoncpp)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-vcpkg_copy_pdbs()
-vcpkg_fixup_pkgconfig()
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/dep/vcpkg-overlay-ports/jsoncpp/vcpkg.json
+++ b/dep/vcpkg-overlay-ports/jsoncpp/vcpkg.json
@@ -1,17 +0,0 @@
-{
-  "name": "jsoncpp",
-  "version": "1.9.6",
-  "description": "JsonCpp is a C++ library that allows manipulating JSON values, including serialization and deserialization to and from strings. It can also preserve existing comment in unserialization/serialization steps, making it a convenient format to store user input files.",
-  "homepage": "https://github.com/open-source-parsers/jsoncpp",
-  "license": "MIT",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
--- a/dep/vcpkg-overlay-triplets/arm64-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/arm64-windows-static.cmake
@@ -1,8 +0,0 @@
-# Same as the official arm64-windows-static triplet
-set(VCPKG_TARGET_ARCHITECTURE arm64)
-set(VCPKG_CRT_LINKAGE static)
-set(VCPKG_LIBRARY_LINKAGE static)
-
-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
--- a/dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake
@@ -1,11 +1,6 @@
-# Same as the official arm64-windows-static triplet
 set(VCPKG_TARGET_ARCHITECTURE arm64)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)

-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
-
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)
--- a/dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake
@@ -1,11 +1,6 @@
-# Same as the official x64-windows-static triplet
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)

-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
-
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)
--- a/dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake
@@ -1,11 +1,6 @@
-# Same as the official x86-windows-static triplet
 set(VCPKG_TARGET_ARCHITECTURE x86)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)

-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
-
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)
--- a/dep/vcpkg-overlay-triplets/x64-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/x64-windows-static.cmake
@@ -1,8 +0,0 @@
-# Same as the official x64-windows-static triplet
-set(VCPKG_TARGET_ARCHITECTURE x64)
-set(VCPKG_CRT_LINKAGE static)
-set(VCPKG_LIBRARY_LINKAGE static)
-
-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
--- a/dep/vcpkg-overlay-triplets/x86-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/x86-windows-static.cmake
@@ -1,8 +0,0 @@
-# Same as the official x86-windows-static triplet
-set(VCPKG_TARGET_ARCHITECTURE x86)
-set(VCPKG_CRT_LINKAGE static)
-set(VCPKG_LIBRARY_LINKAGE static)
-
-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
--- a/doc/building.md
+++ b/doc/building.md
@@ -7,7 +7,7 @@ This repository uses [git submodules](https://git-scm.com/book/en/v2/Git-Tools-S
 git submodule update --init --recursive
 ```

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

 When using Visual Studio, be sure to set up the path for code formatting. To download the required clang-format.exe file, follow one of the building instructions below and run:
 ```powershell
@@ -103,7 +103,7 @@ If you want to use .nupkg files instead of the downloaded Nuget package, you can
 The Terminal is bundled as an `.msix`, which is produced by the `CascadiaPackage.wapproj` project. To build that project from the commandline, you can run the following (from a window you've already run `tools\razzle.cmd` in):

 ```cmd
-"%msbuild%" "%OPENCON%\OpenConsole.slnx" /p:Configuration=%_LAST_BUILD_CONF% /p:Platform=%ARCH% /p:AppxSymbolPackageEnabled=false /t:Terminal\CascadiaPackage /m
+"%msbuild%" "%OPENCON%\OpenConsole.sln" /p:Configuration=%_LAST_BUILD_CONF% /p:Platform=%ARCH% /p:AppxSymbolPackageEnabled=false /t:Terminal\CascadiaPackage /m
 ```

 This takes quite some time, and only generates an `msix`. It does not install the msix. To deploy the package:
--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@@ -2407,14 +2407,6 @@
            "console"
          ]
        },
-        "compatibility.ambiguousWidth": {
-          "default": "narrow",
-          "description": "Controls the cell width of East Asian Ambiguous characters.",
-          "enum": [
-            "narrow",
-            "wide"
-          ]
-        },
        "copyFormatting": {
          "default": true,
          "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",
@@ -3174,11 +3166,6 @@
            "mingw"
          ],
          "type": "string"
-        },
-        "dragDropDelimiter": {
-          "default": " ",
-          "description": "The delimiter used when dropping multiple files onto the terminal.",
-          "type": "string"
        }
      }
    },
--- a/Terminal/spec.md
+++ b/Terminal/spec.md
@@ -27,7 +27,6 @@ Two new properties should be added in the json settings file:

 2. Both X value and Y values are optional. If any one of them is missing, or the value is invalid, system default value will be used. Examples:

-       "1000" equals (1000, 1000)
       ", 1000" equals (default, 1000)
       "1000, " equals (1000, default)
       "," equals (default, default)
--- a/Marks/Shell-Integration-Marks.md
+++ b/Marks/Shell-Integration-Marks.md
@@ -111,7 +111,7 @@ not understanding these sequences originally.
 The relevant FinalTerm sequences for marking up the prompt are as follows.


-![image](ftcs-diagram.png)
+![image](FTCS-diagram.png)

 * **FTCS_PROMPT**: `OSC 133 ; A ST`
  - The start of a prompt. Internally, this sets a marker in the buffer
--- a/scratch/ScratchIslandApp/Package/Resources/uk-UA/Resources.resw
+++ b/scratch/ScratchIslandApp/Package/Resources/uk-UA/Resources.resw
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    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
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <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
-    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
-    mimetype set.
-
-    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
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    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
-            : 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
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AppDescription" xml:space="preserve">
-    <value>Скретч-додаток для тестів XAML Islands</value>
-  </data>
-</root>
--- a/scratch/ScratchIslandApp/SampleApp/Resources/uk-UA/Resources.resw
+++ b/scratch/ScratchIslandApp/SampleApp/Resources/uk-UA/Resources.resw
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    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
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <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
-    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
-    mimetype set.
-
-    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
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    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
-            : 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
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/src/buffer/out/Row.cpp
+++ b/src/buffer/out/Row.cpp
@@ -350,7 +350,7 @@ void ROW::_init() noexcept
    std::iota(_charOffsets.begin(), _charOffsets.end(), uint16_t{ 0 });
 #endif

-#pragma warning(pop)
+#pragma warning(push)
 }

 void ROW::CopyFrom(const ROW& source)
--- a/src/buffer/out/UTextAdapter.cpp
+++ b/src/buffer/out/UTextAdapter.cpp
@@ -390,9 +390,6 @@ Microsoft::Console::ICU::unique_utext Microsoft::Console::ICU::UTextFromTextBuff
    utext_setup(&ut, 0, &status);
    FAIL_FAST_IF(status > U_ZERO_ERROR);

-    rowBeg = std::max<til::CoordType>(0, rowBeg);
-    rowEnd = std::min(textBuffer.GetSize().BottomExclusive(), rowEnd);
-
    ut.providerProperties = (1 << UTEXT_PROVIDER_LENGTH_IS_EXPENSIVE) | (1 << UTEXT_PROVIDER_STABLE_CHUNKS);
    ut.pFuncs = &utextFuncs;
    ut.context = &textBuffer;
--- a/src/buffer/out/cursor.cpp
+++ b/src/buffer/out/cursor.cpp
@@ -13,28 +13,46 @@
 // - ulSize - The height of the cursor within this buffer
 Cursor::Cursor(const ULONG ulSize, TextBuffer& parentBuffer) noexcept :
    _parentBuffer{ parentBuffer },
-    _ulSize(ulSize)
+    _fHasMoved(false),
+    _fIsVisible(true),
+    _fIsOn(true),
+    _fIsDouble(false),
+    _fBlinkingAllowed(true),
+    _fDelay(false),
+    _fIsConversionArea(false),
+    _fDelayedEolWrap(false),
+    _fDeferCursorRedraw(false),
+    _fHaveDeferredCursorRedraw(false),
+    _ulSize(ulSize),
+    _cursorType(CursorType::Legacy)
 {
 }

+Cursor::~Cursor() = default;
+
 til::point Cursor::GetPosition() const noexcept
 {
    return _cPosition;
 }

-uint64_t Cursor::GetLastMutationId() const noexcept
+bool Cursor::HasMoved() const noexcept
 {
-    return _mutationId;
+    return _fHasMoved;
 }

 bool Cursor::IsVisible() const noexcept
 {
-    return _isVisible;
+    return _fIsVisible;
 }

-bool Cursor::IsBlinking() const noexcept
+bool Cursor::IsOn() const noexcept
 {
-    return _isBlinking;
+    return _fIsOn;
+}
+
+bool Cursor::IsBlinkingAllowed() const noexcept
+{
+    return _fBlinkingAllowed;
 }

 bool Cursor::IsDouble() const noexcept
@@ -42,128 +60,178 @@ bool Cursor::IsDouble() const noexcept
    return _fIsDouble;
 }

+bool Cursor::IsConversionArea() const noexcept
+{
+    return _fIsConversionArea;
+}
+
+bool Cursor::GetDelay() const noexcept
+{
+    return _fDelay;
+}
+
 ULONG Cursor::GetSize() const noexcept
 {
    return _ulSize;
 }

-void Cursor::SetIsVisible(bool enable) noexcept
+void Cursor::SetHasMoved(const bool fHasMoved) noexcept
 {
-    if (_isVisible != enable)
-    {
-        _isVisible = enable;
-        _redrawIfVisible();
-    }
+    _fHasMoved = fHasMoved;
 }

-void Cursor::SetIsBlinking(bool enable) noexcept
+void Cursor::SetIsVisible(const bool fIsVisible) noexcept
 {
-    if (_isBlinking != enable)
-    {
-        _isBlinking = enable;
-        _redrawIfVisible();
-    }
+    _fIsVisible = fIsVisible;
+    _RedrawCursor();
+}
+
+void Cursor::SetIsOn(const bool fIsOn) noexcept
+{
+    _fIsOn = fIsOn;
+    _RedrawCursorAlways();
+}
+
+void Cursor::SetBlinkingAllowed(const bool fBlinkingAllowed) noexcept
+{
+    _fBlinkingAllowed = fBlinkingAllowed;
+    // GH#2642 - From what we've gathered from other terminals, when blinking is
+    // disabled, the cursor should remain On always, and have the visibility
+    // controlled by the IsVisible property. So when you do a printf "\e[?12l"
+    // to disable blinking, the cursor stays stuck On. At this point, only the
+    // cursor visibility property controls whether the user can see it or not.
+    // (Yes, the cursor can be On and NOT Visible)
+    _fIsOn = true;
+    _RedrawCursorAlways();
 }

 void Cursor::SetIsDouble(const bool fIsDouble) noexcept
 {
-    if (_fIsDouble != fIsDouble)
-    {
-        _fIsDouble = fIsDouble;
-        _redrawIfVisible();
-    }
+    _fIsDouble = fIsDouble;
+    _RedrawCursor();
+}
+
+void Cursor::SetIsConversionArea(const bool fIsConversionArea) noexcept
+{
+    // Functionally the same as "Hide cursor"
+    // Never called with TRUE, it's only used in the creation of a
+    //      ConversionAreaInfo, and never changed after that.
+    _fIsConversionArea = fIsConversionArea;
+    _RedrawCursorAlways();
+}
+
+void Cursor::SetDelay(const bool fDelay) noexcept
+{
+    _fDelay = fDelay;
 }

 void Cursor::SetSize(const ULONG ulSize) noexcept
 {
-    if (_ulSize != ulSize)
-    {
-        _ulSize = ulSize;
-        _redrawIfVisible();
-    }
+    _ulSize = ulSize;
+    _RedrawCursor();
 }

 void Cursor::SetStyle(const ULONG ulSize, const CursorType type) noexcept
 {
-    if (_ulSize != ulSize || _cursorType != type)
+    _ulSize = ulSize;
+    _cursorType = type;
+
+    _RedrawCursor();
+}
+
+// Routine Description:
+// - Sends a redraw message to the renderer only if the cursor is currently on.
+// - NOTE: For use with most methods in this class.
+// Arguments:
+// - <none>
+// Return Value:
+// - <none>
+void Cursor::_RedrawCursor() noexcept
+{
+    // Only trigger the redraw if we're on.
+    // Don't draw the cursor if this was triggered from a conversion area.
+    // (Conversion areas have cursors to mark the insertion point internally, but the user's actual cursor is the one on the primary screen buffer.)
+    if (IsOn() && !IsConversionArea())
    {
-        _ulSize = ulSize;
-        _cursorType = type;
-        _redrawIfVisible();
+        if (_fDeferCursorRedraw)
+        {
+            _fHaveDeferredCursorRedraw = true;
+        }
+        else
+        {
+            _RedrawCursorAlways();
+        }
    }
 }

+// Routine Description:
+// - Sends a redraw message to the renderer no matter what.
+// - NOTE: For use with the method that turns the cursor on and off to force a refresh
+//         and clear the ON cursor from the screen. Not for use with other methods.
+//         They should use the other method so refreshes are suppressed while the cursor is off.
+// Arguments:
+// - <none>
+// Return Value:
+// - <none>
+void Cursor::_RedrawCursorAlways() noexcept
+{
+    _parentBuffer.NotifyPaintFrame();
+}
+
 void Cursor::SetPosition(const til::point cPosition) noexcept
 {
-    // The VT code assumes that moving the cursor implicitly resets the delayed EOL wrap,
-    // so we call ResetDelayEOLWrap() independent of _cPosition != cPosition.
-    // You can see the effect of this with "`e[1;9999Ha`e[1;9999Hb", which should print just "b".
+    _RedrawCursor();
+    _cPosition = cPosition;
+    _RedrawCursor();
    ResetDelayEOLWrap();
-    if (_cPosition != cPosition)
-    {
-        _cPosition = cPosition;
-        _redrawIfVisible();
-    }
 }

 void Cursor::SetXPosition(const til::CoordType NewX) noexcept
 {
+    _RedrawCursor();
+    _cPosition.x = NewX;
+    _RedrawCursor();
    ResetDelayEOLWrap();
-    if (_cPosition.x != NewX)
-    {
-        _cPosition.x = NewX;
-        _redrawIfVisible();
-    }
 }

 void Cursor::SetYPosition(const til::CoordType NewY) noexcept
 {
+    _RedrawCursor();
+    _cPosition.y = NewY;
+    _RedrawCursor();
    ResetDelayEOLWrap();
-    if (_cPosition.y != NewY)
-    {
-        _cPosition.y = NewY;
-        _redrawIfVisible();
-    }
 }

 void Cursor::IncrementXPosition(const til::CoordType DeltaX) noexcept
 {
+    _RedrawCursor();
+    _cPosition.x += DeltaX;
+    _RedrawCursor();
    ResetDelayEOLWrap();
-    if (DeltaX != 0)
-    {
-        _cPosition.x = _cPosition.x + DeltaX;
-        _redrawIfVisible();
-    }
 }

 void Cursor::IncrementYPosition(const til::CoordType DeltaY) noexcept
 {
+    _RedrawCursor();
+    _cPosition.y += DeltaY;
+    _RedrawCursor();
    ResetDelayEOLWrap();
-    if (DeltaY != 0)
-    {
-        _cPosition.y = _cPosition.y + DeltaY;
-        _redrawIfVisible();
-    }
 }

 void Cursor::DecrementXPosition(const til::CoordType DeltaX) noexcept
 {
+    _RedrawCursor();
+    _cPosition.x -= DeltaX;
+    _RedrawCursor();
    ResetDelayEOLWrap();
-    if (DeltaX != 0)
-    {
-        _cPosition.x = _cPosition.x - DeltaX;
-        _redrawIfVisible();
-    }
 }

 void Cursor::DecrementYPosition(const til::CoordType DeltaY) noexcept
 {
+    _RedrawCursor();
+    _cPosition.y -= DeltaY;
+    _RedrawCursor();
    ResetDelayEOLWrap();
-    if (DeltaY != 0)
-    {
-        _cPosition.y = _cPosition.y - DeltaY;
-        _redrawIfVisible();
-    }
 }

 ///////////////////////////////////////////////////////////////////////////////
@@ -176,33 +244,74 @@ void Cursor::DecrementYPosition(const til::CoordType DeltaY) noexcept
 // - OtherCursor - The cursor to copy properties from
 // Return Value:
 // - <none>
-void Cursor::CopyProperties(const Cursor& other) noexcept
+void Cursor::CopyProperties(const Cursor& OtherCursor) noexcept
 {
-    _cPosition = other._cPosition;
-    _coordDelayedAt = other._coordDelayedAt;
-    _ulSize = other._ulSize;
-    _cursorType = other._cursorType;
-    _isVisible = other._isVisible;
-    _isBlinking = other._isBlinking;
-    _fIsDouble = other._fIsDouble;
+    // We shouldn't copy the position as it will be already rearranged by the resize operation.
+    //_cPosition                    = pOtherCursor->_cPosition;
+
+    _fHasMoved = OtherCursor._fHasMoved;
+    _fIsVisible = OtherCursor._fIsVisible;
+    _fIsOn = OtherCursor._fIsOn;
+    _fIsDouble = OtherCursor._fIsDouble;
+    _fBlinkingAllowed = OtherCursor._fBlinkingAllowed;
+    _fDelay = OtherCursor._fDelay;
+    _fIsConversionArea = OtherCursor._fIsConversionArea;
+
+    // A resize operation should invalidate the delayed end of line status, so do not copy.
+    //_fDelayedEolWrap              = OtherCursor._fDelayedEolWrap;
+    //_coordDelayedAt               = OtherCursor._coordDelayedAt;
+
+    _fDeferCursorRedraw = OtherCursor._fDeferCursorRedraw;
+    _fHaveDeferredCursorRedraw = OtherCursor._fHaveDeferredCursorRedraw;
+
+    // Size will be handled separately in the resize operation.
+    //_ulSize                       = OtherCursor._ulSize;
+    _cursorType = OtherCursor._cursorType;
 }

 void Cursor::DelayEOLWrap() noexcept
 {
    _coordDelayedAt = _cPosition;
+    _fDelayedEolWrap = true;
 }

 void Cursor::ResetDelayEOLWrap() noexcept
 {
-    _coordDelayedAt.reset();
+    _coordDelayedAt = {};
+    _fDelayedEolWrap = false;
 }

-const std::optional<til::point>& Cursor::GetDelayEOLWrap() const noexcept
+til::point Cursor::GetDelayedAtPosition() const noexcept
 {
    return _coordDelayedAt;
 }

-CursorType Cursor::GetType() const noexcept
+bool Cursor::IsDelayedEOLWrap() const noexcept
+{
+    return _fDelayedEolWrap;
+}
+
+void Cursor::StartDeferDrawing() noexcept
+{
+    _fDeferCursorRedraw = true;
+}
+
+bool Cursor::IsDeferDrawing() noexcept
+{
+    return _fDeferCursorRedraw;
+}
+
+void Cursor::EndDeferDrawing() noexcept
+{
+    if (_fHaveDeferredCursorRedraw)
+    {
+        _RedrawCursorAlways();
+    }
+
+    _fDeferCursorRedraw = FALSE;
+}
+
+const CursorType Cursor::GetType() const noexcept
 {
    return _cursorType;
 }
@@ -211,18 +320,3 @@ void Cursor::SetType(const CursorType type) noexcept
 {
    _cursorType = type;
 }
-
-void Cursor::_redrawIfVisible() noexcept
-{
-    _mutationId++;
-    if (_isVisible)
-    {
-        _parentBuffer.NotifyPaintFrame();
-    }
-}
-
-void Cursor::_redraw() noexcept
-{
-    _mutationId++;
-    _parentBuffer.NotifyPaintFrame();
-}
--- a/src/buffer/out/cursor.h
+++ b/src/buffer/out/cursor.h
@@ -29,6 +29,8 @@ public:

    Cursor(const ULONG ulSize, TextBuffer& parentBuffer) noexcept;

+    ~Cursor();
+
    // No Copy. It will copy the timer handle. Bad news.
    Cursor(const Cursor&) = delete;
    Cursor& operator=(const Cursor&) & = delete;
@@ -36,17 +38,29 @@ public:
    Cursor(Cursor&&) = default;
    Cursor& operator=(Cursor&&) & = delete;

-    uint64_t GetLastMutationId() const noexcept;
+    bool HasMoved() const noexcept;
    bool IsVisible() const noexcept;
-    bool IsBlinking() const noexcept;
+    bool IsOn() const noexcept;
+    bool IsBlinkingAllowed() const noexcept;
    bool IsDouble() const noexcept;
+    bool IsConversionArea() const noexcept;
+    bool GetDelay() const noexcept;
    ULONG GetSize() const noexcept;
    til::point GetPosition() const noexcept;
-    CursorType GetType() const noexcept;

-    void SetIsVisible(bool enable) noexcept;
-    void SetIsBlinking(bool enable) noexcept;
+    const CursorType GetType() const noexcept;
+
+    void StartDeferDrawing() noexcept;
+    bool IsDeferDrawing() noexcept;
+    void EndDeferDrawing() noexcept;
+
+    void SetHasMoved(const bool fHasMoved) noexcept;
+    void SetIsVisible(const bool fIsVisible) noexcept;
+    void SetIsOn(const bool fIsOn) noexcept;
+    void SetBlinkingAllowed(const bool fIsOn) noexcept;
    void SetIsDouble(const bool fIsDouble) noexcept;
+    void SetIsConversionArea(const bool fIsConversionArea) noexcept;
+    void SetDelay(const bool fDelay) noexcept;
    void SetSize(const ULONG ulSize) noexcept;
    void SetStyle(const ULONG ulSize, const CursorType type) noexcept;

@@ -58,30 +72,42 @@ public:
    void DecrementXPosition(const til::CoordType DeltaX) noexcept;
    void DecrementYPosition(const til::CoordType DeltaY) noexcept;

-    void CopyProperties(const Cursor& other) noexcept;
+    void CopyProperties(const Cursor& OtherCursor) noexcept;

    void DelayEOLWrap() noexcept;
    void ResetDelayEOLWrap() noexcept;
-    const std::optional<til::point>& GetDelayEOLWrap() const noexcept;
+    til::point GetDelayedAtPosition() const noexcept;
+    bool IsDelayedEOLWrap() const noexcept;

    void SetType(const CursorType type) noexcept;

 private:
-    void _redrawIfVisible() noexcept;
-    void _redraw() noexcept;
-
    TextBuffer& _parentBuffer;

    //TODO: separate the rendering and text placement

    // NOTE: If you are adding a property here, go add it to CopyProperties.

-    uint64_t _mutationId = 0;
    til::point _cPosition; // current position on screen (in screen buffer coords).
-    std::optional<til::point> _coordDelayedAt; // coordinate the EOL wrap was delayed at.
+
+    bool _fHasMoved;
+    bool _fIsVisible; // whether cursor is visible (set only through the API)
+    bool _fIsOn; // whether blinking cursor is on or not
+    bool _fIsDouble; // whether the cursor size should be doubled
+    bool _fBlinkingAllowed; //Whether or not the cursor is allowed to blink at all. only set through VT (^[[?12h/l)
+    bool _fDelay; // don't blink scursor on next timer message
+    bool _fIsConversionArea; // is attached to a conversion area so it doesn't actually need to display the cursor.
+
+    bool _fDelayedEolWrap; // don't wrap at EOL till the next char comes in.
+    til::point _coordDelayedAt; // coordinate the EOL wrap was delayed at.
+
+    bool _fDeferCursorRedraw; // whether we should defer redrawing the cursor or not
+    bool _fHaveDeferredCursorRedraw; // have we been asked to redraw the cursor while it was being deferred?
+
    ULONG _ulSize;
-    CursorType _cursorType = CursorType::Legacy;
-    bool _isVisible = true;
-    bool _isBlinking = true;
-    bool _fIsDouble = false; // whether the cursor size should be doubled
+
+    void _RedrawCursor() noexcept;
+    void _RedrawCursorAlways() noexcept;
+
+    CursorType _cursorType;
 };
--- a/src/buffer/out/textBuffer.cpp
+++ b/src/buffer/out/textBuffer.cpp
@@ -219,17 +219,6 @@ til::CoordType TextBuffer::_estimateOffsetOfLastCommittedRow() const noexcept
    return std::max(0, gsl::narrow_cast<til::CoordType>(lastRowOffset - 2));
 }

-bool TextBuffer::_isRowCommitted(til::CoordType y) const noexcept
-{
-    auto offset = (_firstRow + y + 1 /* account for the scratch row */) % _height;
-    if (offset < 0)
-    {
-        offset += _height;
-    }
-    const auto row = _buffer.get() + _bufferRowStride * offset;
-    return row < _commitWatermark;
-}
-
 // Retrieves a row from the buffer by its offset from the first row of the text buffer
 // (what corresponds to the top row of the screen buffer).
 const ROW& TextBuffer::GetRowByOffset(const til::CoordType index) const
@@ -945,10 +934,6 @@ void TextBuffer::ResetLineRenditionRange(const til::CoordType startRow, const ti

 LineRendition TextBuffer::GetLineRendition(const til::CoordType row) const
 {
-    if (!_isRowCommitted(row)) [[unlikely]]
-    {
-        return LineRendition::SingleWidth;
-    }
    return GetRowByOffset(row).GetLineRendition();
 }

@@ -1156,20 +1141,7 @@ DelimiterClass TextBuffer::_GetDelimiterClassAt(const til::point pos, const std:
    return GetRowByOffset(realPos.y).DelimiterClassAt(realPos.x, wordDelimiters);
 }

-// Method Description:
-// - Get the start of the word at or before the given position
-// - When includeWhitespace is false, returns the start of the current delimiter class run
-//   (selection behavior: stops at non-wrapped row boundaries)
-// - When includeWhitespace is true, also skips backward past any leading ControlChars
-//   to include the preceding word (accessibility/UIA behavior: crosses all row boundaries)
-// Arguments:
-// - pos - the buffer position to start from
-// - wordDelimiters - characters considered as DelimiterClass::DelimiterChar
-// - includeWhitespace - when true, skip past leading whitespace to find the word start
-// - limitOptional - (optional) the last possible position in the buffer that can be explored
-// Return Value:
-// - The position of the first character of the word (inclusive)
-til::point TextBuffer::GetWordStart(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional) const
+til::point TextBuffer::GetWordStart2(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional) const
 {
    const auto bufferSize{ GetSize() };
    const auto limit{ limitOptional.value_or(bufferSize.BottomInclusiveRightExclusive()) };
@@ -1202,7 +1174,7 @@ til::point TextBuffer::GetWordStart(til::point pos, const std::wstring_view word
    // 1. move to the beginning of the delimiter class run
    // 2. (includeWhitespace) if we were on a ControlChar, go back one more delimiter class run
    const auto initialDelimiter = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
-    pos = _GetDelimiterClassRunStart(pos, wordDelimiters, includeWhitespace);
+    pos = _GetDelimiterClassRunStart(pos, wordDelimiters);
    if (!includeWhitespace || pos.x == bufferSize.Left())
    {
        // Special case:
@@ -1213,26 +1185,12 @@ til::point TextBuffer::GetWordStart(til::point pos, const std::wstring_view word
    else if (initialDelimiter == DelimiterClass::ControlChar)
    {
        bufferSize.DecrementInExclusiveBounds(pos);
-        pos = _GetDelimiterClassRunStart(pos, wordDelimiters, includeWhitespace);
+        pos = _GetDelimiterClassRunStart(pos, wordDelimiters);
    }
    return pos;
 }

-// Method Description:
-// - Get the exclusive end of the word at or after the given position
-// - When includeWhitespace is false, returns the exclusive end of the current delimiter class run
-//   (selection behavior: stops at non-wrapped row boundaries)
-// - When includeWhitespace is true, also skips forward past any trailing ControlChars
-//   to include trailing whitespace (accessibility/UIA behavior: crosses all row boundaries)
-// - The result is clamped to limitOptional when provided
-// Arguments:
-// - pos - the buffer position to start from
-// - wordDelimiters - characters considered as DelimiterClass::DelimiterChar
-// - includeWhitespace - when true, skip past trailing whitespace to find the next word boundary
-// - limitOptional - (optional) the last possible position in the buffer that can be explored
-// Return Value:
-// - The exclusive end position of the word
-til::point TextBuffer::GetWordEnd(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional) const
+til::point TextBuffer::GetWordEnd2(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional) const
 {
    const auto bufferSize{ GetSize() };
    const auto limit{ limitOptional.value_or(bufferSize.BottomInclusiveRightExclusive()) };
@@ -1265,12 +1223,8 @@ til::point TextBuffer::GetWordEnd(til::point pos, const std::wstring_view wordDe
    // So the heuristic we use is:
    // 1. move to the end of the delimiter class run
    // 2. (includeWhitespace) if the next delimiter class run is a ControlChar, go forward one more delimiter class run
-    pos = _GetDelimiterClassRunEnd(pos, wordDelimiters, includeWhitespace);
-    if (pos >= limit)
-    {
-        return limit;
-    }
-    else if (!includeWhitespace || pos.x == bufferSize.RightExclusive())
+    pos = _GetDelimiterClassRunEnd(pos, wordDelimiters);
+    if (!includeWhitespace || pos.x == bufferSize.RightExclusive())
    {
        // Special case:
        // we're at the right boundary (and end of a delimiter class run),
@@ -1281,8 +1235,7 @@ til::point TextBuffer::GetWordEnd(til::point pos, const std::wstring_view wordDe
    if (const auto nextDelimClass = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
        nextDelimClass == DelimiterClass::ControlChar)
    {
-        pos = _GetDelimiterClassRunEnd(pos, wordDelimiters, includeWhitespace);
-        return std::min(pos, limit);
+        return _GetDelimiterClassRunEnd(pos, wordDelimiters);
    }
    return pos;
 }
@@ -1335,48 +1288,29 @@ bool TextBuffer::IsWordBoundary(const til::point pos, const std::wstring_view wo
    return prevDelimiterClass != currentDelimiterClass && currentDelimiterClass != DelimiterClass::ControlChar;
 }

-// Method Description:
-// - Get the start position for the current delimiter class run, scanning backward
-// - Stops when the delimiter class changes or a row boundary is reached
-// - When accessibilityMode is true, freely crosses non-wrapped row boundaries
-// - When accessibilityMode is false, only crosses wrap-forced row boundaries
-// Arguments:
-// - pos - the buffer position to start scanning from
-// - wordDelimiters - what characters are we considering for the separation of words
-// - accessibilityMode - when true, cross non-wrapped row boundaries freely
-// Return Value:
-// - The position of the first character in the current delimiter class run (inclusive)
-til::point TextBuffer::_GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters, const bool accessibilityMode) const
+til::point TextBuffer::_GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters) const
 {
    const auto bufferSize = GetSize();
    const auto initialDelimClass = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
-    auto nextPos = pos;
-    while (nextPos != bufferSize.Origin())
+    for (auto nextPos = pos; nextPos != bufferSize.Origin(); pos = nextPos)
    {
        bufferSize.DecrementInExclusiveBounds(nextPos);

        if (nextPos.x == bufferSize.RightExclusive())
        {
-            // wrapped onto previous line
+            // wrapped onto previous line,
+            // check if it was forced to wrap
            const auto& row = GetRowByOffset(nextPos.y);
-            if (!row.WasWrapForced() && !accessibilityMode)
+            if (!row.WasWrapForced())
            {
                return pos;
            }
-            // In accessibility mode (or if row was wrap-forced), continue
-            // across the row boundary. The actual last character of the
-            // previous row will be checked on the next iteration.
-            // Don't update pos to avoid storing a transient position
        }
        else if (_GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
        {
            // if we changed delim class, we're done (don't apply move)
            return pos;
        }
-        else
-        {
-            pos = nextPos;
-        }
    }
    return pos;
 }
@@ -1386,8 +1320,7 @@ til::point TextBuffer::_GetDelimiterClassRunStart(til::point pos, const std::wst
 // Arguments:
 // - pos - the buffer position being within the current delimiter class
 // - wordDelimiters - what characters are we considering for the separation of words
-// - accessibilityMode - when true, cross non-wrapped row boundaries freely
-til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters, const bool accessibilityMode) const
+til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters) const
 {
    const auto bufferSize = GetSize();
    const auto initialDelimClass = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
@@ -1400,16 +1333,7 @@ til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstri
            // wrapped onto next line,
            // check if it was forced to wrap or switched delimiter class
            const auto& row = GetRowByOffset(pos.y);
-            if (accessibilityMode)
-            {
-                // In accessibility mode, always cross row boundaries,
-                // but still stop if the delimiter class changes
-                if (_GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
-                {
-                    return nextPos;
-                }
-            }
-            else if (!row.WasWrapForced() || _GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
+            if (!row.WasWrapForced() || _GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
            {
                return pos;
            }
@@ -1424,6 +1348,283 @@ til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstri
    return pos;
 }

+// Method Description:
+// - Get the til::point for the beginning of the word you are on
+// Arguments:
+// - target - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// - accessibilityMode - when enabled, we continue expanding left until we are at the beginning of a readable word.
+//                        Otherwise, expand left until a character of a new delimiter class is found
+//                        (or a row boundary is encountered)
+// - limitOptional - (optional) the last possible position in the buffer that can be explored. This can be used to improve performance.
+// Return Value:
+// - The til::point for the first character on the "word" (inclusive)
+til::point TextBuffer::GetWordStart(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode, std::optional<til::point> limitOptional) const
+{
+    // Consider a buffer with this text in it:
+    // "  word   other  "
+    // In selection (accessibilityMode = false),
+    //  a "word" is defined as the range between two delimiters
+    //  so the words in the example include ["  ", "word", "   ", "other", "  "]
+    // In accessibility (accessibilityMode = true),
+    //  a "word" includes the delimiters after a range of readable characters
+    //  so the words in the example include ["word   ", "other  "]
+    // NOTE: the start anchor (this one) is inclusive, whereas the end anchor (GetWordEnd) is exclusive
+
+#pragma warning(suppress : 26496)
+    auto copy{ target };
+    const auto bufferSize{ GetSize() };
+    const auto limit{ limitOptional.value_or(bufferSize.EndExclusive()) };
+    if (target == bufferSize.Origin())
+    {
+        // can't expand left
+        return target;
+    }
+    else if (target == bufferSize.EndExclusive())
+    {
+        // GH#7664: Treat EndExclusive as EndInclusive so
+        // that it actually points to a space in the buffer
+        copy = bufferSize.BottomRightInclusive();
+    }
+    else if (bufferSize.CompareInBounds(target, limit, true) >= 0)
+    {
+        // if at/past the limit --> clamp to limit
+        copy = limitOptional.value_or(bufferSize.BottomRightInclusive());
+    }
+
+    if (accessibilityMode)
+    {
+        return _GetWordStartForAccessibility(copy, wordDelimiters);
+    }
+    else
+    {
+        return _GetWordStartForSelection(copy, wordDelimiters);
+    }
+}
+
+// Method Description:
+// - Helper method for GetWordStart(). Get the til::point for the beginning of the word (accessibility definition) you are on
+// Arguments:
+// - target - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// Return Value:
+// - The til::point for the first character on the current/previous READABLE "word" (inclusive)
+til::point TextBuffer::_GetWordStartForAccessibility(const til::point target, const std::wstring_view wordDelimiters) const
+{
+    auto result = target;
+    const auto bufferSize = GetSize();
+
+    // ignore left boundary. Continue until readable text found
+    while (_GetDelimiterClassAt(result, wordDelimiters) != DelimiterClass::RegularChar)
+    {
+        if (result == bufferSize.Origin())
+        {
+            //looped around and hit origin (no word between origin and target)
+            return result;
+        }
+        bufferSize.DecrementInBounds(result);
+    }
+
+    // make sure we expand to the left boundary or the beginning of the word
+    while (_GetDelimiterClassAt(result, wordDelimiters) == DelimiterClass::RegularChar)
+    {
+        if (result == bufferSize.Origin())
+        {
+            // first char in buffer is a RegularChar
+            // we can't move any further back
+            return result;
+        }
+        bufferSize.DecrementInBounds(result);
+    }
+
+    // move off of delimiter
+    bufferSize.IncrementInBounds(result);
+
+    return result;
+}
+
+// Method Description:
+// - Helper method for GetWordStart(). Get the til::point for the beginning of the word (selection definition) you are on
+// Arguments:
+// - target - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// Return Value:
+// - The til::point for the first character on the current word or delimiter run (stopped by the left margin)
+til::point TextBuffer::_GetWordStartForSelection(const til::point target, const std::wstring_view wordDelimiters) const
+{
+    auto result = target;
+    const auto bufferSize = GetSize();
+
+    const auto initialDelimiter = _GetDelimiterClassAt(result, wordDelimiters);
+    const bool isControlChar = initialDelimiter == DelimiterClass::ControlChar;
+
+    // expand left until we hit the left boundary or a different delimiter class
+    while (result != bufferSize.Origin() && _GetDelimiterClassAt(result, wordDelimiters) == initialDelimiter)
+    {
+        if (result.x == bufferSize.Left())
+        {
+            // Prevent wrapping to the previous line if the selection begins on whitespace
+            if (isControlChar)
+            {
+                break;
+            }
+
+            if (result.y > 0)
+            {
+                // Prevent wrapping to the previous line if it was hard-wrapped (e.g. not forced by us to wrap)
+                const auto& priorRow = GetRowByOffset(result.y - 1);
+                if (!priorRow.WasWrapForced())
+                {
+                    break;
+                }
+            }
+        }
+        bufferSize.DecrementInBounds(result);
+    }
+
+    if (_GetDelimiterClassAt(result, wordDelimiters) != initialDelimiter)
+    {
+        // move off of delimiter
+        bufferSize.IncrementInBounds(result);
+    }
+
+    return result;
+}
+
+// Method Description:
+// - Get the til::point for the beginning of the NEXT word
+// Arguments:
+// - target - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// - accessibilityMode - when enabled, we continue expanding right until we are at the beginning of the next READABLE word
+//                        Otherwise, expand right until a character of a new delimiter class is found
+//                        (or a row boundary is encountered)
+// - limitOptional - (optional) the last possible position in the buffer that can be explored. This can be used to improve performance.
+// Return Value:
+// - The til::point for the last character on the "word" (inclusive)
+til::point TextBuffer::GetWordEnd(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode, std::optional<til::point> limitOptional) const
+{
+    // Consider a buffer with this text in it:
+    // "  word   other  "
+    // In selection (accessibilityMode = false),
+    //  a "word" is defined as the range between two delimiters
+    //  so the words in the example include ["  ", "word", "   ", "other", "  "]
+    // In accessibility (accessibilityMode = true),
+    //  a "word" includes the delimiters after a range of readable characters
+    //  so the words in the example include ["word   ", "other  "]
+    // NOTE: the end anchor (this one) is exclusive, whereas the start anchor (GetWordStart) is inclusive
+
+    // Already at/past the limit. Can't move forward.
+    const auto bufferSize{ GetSize() };
+    const auto limit{ limitOptional.value_or(bufferSize.EndExclusive()) };
+    if (bufferSize.CompareInBounds(target, limit, true) >= 0)
+    {
+        return target;
+    }
+
+    if (accessibilityMode)
+    {
+        return _GetWordEndForAccessibility(target, wordDelimiters, limit);
+    }
+    else
+    {
+        return _GetWordEndForSelection(target, wordDelimiters);
+    }
+}
+
+// Method Description:
+// - Helper method for GetWordEnd(). Get the til::point for the beginning of the next READABLE word
+// Arguments:
+// - target - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// - limit - the last "valid" position in the text buffer (to improve performance)
+// Return Value:
+// - The til::point for the first character of the next readable "word". If no next word, return one past the end of the buffer
+til::point TextBuffer::_GetWordEndForAccessibility(const til::point target, const std::wstring_view wordDelimiters, const til::point limit) const
+{
+    const auto bufferSize{ GetSize() };
+    auto result{ target };
+
+    if (bufferSize.CompareInBounds(target, limit, true) >= 0)
+    {
+        // if we're already on/past the last RegularChar,
+        // clamp result to that position
+        result = limit;
+
+        // make the result exclusive
+        bufferSize.IncrementInBounds(result, true);
+    }
+    else
+    {
+        while (result != limit && result != bufferSize.BottomRightInclusive() && _GetDelimiterClassAt(result, wordDelimiters) == DelimiterClass::RegularChar)
+        {
+            // Iterate through readable text
+            bufferSize.IncrementInBounds(result);
+        }
+
+        while (result != limit && result != bufferSize.BottomRightInclusive() && _GetDelimiterClassAt(result, wordDelimiters) != DelimiterClass::RegularChar)
+        {
+            // expand to the beginning of the NEXT word
+            bufferSize.IncrementInBounds(result);
+        }
+
+        // Special case: we tried to move one past the end of the buffer
+        // Manually increment onto the EndExclusive point.
+        if (result == bufferSize.BottomRightInclusive())
+        {
+            bufferSize.IncrementInBounds(result, true);
+        }
+    }
+
+    return result;
+}
+
+// Method Description:
+// - Helper method for GetWordEnd(). Get the til::point for the beginning of the NEXT word
+// Arguments:
+// - target - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// Return Value:
+// - The til::point for the last character of the current word or delimiter run (stopped by right margin)
+til::point TextBuffer::_GetWordEndForSelection(const til::point target, const std::wstring_view wordDelimiters) const
+{
+    const auto bufferSize = GetSize();
+
+    auto result = target;
+    const auto initialDelimiter = _GetDelimiterClassAt(result, wordDelimiters);
+    const bool isControlChar = initialDelimiter == DelimiterClass::ControlChar;
+
+    // expand right until we hit the right boundary as a ControlChar or a different delimiter class
+    while (result != bufferSize.BottomRightInclusive() && _GetDelimiterClassAt(result, wordDelimiters) == initialDelimiter)
+    {
+        if (result.x == bufferSize.RightInclusive())
+        {
+            // Prevent wrapping to the next line if the selection begins on whitespace
+            if (isControlChar)
+            {
+                break;
+            }
+
+            // Prevent wrapping to the next line if this one was hard-wrapped (e.g. not forced by us to wrap)
+            const auto& row = GetRowByOffset(result.y);
+            if (!row.WasWrapForced())
+            {
+                break;
+            }
+        }
+
+        bufferSize.IncrementInBounds(result);
+    }
+
+    if (_GetDelimiterClassAt(result, wordDelimiters) != initialDelimiter)
+    {
+        // move off of delimiter
+        bufferSize.DecrementInBounds(result);
+    }
+
+    return result;
+}
+
 void TextBuffer::_PruneHyperlinks()
 {
    // Check the old first row for hyperlink references
@@ -1470,6 +1671,57 @@ void TextBuffer::_PruneHyperlinks()
    }
 }

+// Method Description:
+// - Update pos to be the position of the first character of the next word. This is used for accessibility
+// Arguments:
+// - pos - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// - limitOptional - (optional) the last possible position in the buffer that can be explored. This can be used to improve performance.
+// Return Value:
+// - true, if successfully updated pos. False, if we are unable to move (usually due to a buffer boundary)
+// - pos - The til::point for the first character on the "word" (inclusive)
+bool TextBuffer::MoveToNextWord(til::point& pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional) const
+{
+    // move to the beginning of the next word
+    // NOTE: _GetWordEnd...() returns the exclusive position of the "end of the word"
+    //       This is also the inclusive start of the next word.
+    const auto bufferSize{ GetSize() };
+    const auto limit{ limitOptional.value_or(bufferSize.EndExclusive()) };
+    const auto copy{ _GetWordEndForAccessibility(pos, wordDelimiters, limit) };
+
+    if (bufferSize.CompareInBounds(copy, limit, true) >= 0)
+    {
+        return false;
+    }
+
+    pos = copy;
+    return true;
+}
+
+// Method Description:
+// - Update pos to be the position of the first character of the previous word. This is used for accessibility
+// Arguments:
+// - pos - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// Return Value:
+// - true, if successfully updated pos. False, if we are unable to move (usually due to a buffer boundary)
+// - pos - The til::point for the first character on the "word" (inclusive)
+bool TextBuffer::MoveToPreviousWord(til::point& pos, std::wstring_view wordDelimiters) const
+{
+    // move to the beginning of the current word
+    auto copy{ GetWordStart(pos, wordDelimiters, true) };
+
+    if (!GetSize().DecrementInBounds(copy, true))
+    {
+        // can't move behind current word
+        return false;
+    }
+
+    // move to the beginning of the previous word
+    pos = GetWordStart(copy, wordDelimiters, true);
+    return true;
+}
+
 // Method Description:
 // - Update pos to be the beginning of the current glyph/character. This is used for accessibility
 // Arguments:
@@ -2376,8 +2628,11 @@ void TextBuffer::_AppendRTFText(std::string& contentBuilder, const std::wstring_
    }
 }

-void TextBuffer::SerializeTo(HANDLE handle) const
+void TextBuffer::SerializeToPath(const wchar_t* destination) const
 {
+    const wil::unique_handle file{ CreateFileW(destination, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr) };
+    THROW_LAST_ERROR_IF(!file);
+
    static constexpr size_t writeThreshold = 32 * 1024;
    std::wstring buffer;
    buffer.reserve(writeThreshold + writeThreshold / 2);
@@ -2406,7 +2661,7 @@ void TextBuffer::SerializeTo(HANDLE handle) const
        {
            const auto fileSize = gsl::narrow<DWORD>(buffer.size() * sizeof(wchar_t));
            DWORD bytesWritten = 0;
-            THROW_IF_WIN32_BOOL_FALSE(WriteFile(handle, buffer.data(), fileSize, &bytesWritten, nullptr));
+            THROW_IF_WIN32_BOOL_FALSE(WriteFile(file.get(), buffer.data(), fileSize, &bytesWritten, nullptr));
            THROW_WIN32_IF_MSG(ERROR_WRITE_FAULT, bytesWritten != fileSize, "failed to write");
            buffer.clear();
        }
@@ -3527,34 +3782,3 @@ void TextBuffer::ManuallyMarkRowAsPrompt(til::CoordType y)
        attr.SetMarkAttributes(MarkKind::Prompt);
    }
 }
-
-// This is an optimization used by the renderer to avoid scheduling a timer if not necessary;
-// unlike the renderer, we know the committed range of our own buffer.
-bool TextBuffer::ContainsBlinkAttributeInRegion(const Microsoft::Console::Types::Viewport& region) const
-{
-    const auto top = region.Top();
-    auto bottom = std::min(region.BottomInclusive(), _estimateOffsetOfLastCommittedRow());
-
-    for (auto row = top; row < bottom; ++row)
-    {
-        const auto& r = GetRowByOffset(row);
-        for (const auto& attr : r.Attributes())
-        {
-            if (attr.IsBlinking())
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-bool TextBuffer::IsGlyphDoubleWidthAt(const til::point at) const
-{
-    if (!_isRowCommitted(at.y)) [[unlikely]]
-    {
-        return false;
-    }
-    return _getRow(at.y).DbcsAttrAt(at.x) != DbcsAttribute::Single;
-}
--- a/src/buffer/out/textBuffer.hpp
+++ b/src/buffer/out/textBuffer.hpp
@@ -172,10 +172,15 @@ public:
    void TriggerNewTextNotification(const std::wstring_view newText);
    void TriggerSelection();

-    til::point GetWordStart(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional = std::nullopt) const;
-    til::point GetWordEnd(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional = std::nullopt) const;
+    til::point GetWordStart(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
+    til::point GetWordEnd(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
+
+    til::point GetWordStart2(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional = std::nullopt) const;
+    til::point GetWordEnd2(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional = std::nullopt) const;

    bool IsWordBoundary(const til::point pos, const std::wstring_view wordDelimiters) const;
+    bool MoveToNextWord(til::point& pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional = std::nullopt) const;
+    bool MoveToPreviousWord(til::point& pos, const std::wstring_view wordDelimiters) const;

    til::point GetGlyphStart(const til::point pos, std::optional<til::point> limitOptional = std::nullopt) const;
    til::point GetGlyphEnd(const til::point pos, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
@@ -283,7 +288,7 @@ public:
                       const bool isIntenseBold,
                       std::function<std::tuple<COLORREF, COLORREF, COLORREF>(const TextAttribute&)> GetAttributeColors) const noexcept;

-    void SerializeTo(HANDLE handle) const;
+    void SerializeToPath(const wchar_t* destination) const;

    struct PositionInformation
    {
@@ -310,9 +315,6 @@ public:
    void SetScrollbarData(ScrollbarData mark, til::CoordType y);
    void ManuallyMarkRowAsPrompt(til::CoordType y);

-    bool ContainsBlinkAttributeInRegion(const Microsoft::Console::Types::Viewport& region) const;
-    bool IsGlyphDoubleWidthAt(const til::point at) const;
-
 private:
    void _reserve(til::size screenBufferSize, const TextAttribute& defaultAttributes);
    void _commit(const std::byte* row);
@@ -322,13 +324,16 @@ private:
    ROW& _getRowByOffsetDirect(size_t offset);
    ROW& _getRow(til::CoordType y) const;
    til::CoordType _estimateOffsetOfLastCommittedRow() const noexcept;
-    bool _isRowCommitted(til::CoordType y) const noexcept;

    void _SetFirstRowIndex(const til::CoordType FirstRowIndex) noexcept;
    void _ExpandTextRow(til::inclusive_rect& selectionRow) const;
    DelimiterClass _GetDelimiterClassAt(const til::point pos, const std::wstring_view wordDelimiters) const;
-    til::point _GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters, const bool accessibilityMode = false) const;
-    til::point _GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters, const bool accessibilityMode = false) const;
+    til::point _GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters) const;
+    til::point _GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters) const;
+    til::point _GetWordStartForAccessibility(const til::point target, const std::wstring_view wordDelimiters) const;
+    til::point _GetWordStartForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
+    til::point _GetWordEndForAccessibility(const til::point target, const std::wstring_view wordDelimiters, const til::point limit) const;
+    til::point _GetWordEndForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
    void _PruneHyperlinks();

    std::wstring _commandForRow(const til::CoordType rowOffset, const til::CoordType bottomInclusive, const bool clipAtCursor = false) const;
--- a/src/buffer/out/ut_textbuffer/ReflowTests.cpp
+++ b/src/buffer/out/ut_textbuffer/ReflowTests.cpp
@@ -600,6 +600,90 @@ namespace
            },
        },
    };
+
+#pragma region TAEF hookup for the test case array above
+    struct ArrayIndexTaefAdapterRow : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom | Microsoft::WRL::InhibitFtmBase>, IDataRow>
+    {
+        HRESULT RuntimeClassInitialize(const size_t index)
+        {
+            _index = index;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetTestData(BSTR /*pszName*/, SAFEARRAY** ppData) override
+        {
+            const auto indexString{ wil::str_printf<std::wstring>(L"%zu", _index) };
+            auto safeArray{ SafeArrayCreateVector(VT_BSTR, 0, 1) };
+            LONG index{ 0 };
+            auto indexBstr{ wil::make_bstr(indexString.c_str()) };
+            (void)SafeArrayPutElement(safeArray, &index, indexBstr.release());
+            *ppData = safeArray;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetMetadataNames(SAFEARRAY** ppMetadataNames) override
+        {
+            *ppMetadataNames = nullptr;
+            return S_FALSE;
+        }
+
+        STDMETHODIMP GetMetadata(BSTR /*pszName*/, SAFEARRAY** ppData) override
+        {
+            *ppData = nullptr;
+            return S_FALSE;
+        }
+
+        STDMETHODIMP GetName(BSTR* ppszRowName) override
+        {
+            *ppszRowName = nullptr;
+            return S_FALSE;
+        }
+
+    private:
+        size_t _index;
+    };
+
+    struct ArrayIndexTaefAdapterSource : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom | Microsoft::WRL::InhibitFtmBase>, IDataSource>
+    {
+        STDMETHODIMP Advance(IDataRow** ppDataRow) override
+        {
+            if (_index < std::extent_v<decltype(testCases)>)
+            {
+                Microsoft::WRL::MakeAndInitialize<ArrayIndexTaefAdapterRow>(ppDataRow, _index++);
+            }
+            else
+            {
+                *ppDataRow = nullptr;
+            }
+            return S_OK;
+        }
+
+        STDMETHODIMP Reset() override
+        {
+            _index = 0;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetTestDataNames(SAFEARRAY** names) override
+        {
+            auto safeArray{ SafeArrayCreateVector(VT_BSTR, 0, 1) };
+            LONG index{ 0 };
+            auto dataNameBstr{ wil::make_bstr(L"index") };
+            (void)SafeArrayPutElement(safeArray, &index, dataNameBstr.release());
+            *names = safeArray;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetTestDataType(BSTR /*name*/, BSTR* type) override
+        {
+            *type = nullptr;
+            return S_OK;
+        }
+
+    private:
+        size_t _index{ 0 };
+    };
+#pragma endregion
 }

 extern "C" HRESULT __declspec(dllexport) __cdecl ReflowTestDataSource(IDataSource** ppDataSource, void*)
--- a/src/buffer/out/ut_textbuffer/UTextAdapterTests.cpp
+++ b/src/buffer/out/ut_textbuffer/UTextAdapterTests.cpp
@@ -34,16 +34,6 @@ class UTextAdapterTests
 {
    TEST_CLASS(UTextAdapterTests);

-    TEST_CLASS_SETUP(ClassSetup)
-    {
-        wil::unique_hmodule icu{ LoadLibraryExW(L"icu.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32) };
-        if (!icu)
-        {
-            WEX::Logging::Log::Result(WEX::Logging::TestResults::Skipped, L"ICU is not present");
-        }
-        return true;
-    }
-
    TEST_METHOD(Unicode)
    {
        DummyRenderer renderer;
--- a/src/buffer/out/ut_textbuffer/sources
+++ b/src/buffer/out/ut_textbuffer/sources
@@ -26,9 +26,6 @@ TARGETLIBS = \
    $(CONSOLE_OBJ_PATH)\types\lib\$(O)\ConTypes.lib \
    $(TARGETLIBS) \

-DELAYLOAD = \
-    icu.dll \
-
 # -------------------------------------
 # Localization
 # -------------------------------------
--- a/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
@@ -5,14 +5,12 @@

 #include "../TerminalApp/TerminalPage.h"
 #include "../UnitTests_SettingsModel/TestUtils.h"
-#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"

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

@@ -823,7 +821,7 @@ namespace TerminalAppLocalTests
            VERIFY_ARE_EQUAL(3u, command.NestedCommands().Size());
            _logCommandNames(command.NestedCommands());
            {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, profile: {}", name) };
                auto childCommand = command.NestedCommands().Lookup(childCommandName);
                VERIFY_IS_NOT_NULL(childCommand);
                auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -845,7 +843,7 @@ namespace TerminalAppLocalTests
                VERIFY_IS_FALSE(childCommand.HasNestedCommands());
            }
            {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: down, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: down, profile: {}", name) };
                auto childCommand = command.NestedCommands().Lookup(childCommandName);
                VERIFY_IS_NOT_NULL(childCommand);
                auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -867,7 +865,7 @@ namespace TerminalAppLocalTests
                VERIFY_IS_FALSE(childCommand.HasNestedCommands());
            }
            {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: right, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: right, profile: {}", name) };
                auto childCommand = command.NestedCommands().Lookup(childCommandName);
                VERIFY_IS_NOT_NULL(childCommand);
                auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -960,8 +958,8 @@ namespace TerminalAppLocalTests

        for (auto name : std::vector<std::wstring>({ L"profile0", L"profile1", L"profile2" }))
        {
-            const auto childCommandName = fmt::format(FMT_COMPILE(L"New tab, profile: {}"), name);
-            auto command = rootCommand.NestedCommands().Lookup(childCommandName);
+            winrt::hstring commandName{ fmt::format(L"New tab, profile: {}", name) };
+            auto command = rootCommand.NestedCommands().Lookup(commandName);
            VERIFY_IS_NOT_NULL(command);
            auto actionAndArgs = command.ActionAndArgs();
            VERIFY_IS_NOT_NULL(actionAndArgs);
@@ -1078,7 +1076,7 @@ namespace TerminalAppLocalTests

            _logCommandNames(command.NestedCommands());
            {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, profile: {}", name) };
                auto childCommand = command.NestedCommands().Lookup(childCommandName);
                VERIFY_IS_NOT_NULL(childCommand);
                auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -1100,7 +1098,7 @@ namespace TerminalAppLocalTests
                VERIFY_IS_FALSE(childCommand.HasNestedCommands());
            }
            {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: down, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: down, profile: {}", name) };
                auto childCommand = command.NestedCommands().Lookup(childCommandName);
                VERIFY_IS_NOT_NULL(childCommand);
                auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -1122,7 +1120,7 @@ namespace TerminalAppLocalTests
                VERIFY_IS_FALSE(childCommand.HasNestedCommands());
            }
            {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: right, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: right, profile: {}", name) };
                auto childCommand = command.NestedCommands().Lookup(childCommandName);
                VERIFY_IS_NOT_NULL(childCommand);
                auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -1421,10 +1419,10 @@ namespace TerminalAppLocalTests
            VERIFY_ARE_EQUAL(L"profile0", terminalArgs.Profile());
            VERIFY_IS_NULL(terminalArgs.Elevate());

-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
            const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(false, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(false, termSettings.Elevate());
        }
        {
            Log::Comment(L"profile.elevate=true, action.elevate=nullopt: DO auto elevate");
@@ -1444,10 +1442,10 @@ namespace TerminalAppLocalTests
            VERIFY_ARE_EQUAL(L"profile1", terminalArgs.Profile());
            VERIFY_IS_NULL(terminalArgs.Elevate());

-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
            const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(true, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(true, termSettings.Elevate());
        }
        {
            Log::Comment(L"profile.elevate=false, action.elevate=nullopt: don't auto elevate");
@@ -1467,10 +1465,10 @@ namespace TerminalAppLocalTests
            VERIFY_ARE_EQUAL(L"profile2", terminalArgs.Profile());
            VERIFY_IS_NULL(terminalArgs.Elevate());

-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
            const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(false, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(false, termSettings.Elevate());
        }

        {
@@ -1492,10 +1490,10 @@ namespace TerminalAppLocalTests
            VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
            VERIFY_IS_FALSE(terminalArgs.Elevate().Value());

-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
            const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(false, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(false, termSettings.Elevate());
        }
        {
            Log::Comment(L"profile.elevate=true, action.elevate=false: don't auto elevate");
@@ -1516,10 +1514,10 @@ namespace TerminalAppLocalTests
            VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
            VERIFY_IS_FALSE(terminalArgs.Elevate().Value());

-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
            const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(false, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(false, termSettings.Elevate());
        }
        {
            Log::Comment(L"profile.elevate=false, action.elevate=false: don't auto elevate");
@@ -1540,10 +1538,10 @@ namespace TerminalAppLocalTests
            VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
            VERIFY_IS_FALSE(terminalArgs.Elevate().Value());

-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
            const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(false, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(false, termSettings.Elevate());
        }

        {
@@ -1565,10 +1563,10 @@ namespace TerminalAppLocalTests
            VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
            VERIFY_IS_TRUE(terminalArgs.Elevate().Value());

-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
            const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(true, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(true, termSettings.Elevate());
        }
        {
            Log::Comment(L"profile.elevate=true, action.elevate=true: DO auto elevate");
@@ -1588,10 +1586,10 @@ namespace TerminalAppLocalTests
            VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
            VERIFY_IS_TRUE(terminalArgs.Elevate().Value());

-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
            const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(true, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(true, termSettings.Elevate());
        }
        {
            Log::Comment(L"profile.elevate=false, action.elevate=true: DO auto elevate");
@@ -1612,10 +1610,10 @@ namespace TerminalAppLocalTests
            VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
            VERIFY_IS_TRUE(terminalArgs.Elevate().Value());

-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, nullptr);
            const auto termSettings = termSettingsResult.DefaultSettings();
-            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings->Commandline());
-            VERIFY_ARE_EQUAL(true, termSettings->Elevate());
+            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(true, termSettings.Elevate());
        }
    }

--- a/src/cascadia/LocalTests_TerminalApp/TabTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/TabTests.cpp
@@ -66,6 +66,7 @@ namespace TerminalAppLocalTests
        // can help you identify if something much lower in the stack has
        // failed.
        TEST_METHOD(EnsureTestsActivate);
+        TEST_METHOD(TryCreateSettingsType);
        TEST_METHOD(TryCreateConnectionType);
        TEST_METHOD(TryCreateXamlObjects);

@@ -130,12 +131,23 @@ namespace TerminalAppLocalTests
        VERIFY_IS_TRUE(true);
    }

+    void TabTests::TryCreateSettingsType()
+    {
+        // Verify we can create a WinRT type we authored
+        // Just creating it is enough to know that everything is working.
+        TerminalSettings settings;
+        VERIFY_IS_NOT_NULL(settings);
+    }
+
    void TabTests::TryCreateConnectionType()
    {
        // Verify we can create a WinRT type we authored
        // Just creating it is enough to know that everything is working.
        winrt::Microsoft::Terminal::TerminalConnection::EchoConnection conn{};
        VERIFY_IS_NOT_NULL(conn);
+        // We're doing this test separately from the TryCreateSettingsType test,
+        // to ensure both dependent binaries (TerminalSettings and
+        // TerminalConnection) both work individually.
    }

    void TabTests::TryCreateXamlObjects()
@@ -347,10 +359,6 @@ namespace TerminalAppLocalTests

    void TabTests::TryDuplicateBadTab()
    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
        // * Create a tab with a profile with GUID 1
        // * Reload the settings so that GUID 1 is no longer in the list of profiles
        // * Try calling _DuplicateFocusedTab on tab 1
@@ -438,10 +446,6 @@ namespace TerminalAppLocalTests

    void TabTests::TryDuplicateBadPane()
    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
        // * Create a tab with a profile with GUID 1
        // * Reload the settings so that GUID 1 is no longer in the list of profiles
        // * Try calling _SplitPane(Duplicate) on tab 1
@@ -693,7 +697,6 @@ namespace TerminalAppLocalTests
    {
        BEGIN_TEST_METHOD_PROPERTIES()
            TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
        END_TEST_METHOD_PROPERTIES()

        auto page = _commonSetup();
@@ -733,10 +736,6 @@ namespace TerminalAppLocalTests

    void TabTests::MoveFocusFromZoomedPane()
    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
        auto page = _commonSetup();

        Log::Comment(L"Create a second pane");
@@ -782,10 +781,6 @@ namespace TerminalAppLocalTests

    void TabTests::CloseZoomedPane()
    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
        auto page = _commonSetup();

        Log::Comment(L"Create a second pane");
@@ -841,10 +836,6 @@ namespace TerminalAppLocalTests

    void TabTests::SwapPanes()
    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
        auto page = _commonSetup();

        Log::Comment(L"Setup 4 panes.");
@@ -1051,10 +1042,6 @@ namespace TerminalAppLocalTests

    void TabTests::NextMRUTab()
    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
        // This is a test for GH#8025 - we want to make sure that we can do both
        // in-order and MRU tab traversal, using the tab switcher and with the
        // tab switcher disabled.
@@ -1171,10 +1158,6 @@ namespace TerminalAppLocalTests

    void TabTests::VerifyCommandPaletteTabSwitcherOrder()
    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
        // This is a test for GH#8188 - we want to make sure that the order of tabs
        // is preserved in the CommandPalette's TabSwitcher

@@ -1270,7 +1253,6 @@ namespace TerminalAppLocalTests
    {
        BEGIN_TEST_METHOD_PROPERTIES()
            TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
        END_TEST_METHOD_PROPERTIES()

        auto page = _commonSetup();
@@ -1303,7 +1285,6 @@ namespace TerminalAppLocalTests
    {
        BEGIN_TEST_METHOD_PROPERTIES()
            TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
        END_TEST_METHOD_PROPERTIES()

        auto page = _commonSetup();
@@ -1325,32 +1306,21 @@ namespace TerminalAppLocalTests
        });
    }

-    static til::color _getControlBackgroundColor(winrt::TerminalApp::implementation::ContentManager* contentManager,
-                                                 const winrt::Microsoft::Terminal::Control::TermControl& c)
-    {
-        auto interactivity{ contentManager->TryLookupCore(c.ContentId()) };
-        VERIFY_IS_NOT_NULL(interactivity);
-        const auto core{ interactivity.Core() };
-        return til::color{ core.BackgroundColor() };
-    }
-
    void TabTests::TestPreviewCommitScheme()
    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
        Log::Comment(L"Preview a color scheme. Make sure it's applied, then committed accordingly");

        auto page = _commonSetup();
        VERIFY_IS_NOT_NULL(page);

-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
            const auto& activeControl{ page->_GetActiveControl() };
            VERIFY_IS_NOT_NULL(activeControl);

-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, backgroundColor);
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
+            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
        });

        TestOnUIThread([&page]() {
@@ -1360,13 +1330,15 @@ namespace TerminalAppLocalTests
            page->_PreviewAction(actionAndArgs);
        });

-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
            const auto& activeControl{ page->_GetActiveControl() };
            VERIFY_IS_NOT_NULL(activeControl);

+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
            Log::Comment(L"Color should be changed to the preview");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });

            // And we should have stored a function to revert the change.
            VERIFY_ARE_EQUAL(1u, page->_restorePreviewFuncs.size());
@@ -1380,13 +1352,15 @@ namespace TerminalAppLocalTests
            page->_HandleSetColorScheme(nullptr, ActionEventArgs{ args });
        });

-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
            const auto& activeControl{ page->_GetActiveControl() };
            VERIFY_IS_NOT_NULL(activeControl);

+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
            Log::Comment(L"Color should be changed");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });

            // After preview there should be no more restore functions to execute.
            VERIFY_ARE_EQUAL(0u, page->_restorePreviewFuncs.size());
@@ -1402,21 +1376,19 @@ namespace TerminalAppLocalTests

    void TabTests::TestPreviewDismissScheme()
    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
        Log::Comment(L"Preview a color scheme. Make sure it's applied, then dismissed accordingly");

        auto page = _commonSetup();
        VERIFY_IS_NOT_NULL(page);

-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
            const auto& activeControl{ page->_GetActiveControl() };
            VERIFY_IS_NOT_NULL(activeControl);

-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, backgroundColor);
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
+            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
        });

        TestOnUIThread([&page]() {
@@ -1426,13 +1398,15 @@ namespace TerminalAppLocalTests
            page->_PreviewAction(actionAndArgs);
        });

-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
            const auto& activeControl{ page->_GetActiveControl() };
            VERIFY_IS_NOT_NULL(activeControl);

+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
            Log::Comment(L"Color should be changed to the preview");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
        });

        TestOnUIThread([&page]() {
@@ -1440,13 +1414,15 @@ namespace TerminalAppLocalTests
            page->_EndPreview();
        });

-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
            const auto& activeControl{ page->_GetActiveControl() };
            VERIFY_IS_NOT_NULL(activeControl);

+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
            Log::Comment(L"Color should be the same as it originally was");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
        });
        Log::Comment(L"Sleep to let events propagate");
        Sleep(250);
@@ -1454,10 +1430,6 @@ namespace TerminalAppLocalTests

    void TabTests::TestPreviewSchemeWhilePreviewing()
    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
        Log::Comment(L"Preview a color scheme, then preview another scheme. ");

        Log::Comment(L"Preview a color scheme. Make sure it's applied, then committed accordingly");
@@ -1465,12 +1437,14 @@ namespace TerminalAppLocalTests
        auto page = _commonSetup();
        VERIFY_IS_NOT_NULL(page);

-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
            const auto& activeControl{ page->_GetActiveControl() };
            VERIFY_IS_NOT_NULL(activeControl);

-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, backgroundColor);
+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
+            VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
        });

        TestOnUIThread([&page]() {
@@ -1479,13 +1453,15 @@ namespace TerminalAppLocalTests
            page->_PreviewColorScheme(args);
        });

-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
            const auto& activeControl{ page->_GetActiveControl() };
            VERIFY_IS_NOT_NULL(activeControl);

+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
            Log::Comment(L"Color should be changed to the preview");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
        });

        TestOnUIThread([&page]() {
@@ -1494,13 +1470,15 @@ namespace TerminalAppLocalTests
            page->_PreviewColorScheme(args);
        });

-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
            const auto& activeControl{ page->_GetActiveControl() };
            VERIFY_IS_NOT_NULL(activeControl);

+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
            Log::Comment(L"Color should be changed to the preview");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, til::color{ controlSettings.DefaultBackground() });
        });

        TestOnUIThread([&page]() {
@@ -1511,13 +1489,15 @@ namespace TerminalAppLocalTests
            page->_HandleSetColorScheme(nullptr, ActionEventArgs{ args });
        });

-        TestOnUIThread([&page, this]() {
+        TestOnUIThread([&page]() {
            const auto& activeControl{ page->_GetActiveControl() };
            VERIFY_IS_NOT_NULL(activeControl);

+            const auto& controlSettings = activeControl.Settings();
+            VERIFY_IS_NOT_NULL(controlSettings);
+
            Log::Comment(L"Color should be changed");
-            const auto backgroundColor{ _getControlBackgroundColor(_contentManager.get(), activeControl) };
-            VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, backgroundColor);
+            VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, til::color{ controlSettings.DefaultBackground() });
        });
        Log::Comment(L"Sleep to let events propagate");
        Sleep(250);
@@ -1525,10 +1505,6 @@ namespace TerminalAppLocalTests

    void TabTests::TestClampSwitchToTab()
    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
-        END_TEST_METHOD_PROPERTIES()
-
        Log::Comment(L"Test that switching to a tab index higher than the number of tabs just clamps to the last tab.");

        auto page = _commonSetup();
--- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
+++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
@@ -60,9 +60,6 @@
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalApp\dll\TerminalApp.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsAppAdapterLib\TerminalSettingsAppAdapterLib.vcxproj">
-      <Project>{3c46e2b0-ae6c-4132-9122-6772fb411959}</Project>
-    </ProjectReference>
  </ItemGroup>

  <!-- ========================= Globals ======================== -->
--- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
+++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
@@ -22,7 +22,6 @@
    <VcpkgAutoLink>false</VcpkgAutoLink>

    <TerminalMUX>true</TerminalMUX>
-    <TerminalThemeHelpers>true</TerminalThemeHelpers>

    <!--
    These two properties are very important!
@@ -115,9 +114,6 @@
      <Project>{CA5CAD1A-082C-4476-9F33-94B339494076}</Project>
    </ProjectReference>

-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\UIHelpers\UIHelpers.vcxproj">
-      <Project>{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}</Project>
-    </ProjectReference>
  </ItemGroup>

  <PropertyGroup>
--- a/src/cascadia/Remoting/Resources/sr-Cyrl-RS/Resources.resw
+++ b/src/cascadia/Remoting/Resources/sr-Cyrl-RS/Resources.resw
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    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
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <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
-    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
-    mimetype set.
-
-    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
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    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
-            : 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
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/src/cascadia/ShellExtension/OpenTerminalHere.h
+++ b/src/cascadia/ShellExtension/OpenTerminalHere.h
@@ -34,7 +34,7 @@ struct
 #else // DEV
    __declspec(uuid("52065414-e077-47ec-a3ac-1cc5455e1b54"))
 #endif
-    OpenTerminalHere : public RuntimeClass<RuntimeClassFlags<ClassicCom | InhibitFtmBase>, IExplorerCommand, IObjectWithSite>
+        OpenTerminalHere : public RuntimeClass<RuntimeClassFlags<ClassicCom | InhibitFtmBase>, IExplorerCommand, IObjectWithSite>
 {
 #pragma region IExplorerCommand
    STDMETHODIMP Invoke(IShellItemArray* psiItemArray,
--- a/src/cascadia/TerminalApp/AboutDialog.cpp
+++ b/src/cascadia/TerminalApp/AboutDialog.cpp
@@ -6,6 +6,7 @@
 #include "AboutDialog.h"
 #include "AboutDialog.g.cpp"

+#include <LibraryResources.h>
 #include <WtExeUtils.h>

 #include "../../types/inc/utils.hpp"
--- a/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp
+++ b/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp
@@ -5,7 +5,8 @@
 #include "TerminalPage.h"
 #include "Utils.h"
 #include "../../types/inc/utils.hpp"
-#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
+
+#include <LibraryResources.h>

 using namespace winrt;
 using namespace winrt::Windows::Foundation::Collections;
@@ -96,19 +97,24 @@ namespace winrt::TerminalApp::implementation
    {
        if (const auto& scheme{ _settings.GlobalSettings().ColorSchemes().TryLookup(args.SchemeName()) })
        {
-            // Clear the saved preview funcs because we don't need to add a restore each time
-            // the preview color changes, we only need to be able to restore the last one.
-            _restorePreviewFuncs.clear();
+            const auto backup = _restorePreviewFuncs.empty();

            _ApplyToActiveControls([&](const auto& control) {
-                auto temporarySettings{ winrt::make_self<Settings::TerminalSettings>() };
-                temporarySettings->ApplyColorScheme(scheme);
-                control.ApplyPreviewColorScheme(temporarySettings.try_as<winrt::Microsoft::Terminal::Core::ICoreScheme>());
+                // Stash a copy of the current scheme.
+                auto originalScheme{ control.ColorScheme() };

-                // Take a copy of the inputs, since they are pointers anyways.
-                _restorePreviewFuncs.emplace_back([=]() {
-                    control.ResetPreviewColorScheme();
-                });
+                // Apply the new scheme.
+                control.ColorScheme(scheme.ToCoreScheme());
+
+                if (backup)
+                {
+                    // Each control will emplace a revert into the
+                    // _restorePreviewFuncs for itself.
+                    _restorePreviewFuncs.emplace_back([=]() {
+                        // On dismiss, restore the original scheme.
+                        control.ColorScheme(originalScheme);
+                    });
+                }
            });
        }
    }
--- a/src/cascadia/TerminalApp/App.xaml
+++ b/src/cascadia/TerminalApp/App.xaml
@@ -192,7 +192,7 @@
                                            ResourceKey="TabViewBackground" />

                            <SolidColorBrush x:Key="SettingsUiTabBrush"
-                                             Color="#282828" />
+                                             Color="#0c0c0c" />

                            <SolidColorBrush x:Key="BroadcastPaneBorderColor"
                                             Color="{StaticResource SystemAccentColorDark2}" />
@@ -211,7 +211,7 @@
                                            ResourceKey="TabViewBackground" />

                            <SolidColorBrush x:Key="SettingsUiTabBrush"
-                                             Color="#F9F9F9" />
+                                             Color="#ffffff" />

                            <SolidColorBrush x:Key="BroadcastPaneBorderColor"
                                             Color="{StaticResource SystemAccentColorLight2}" />
@@ -234,7 +234,7 @@
                                            ResourceKey="SystemColorButtonFaceColorBrush" />

                            <StaticResource x:Key="SettingsUiTabBrush"
-                                            ResourceKey="SystemColorWindowBrush" />
+                                            ResourceKey="SystemControlBackgroundBaseLowBrush" />

                            <SolidColorBrush x:Key="BroadcastPaneBorderColor"
                                             Color="{StaticResource SystemColorHighlightColor}" />
--- a/src/cascadia/TerminalApp/AppActionHandlers.cpp
+++ b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -8,7 +8,6 @@
 #include "ScratchpadContent.h"
 #include "../WinRTUtils/inc/WtExeUtils.h"
 #include "../../types/inc/utils.hpp"
-#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
 #include "Utils.h"

 using namespace winrt::Windows::ApplicationModel::DataTransfer;
@@ -669,10 +668,8 @@ namespace winrt::TerminalApp::implementation
        {
            if (const auto scheme = _settings.GlobalSettings().ColorSchemes().TryLookup(realArgs.SchemeName()))
            {
-                auto temporarySettings{ winrt::make_self<Settings::TerminalSettings>() };
-                temporarySettings->ApplyColorScheme(scheme);
                const auto res = _ApplyToActiveControls([&](auto& control) {
-                    control.SetOverrideColorScheme(temporarySettings.try_as<winrt::Microsoft::Terminal::Core::ICoreScheme>());
+                    control.ColorScheme(scheme.ToCoreScheme());
                });
                args.Handled(res);
            }
@@ -917,7 +914,7 @@ namespace winrt::TerminalApp::implementation
        // Build the commandline to pass to wt for this set of NewTerminalArgs
        // `-w -1` will ensure a new window is created.
        const auto commandline = terminalArgs.ToCommandline();
-        const auto cmdline = fmt::format(FMT_COMPILE(L"-w -1 new-tab {}"), commandline);
+        winrt::hstring cmdline{ fmt::format(FMT_COMPILE(L"-w -1 new-tab {}"), commandline) };

        // Build the args to ShellExecuteEx. We need to use ShellExecuteEx so we
        // can pass the SEE_MASK_NOASYNC flag. That flag allows us to safely
@@ -1475,7 +1472,7 @@ namespace winrt::TerminalApp::implementation
                                      WI_IsAnyFlagSet(source, SuggestionsSource::CommandHistory | SuggestionsSource::QuickFixes);
        if (const auto& control{ _GetActiveControl() })
        {
-            currentWorkingDirectory = control.WorkingDirectory();
+            currentWorkingDirectory = control.CurrentWorkingDirectory();

            if (shouldGetContext)
            {
--- a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
+++ b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp
@@ -5,6 +5,7 @@
 #include "AppCommandlineArgs.h"
 #include "../types/inc/utils.hpp"
 #include "TerminalSettingsModel/ModelSerializationHelpers.h"
+#include <LibraryResources.h>

 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace TerminalApp;
--- a/src/cascadia/TerminalApp/AppLogic.cpp
+++ b/src/cascadia/TerminalApp/AppLogic.cpp
@@ -6,6 +6,7 @@
 #include "AppLogic.g.cpp"
 #include "SettingsLoadEventArgs.h"

+#include <LibraryResources.h>
 #include <WtExeUtils.h>
 #include <wil/token_helpers.h>

--- a/src/cascadia/TerminalApp/ColorPickupFlyout.cpp
+++ b/src/cascadia/TerminalApp/ColorPickupFlyout.cpp
@@ -1,6 +1,7 @@
 #include "pch.h"
 #include "ColorPickupFlyout.h"
 #include "ColorPickupFlyout.g.cpp"
+#include <LibraryResources.h>

 namespace winrt::TerminalApp::implementation
 {
--- a/src/cascadia/TerminalApp/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -4,6 +4,7 @@
 #include "pch.h"
 #include "CommandPalette.h"
 #include "CommandPaletteItems.h"
+#include <LibraryResources.h>

 #include "CommandPalette.g.cpp"

--- a/Show More
+++ b/Show More