Update bot to replace Area-AtlasEngine w/ Area-Rendering

2026-05-21 06:18:34 +00:00 · 2026-01-21 12:49:04 -08:00
269 changed files with 3089 additions and 7794 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/expect.txt
+++ b/.github/actions/spelling/expect/expect.txt
@@ -256,6 +256,7 @@ conterm
 contsf
 contypes
 conwinuserrefs
+coordnew
 COPYCOLOR
 COPYDATA
 COPYDATASTRUCT
@@ -621,6 +622,7 @@ fuzzmap
 fuzzwrapper
 fwdecl
 fwe
+fwlink
 fzf
 gci
 gcx
@@ -864,7 +866,6 @@ KILLACTIVE
 KILLFOCUS
 kinda
 KIYEOK
-KKP
 KLF
 KLMNO
 KOK
@@ -884,7 +885,6 @@ LBUTTONDOWN
 LBUTTONUP
 lcb
 lci
-LCMAP
 LCONTROL
 LCTRL
 lcx
--- a/.github/policies/resourceManagement.yml
+++ b/.github/policies/resourceManagement.yml
@@ -89,6 +89,19 @@ configuration:
          label: No-Recent-Activity
      - addReply:
          reply: This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**.
+    - description: Replace "Area-AtlasEngine" label with "Area-Rendering"
+      frequencies:
+      - hourly:
+          hour: 3
+      filters:
+      - isIssue
+      - hasLabel:
+          label: Area-AtlasEngine
+      actions:
+      - removeLabel:
+          label: Area-AtlasEngine
+      - addLabel:
+          label: Area-Rendering
    eventResponderTasks:
    - description: Add "Needs-Triage" to new issues
      if:
--- 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ĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøō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ĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøō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ĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!

-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml
@@ -56,11 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġга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,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġга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,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

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

-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- 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>release-1.25</PGOBranch>
+    <PGOBranch>main</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/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
@@ -50,7 +50,6 @@ stages:
          buildEverything: true
          pgoBuildMode: Instrument
          artifactStem: -instrumentation
-          keepAllExpensiveBuildOutputs: false # the ARM64 build agent runs out of memory downloading the artifacts...

  - stage: RunPGO
    displayName: Run PGO
--- 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
--- a/build/pipelines/templates-v2/job-pgo-build-nuget-and-publish.yml
+++ b/build/pipelines/templates-v2/job-pgo-build-nuget-and-publish.yml
@@ -26,7 +26,6 @@ jobs:
    pgoToolsPath: $(Build.SourcesDirectory)\build\PGO
    nuspecPath: $(pgoToolsPath)\NuSpecs
    nuspecFilename: PGO.nuspec
-    nugetFeed: "https://pkgs.dev.azure.com/shine-oss/terminal/_packaging/TerminalDependencies/nuget/v3/index.json"

  steps:
  - checkout: self
@@ -46,8 +45,7 @@ jobs:

  - task: NuGetAuthenticate@1
    inputs:
-      azureDevOpsServiceConnection: 'Terminal Public Artifact Feed'
-      feedUrl: $(nugetFeed)
+      nuGetServiceConnections: 'Terminal Public Artifact Feed'

  # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
  # This should be `task: NuGetCommand@2`
@@ -70,7 +68,15 @@ jobs:
    artifact: pgo-nupkg-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
    displayName: "Publish Pipeline Artifact"

-  - pwsh: |-
-      $nupkg = Get-Item "$(Build.ArtifactStagingDirectory)/*.nupkg"
-      & nuget push -ApiKey az -Source "$(nugetFeed)" "$nupkg"
-    displayName: NuGet push
+  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+    displayName: 'NuGet push'
+    inputs:
+      command: push
+      nuGetFeedType: external
+      packagesToPush: $(Build.ArtifactStagingDirectory)/*.nupkg
+      # The actual URL and PAT for this feed is configured at
+      # https://microsoft.visualstudio.com/Dart/_settings/adminservices
+      # This is the name of that connection
+      publishFeedCredentials: 'Terminal Public Artifact Feed'
+      feedsToUse: config
+      nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.config'
--- a/build/pipelines/templates-v2/job-run-pgo-tests.yml
+++ b/build/pipelines/templates-v2/job-run-pgo-tests.yml
@@ -45,10 +45,6 @@ jobs:
    displayName: Extract the unpackaged build for PGO

  - template: steps-ensure-nuget-version.yml
-    parameters:
-      ${{ if eq(parameters.buildPlatform, 'arm64') }}:
-        # The ARM64 agents do not seem to have NuGet installed
-        forceNugetInstallation: true

  - powershell: |-
      $Package = 'Microsoft.Internal.Windows.Terminal.TestContent'
--- a/build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml
+++ b/build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml
@@ -210,8 +210,6 @@ extends:
                  ob_createvpack_taskLogVerbosity: Detailed
                  ob_createvpack_verbose: true
                  ob_createvpack_vpackdirectory: '$(JobOutputDirectory)\vpack'
-                  ob_createvpack_versionAs: string
-                  ob_createvpack_version: '$(XES_APPXMANIFESTVERSION)'
                  ob_updateOSManifest_gitcheckinConfigPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
                  # We're skipping the 'fetch' part of the OneBranch rules, but that doesn't mean
                  # that it doesn't expect to have downloaded a manifest directly to some 'destination'
--- a/build/pipelines/templates-v2/steps-ensure-nuget-version.yml
+++ b/build/pipelines/templates-v2/steps-ensure-nuget-version.yml
@@ -1,10 +1,5 @@
-parameters:
-  - name: forceNugetInstallation
-    type: boolean
-    default: false
-
 steps:
- ${{ if and(ne(parameters.forceNugetInstallation, true), eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564')) }}:
+- ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
  - pwsh: |-
      Write-Host "Assuming NuGet is already installed..."
      & nuget.exe help
@@ -12,6 +7,6 @@ steps:

 - ${{ else }}:
  - task: NuGetToolInstaller@1
-    displayName: Use NuGet 7.0.1
+    displayName: Use NuGet 6.6.1
    inputs:
-      versionSpec: 7.0.1
+      versionSpec: 6.6.1
--- a/custom.props
+++ b/custom.props
@@ -3,7 +3,7 @@
  <!-- 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>25</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
--- 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/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.",
--- 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/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/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/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -928,17 +928,6 @@ namespace winrt::TerminalApp::implementation
    void CommandPalette::_filterTextChanged(const IInspectable& /*sender*/,
                                            const Windows::UI::Xaml::RoutedEventArgs& /*args*/)
    {
-        // GH#18737: Only respond to this change if we are visible:
-        // _close calls _searchBox().Text(L"") to reset the search text, which lands us
-        // in here after the command palette is dismissed. Since we have a code path here that
-        // could potentially lead to an action being previewed (specifically if there is a
-        // preview-able action as the first entry in the command list), that preview will
-        // appear after the palette is dismissed without this check.
-        if (Visibility() != Visibility::Visible)
-        {
-            return;
-        }
-
        // When we are executing the _SelectNextTab in the TabManagement.cpp, this method
        // is getting triggered because we set up the default value for that CommandPalette
        // with an empty string. Therefore, to avoid the reset of the index when executing
--- a/src/cascadia/TerminalApp/DebugTapConnection.h
+++ b/src/cascadia/TerminalApp/DebugTapConnection.h
@@ -13,7 +13,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
    {
    public:
        explicit DebugTapConnection(Microsoft::Terminal::TerminalConnection::ITerminalConnection wrappedConnection);
-        void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/) {};
+        void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/){};
        ~DebugTapConnection();
        void Start();
        void WriteInput(const winrt::array_view<const char16_t> data);
--- a/src/cascadia/TerminalApp/MarkdownPaneContent.h
+++ b/src/cascadia/TerminalApp/MarkdownPaneContent.h
@@ -25,7 +25,7 @@ namespace winrt::TerminalApp::implementation
 #pragma region IPaneContent
        winrt::Windows::UI::Xaml::FrameworkElement GetRoot();

-        void UpdateSettings(const winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings&) {};
+        void UpdateSettings(const winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings&){};

        winrt::Windows::Foundation::Size MinimumSize() { return { 1, 1 }; };
        void Focus(winrt::Windows::UI::Xaml::FocusState reason = winrt::Windows::UI::Xaml::FocusState::Programmatic) { reason; };
--- a/src/cascadia/TerminalApp/Resources/sr-Cyrl-RS/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/sr-Cyrl-RS/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@@ -118,7 +118,7 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <data name="InitialJsonParseErrorText" xml:space="preserve">
-    <value>Подешавања нису могла да се учитају из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
+    <value>Подешавања нису могла да се учитау из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
  </data>
  <data name="MissingDefaultProfileText" xml:space="preserve">
    <value>У листи профила није могао да се пронађе ваш подразумевани профил - користи се први профил. Проверите да ли се "defaultProfile" подудара са GUID неког од ваших профила.</value>
@@ -141,7 +141,7 @@
    <value>Подешавања нису могла поново да се учитају из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
  </data>
  <data name="UsingDefaultSettingsText" xml:space="preserve">
-    <value>Привремено се користе подразумевана подешавања апликације Windows Терминал.</value>
+    <value>Привремено се користе подразумевана подешавања Windows Терминала.</value>
  </data>
  <data name="InitialJsonParseErrorTitle" xml:space="preserve">
    <value>Није успело учитавање подешавања</value>
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>Наишло се на грешке током учитавања корисничких подешавања</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>ОК</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Упозорење:</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>„{0}” се не извршава на вашој машини. Због тога Терминал можда неће моћи да прима улаз са тастатуре.</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -159,12 +165,28 @@
  <data name="ReloadJsonParseErrorTitle" xml:space="preserve">
    <value>Није успело поновно учитавање подешавања</value>
  </data>
+  <data name="FeedbackUriValue" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2125419</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
  <data name="AboutMenuItem" xml:space="preserve">
    <value>О програму</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Повратне информације</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>Подешавања</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Откажи</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Затвори све</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Напусти</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>Више панела</value>
  </data>
@@ -271,6 +293,17 @@
    <value>• Наведена "theme" није пронађена у листи тема. Привремено се употребљава подразумевана вредност.</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>Особина "globals" је застарела - ваша подешавања би требало да се ажурирају. </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefUrl" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2128258</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>За више информација, погледајте следећу веб страницу.</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>Није успело развијање команде којој је постављено "iterateOn". Ова команда ће се игнорисати.</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +484,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>Ctrl+Клик да отворите као администратор</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Затвори</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Затвори</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>Затвори</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Увећај</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Умањи</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Умањи</value>
  </data>
@@ -476,6 +518,10 @@
    <value>Верзија:</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Брзи почетак</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>Изворни кôд</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -554,7 +600,7 @@
    <value>Откуцајте име команде...</value>
  </data>
  <data name="CommandPalette_NoMatchesText.Text" xml:space="preserve">
-    <value>Ниједна команда се не подудара</value>
+    <value>Нема команди које се подударају</value>
  </data>
  <data name="CommandPaletteModeAnnouncement_ActionMode" xml:space="preserve">
    <value>Акција режим претраге</value>
@@ -751,9 +797,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>Извези текст</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>Није успео извоз садржаја терминала</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Успешно је извезен садржај терминала</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>Пронађи</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Чисти текст</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>Понашање при прекиду извршавања може да се подеси у напредним подешавањима профила.</value>
  </data>
@@ -859,6 +914,10 @@
    <value>Картица "{0}" је премештена на позицију "{1}"</value>
    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Активни панел је премештен у картицу "{0}" у прозору "{1}"</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>Активни панел је премештен у прозор "{0}"</value>
    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
--- a/src/cascadia/TerminalApp/Tab.cpp
+++ b/src/cascadia/TerminalApp/Tab.cpp
@@ -1114,7 +1114,7 @@ namespace winrt::TerminalApp::implementation
            [dispatcher, weakThis](auto&&, auto&&) -> safe_void_coroutine {
                const auto weakThisCopy = weakThis;
                co_await wil::resume_foreground(dispatcher);
-                if (auto tab{ weakThisCopy.get() })
+                if (auto tab{ weakThis.get() })
                {
                    tab->_RecalculateAndApplyReadOnly();
                }
--- a/src/cascadia/TerminalApp/TaskbarState.cpp
+++ b/src/cascadia/TerminalApp/TaskbarState.cpp
@@ -9,7 +9,7 @@ namespace winrt::TerminalApp::implementation
 {
    // Default to unset, 0%.
    TaskbarState::TaskbarState() :
-        TaskbarState(0, 0) {};
+        TaskbarState(0, 0){};

    TaskbarState::TaskbarState(const uint64_t dispatchTypesState, const uint64_t progressParam) :
        _State{ dispatchTypesState },
--- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
+++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
@@ -134,7 +134,7 @@
    </ClInclude>
    <ClInclude Include="FilteredCommand.h" />
    <ClInclude Include="Pane.h" />
-    <ClInclude Include="../fzf/fzf.h" />
+    <ClInclude Include="fzf/fzf.h" />
    <ClInclude Include="pch.h" />
    <ClInclude Include="ShortcutActionDispatch.h">
      <DependentUpon>ShortcutActionDispatch.idl</DependentUpon>
@@ -204,7 +204,7 @@
    <ClCompile Include="Tab.cpp">
      <DependentUpon>Tab.idl</DependentUpon>
    </ClCompile>
-    <ClCompile Include="../fzf/fzf.cpp" />
+    <ClCompile Include="fzf/fzf.cpp" />
    <ClCompile Include="TaskbarState.cpp">
      <DependentUpon>TaskbarState.idl</DependentUpon>
    </ClCompile>
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -38,6 +38,7 @@ using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Windows::ApplicationModel::DataTransfer;
 using namespace winrt::Windows::Foundation::Collections;
 using namespace winrt::Windows::System;
+using namespace winrt::Windows::System;
 using namespace winrt::Windows::UI;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::UI::Text;
@@ -1482,9 +1483,6 @@ namespace winrt::TerminalApp::implementation
                return {};
            }
        }();
-        static const auto ambiguousIsWide = [&]() -> bool {
-            return _settings.GlobalSettings().AmbiguousWidth() == AmbiguousWidth::Wide;
-        }();

        TerminalConnection::ITerminalConnection connection{ nullptr };

@@ -1550,10 +1548,6 @@ namespace winrt::TerminalApp::implementation
        {
            valueSet.Insert(L"textMeasurement", Windows::Foundation::PropertyValue::CreateString(textMeasurement));
        }
-        if (ambiguousIsWide)
-        {
-            valueSet.Insert(L"ambiguousIsWide", Windows::Foundation::PropertyValue::CreateBoolean(true));
-        }

        if (const auto id = settings.SessionId(); id != winrt::guid{})
        {
@@ -2948,7 +2942,7 @@ namespace winrt::TerminalApp::implementation
    // - Does some of this in a background thread, as to not hang/crash the UI thread.
    // Arguments:
    // - eventArgs: the PasteFromClipboard event sent from the TermControl
-    safe_void_coroutine TerminalPage::_PasteFromClipboardHandler(const IInspectable sender, const PasteFromClipboardEventArgs eventArgs)
+    safe_void_coroutine TerminalPage::_PasteFromClipboardHandler(const IInspectable /*sender*/, const PasteFromClipboardEventArgs eventArgs)
    try
    {
        // The old Win32 clipboard API as used below is somewhere in the order of 300-1000x faster than
@@ -2957,7 +2951,6 @@ namespace winrt::TerminalApp::implementation
        const auto dispatcher = Dispatcher();
        const auto globalSettings = _settings.GlobalSettings();
        const auto bracketedPaste = eventArgs.BracketedPasteEnabled();
-        const auto sourceId = sender.try_as<ControlInteractivity>().Id();

        // GetClipboardData might block for up to 30s for delay-rendered contents.
        co_await winrt::resume_background();
@@ -3055,30 +3048,7 @@ namespace winrt::TerminalApp::implementation
        // This will end up calling ConptyConnection::WriteInput which calls WriteFile which may block for
        // an indefinite amount of time. Avoid freezes and deadlocks by running this on a background thread.
        assert(!dispatcher.HasThreadAccess());
-        eventArgs.HandleClipboardData(text);
-
-        // GH#18821: If broadcast input is active, paste the same text into all other
-        // panes on the tab. We do this here (rather than re-reading the
-        // clipboard per-pane) so that only one paste warning is shown.
-        co_await wil::resume_foreground(dispatcher);
-        if (const auto strongThis = weakThis.get())
-        {
-            if (const auto& tab{ strongThis->_GetFocusedTabImpl() })
-            {
-                if (tab->TabStatus().IsInputBroadcastActive())
-                {
-                    tab->GetRootPane()->WalkTree([&](auto&& pane) {
-                        if (const auto control = pane->GetTerminalControl())
-                        {
-                            if (control.ContentId() != sourceId && !control.ReadOnly())
-                            {
-                                control.RawWriteString(text);
-                            }
-                        }
-                    });
-                }
-            }
-        }
+        eventArgs.HandleClipboardData(std::move(text));
    }
    CATCH_LOG();

@@ -3388,6 +3358,24 @@ namespace winrt::TerminalApp::implementation
    // - Paste text from the Windows Clipboard to the focused terminal
    void TerminalPage::_PasteText()
    {
+        // First, check if we're in broadcast input mode. If so, let's tell all
+        // the controls to paste.
+        if (const auto& tab{ _GetFocusedTabImpl() })
+        {
+            if (tab->TabStatus().IsInputBroadcastActive())
+            {
+                tab->GetRootPane()->WalkTree([](auto&& pane) {
+                    if (auto control = pane->GetTerminalControl())
+                    {
+                        control.PasteTextFromClipboard();
+                    }
+                });
+                return;
+            }
+        }
+
+        // The focused tab wasn't in broadcast mode. No matter. Just ask the
+        // current one to paste.
        if (const auto& control{ _GetActiveControl() })
        {
            control.PasteTextFromClipboard();
@@ -4104,12 +4092,12 @@ namespace winrt::TerminalApp::implementation
    {
        constexpr auto lightnessThreshold = 0.6f;
        // TODO GH#3327: Look at what to do with the tab button when we have XAML theming
-        const auto isBrightColor = ColorFix::GetLightness(color) >= lightnessThreshold;
+        const auto IsBrightColor = ColorFix::GetLightness(color) >= lightnessThreshold;
        const auto isLightAccentColor = ColorFix::GetLightness(accentColor) >= lightnessThreshold;
        const auto hoverColorAdjustment = isLightAccentColor ? -0.05f : 0.05f;
        const auto pressedColorAdjustment = isLightAccentColor ? -0.1f : 0.1f;

-        const auto foregroundColor = isBrightColor ? Colors::Black() : Colors::White();
+        const auto foregroundColor = IsBrightColor ? Colors::Black() : Colors::White();
        const auto hoverColor = til::color{ ColorFix::AdjustLightness(accentColor, hoverColorAdjustment) };
        const auto pressedColor = til::color{ ColorFix::AdjustLightness(accentColor, pressedColorAdjustment) };

@@ -4928,7 +4916,7 @@ namespace winrt::TerminalApp::implementation
                                                            theme.TabRow().UnfocusedBackground()) :
                                              ThemeColor{ nullptr } };

-        if (_settings.GlobalSettings().UseAcrylicInTabRow() && (_activated || _settings.GlobalSettings().EnableUnfocusedAcrylic()))
+        if (_settings.GlobalSettings().UseAcrylicInTabRow())
        {
            if (tabRowBg)
            {
--- a/src/cascadia/TerminalApp/fzf/LICENSE
+++ b/src/cascadia/TerminalApp/fzf/LICENSE
--- a/src/cascadia/TerminalApp/fzf/fzf.cpp
+++ b/src/cascadia/TerminalApp/fzf/fzf.cpp
--- a/src/cascadia/TerminalApp/fzf/fzf.h
+++ b/src/cascadia/TerminalApp/fzf/fzf.h
--- a/src/cascadia/TerminalConnection/CTerminalHandoff.h
+++ b/src/cascadia/TerminalConnection/CTerminalHandoff.h
@@ -31,7 +31,7 @@ Author(s):
 using NewHandoffFunction = HRESULT (*)(HANDLE* in, HANDLE* out, HANDLE signal, HANDLE reference, HANDLE server, HANDLE client, const TERMINAL_STARTUP_INFO* startupInfo);

 struct __declspec(uuid(__CLSID_CTerminalHandoff))
-CTerminalHandoff : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::RuntimeClassType::ClassicCom>, ITerminalHandoff3>
+    CTerminalHandoff : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::RuntimeClassType::ClassicCom>, ITerminalHandoff3>
 {
 #pragma region ITerminalHandoff
    STDMETHODIMP EstablishPtyHandoff(HANDLE* in, HANDLE* out, HANDLE signal, HANDLE reference, HANDLE server, HANDLE client, const TERMINAL_STARTUP_INFO* startupInfo) override;
--- a/src/cascadia/TerminalConnection/ConptyConnection.cpp
+++ b/src/cascadia/TerminalConnection/ConptyConnection.cpp
@@ -289,11 +289,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                }
            }

-            if (unbox_prop_or<bool>(settings, L"ambiguousIsWide", false))
-            {
-                _flags |= PSEUDOCONSOLE_AMBIGUOUS_IS_WIDE;
-            }
-
            const auto& initialEnvironment{ unbox_prop_or<winrt::hstring>(settings, L"initialEnvironment", L"") };
            const bool reloadEnvironmentVariables = unbox_prop_or<bool>(settings, L"reloadEnvironmentVariables", false);

--- a/src/cascadia/TerminalConnection/Resources/sr-Cyrl-RS/Resources.resw
+++ b/src/cascadia/TerminalConnection/Resources/sr-Cyrl-RS/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@@ -209,7 +209,7 @@
  </data>
  <data name="CtrlDToClose" xml:space="preserve">
    <value>Сада можете да затворите овај терминал са Ctrl+D, или да притиснете Ентер да га поново покренете.</value>
-    <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
+	  <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
  </data>
  <data name="ProcessFailedToLaunch" xml:space="preserve">
    <value>[грешка {0} приликом покретања `{1}']</value>
@@ -220,7 +220,7 @@
    <value>Не може да се приступи почетном директоријуму „{0}”</value>
    <comment>The first argument {0} is a path to a directory on the filesystem, as provided by the user.</comment>
  </data>
-  <data name="ElevationRequired" xml:space="preserve">
+    <data name="ElevationRequired" xml:space="preserve">
    <value>Тражена операција захтева веће привилегије.</value>
  </data>
  <data name="FileNotFound" xml:space="preserve">
--- a/src/cascadia/TerminalControl/ControlCore.cpp
+++ b/src/cascadia/TerminalControl/ControlCore.cpp
@@ -85,12 +85,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                break;
            }
            CodepointWidthDetector::Singleton().Reset(mode);
-
-            if (settings.AmbiguousWidth() == AmbiguousWidth::Wide)
-            {
-                CodepointWidthDetector::Singleton().SetAmbiguousWidth(2);
-            }
-
            return true;
        }();

@@ -1742,7 +1736,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    // - resetOnly: If true, only Reset() will be called, if anything. FindNext() will never be called.
    // Return Value:
    // - <none>
-    SearchResults ControlCore::Search(const SearchRequest& request)
+    SearchResults ControlCore::Search(SearchRequest request)
    {
        const auto lock = _terminal->LockForWriting();

@@ -1751,9 +1745,15 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        WI_SetFlagIf(flags, SearchFlag::RegularExpression, request.RegularExpression);
        const auto searchInvalidated = _searcher.IsStale(*_terminal.get(), request.Text, flags);

-        if (searchInvalidated || request.ExecuteSearch)
+        if (searchInvalidated || !request.ResetOnly)
        {
            std::vector<til::point_span> oldResults;
+            til::point_span oldFocused;
+
+            if (const auto focused = _terminal->GetSearchHighlightFocused())
+            {
+                oldFocused = *focused;
+            }

            if (searchInvalidated)
            {
@@ -1762,18 +1762,18 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                _terminal->SetSearchHighlights(_searcher.Results());
            }

-            if (request.ExecuteSearch)
+            if (!request.ResetOnly)
            {
                _searcher.FindNext(!request.GoForward);
            }

            _terminal->SetSearchHighlightFocused(gsl::narrow<size_t>(std::max<ptrdiff_t>(0, _searcher.CurrentMatch())));
            _renderer->TriggerSearchHighlight(oldResults);
-        }

-        if (request.ScrollIntoView)
-        {
-            _terminal->ScrollToSearchHighlight(request.ScrollOffset);
+            if (const auto focused = _terminal->GetSearchHighlightFocused(); focused && *focused != oldFocused)
+            {
+                _terminal->ScrollToSearchHighlight(request.ScrollOffset);
+            }
        }

        int32_t totalMatches = 0;
--- a/src/cascadia/TerminalControl/ControlCore.h
+++ b/src/cascadia/TerminalControl/ControlCore.h
@@ -225,7 +225,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        void SetSelectionAnchor(const til::point position);
        void SetEndSelectionPoint(const til::point position);

-        SearchResults Search(const SearchRequest& request);
+        SearchResults Search(SearchRequest request);
        const std::vector<til::point_span>& SearchResultRows() const noexcept;
        void ClearSearch();

--- a/src/cascadia/TerminalControl/ControlCore.idl
+++ b/src/cascadia/TerminalControl/ControlCore.idl
@@ -55,8 +55,7 @@ namespace Microsoft.Terminal.Control
        Boolean GoForward;
        Boolean CaseSensitive;
        Boolean RegularExpression;
-        Boolean ExecuteSearch;
-        Boolean ScrollIntoView;
+        Boolean ResetOnly;
        Int32 ScrollOffset;
    };

--- a/src/cascadia/TerminalControl/EventArgs.idl
+++ b/src/cascadia/TerminalControl/EventArgs.idl
@@ -26,12 +26,6 @@ namespace Microsoft.Terminal.Control
        Console,
    };

-    enum AmbiguousWidth
-    {
-        Narrow,
-        Wide,
-    };
-
    enum DefaultInputScope
    {
        Default,
--- a/src/cascadia/TerminalControl/HwndTerminal.cpp
+++ b/src/cascadia/TerminalControl/HwndTerminal.cpp
@@ -958,7 +958,7 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
        for (size_t tableIndex = 0; tableIndex < 16; tableIndex++)
        {
            // It's using gsl::at to check the index is in bounds, but the analyzer still calls this array-to-pointer-decay
-            GSL_SUPPRESS(bounds.3)
+            GSL_SUPPRESS(bounds .3)
            renderSettings.SetColorTableEntry(tableIndex, gsl::at(theme.ColorTable, tableIndex));
        }

--- a/src/cascadia/TerminalControl/IControlSettings.idl
+++ b/src/cascadia/TerminalControl/IControlSettings.idl
@@ -68,7 +68,6 @@ namespace Microsoft.Terminal.Control
        Boolean DisablePartialInvalidation { get; };
        Boolean SoftwareRendering { get; };
        Microsoft.Terminal.Control.TextMeasurement TextMeasurement { get; };
-        Microsoft.Terminal.Control.AmbiguousWidth AmbiguousWidth { get; };
        Microsoft.Terminal.Control.DefaultInputScope DefaultInputScope { get; };
        Boolean ShowMarks { get; };
        Boolean UseBackgroundImageForWindow { get; };
--- a/src/cascadia/TerminalControl/TermControl.cpp
+++ b/src/cascadia/TerminalControl/TermControl.cpp
@@ -714,15 +714,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        }
        else
        {
-            _handleSearchResults(_core.Search(SearchRequest{
-                .Text = _searchBox->Text(),
-                .GoForward = goForward,
-                .CaseSensitive = _searchBox->CaseSensitive(),
-                .RegularExpression = _searchBox->RegularExpression(),
-                .ExecuteSearch = true,
-                .ScrollIntoView = true,
-                .ScrollOffset = _searchScrollOffset,
-            }));
+            const auto request = SearchRequest{ _searchBox->Text(), goForward, _searchBox->CaseSensitive(), _searchBox->RegularExpression(), false, _searchScrollOffset };
+            _handleSearchResults(_core.Search(request));
        }
    }

@@ -756,15 +749,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    {
        if (_searchBox && _searchBox->IsOpen())
        {
-            _handleSearchResults(_core.Search(SearchRequest{
-                .Text = text,
-                .GoForward = goForward,
-                .CaseSensitive = caseSensitive,
-                .RegularExpression = regularExpression,
-                .ExecuteSearch = true,
-                .ScrollIntoView = true,
-                .ScrollOffset = _searchScrollOffset,
-            }));
+            const auto request = SearchRequest{ text, goForward, caseSensitive, regularExpression, false, _searchScrollOffset };
+            _handleSearchResults(_core.Search(request));
        }
    }

@@ -783,15 +769,11 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    {
        if (_searchBox && _searchBox->IsOpen())
        {
-            _handleSearchResults(_core.Search(SearchRequest{
-                .Text = text,
-                .GoForward = goForward,
-                .CaseSensitive = caseSensitive,
-                .RegularExpression = regularExpression,
-                .ExecuteSearch = false,
-                .ScrollIntoView = true,
-                .ScrollOffset = _searchScrollOffset,
-            }));
+            // We only want to update the search results based on the new text. Set
+            // `resetOnly` to true so we don't accidentally update the current match index.
+            const auto request = SearchRequest{ text, goForward, caseSensitive, regularExpression, true, _searchScrollOffset };
+            const auto result = _core.Search(request);
+            _handleSearchResults(result);
        }
    }

@@ -3760,15 +3742,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        const auto goForward = _searchBox->GoForward();
        const auto caseSensitive = _searchBox->CaseSensitive();
        const auto regularExpression = _searchBox->RegularExpression();
-        _handleSearchResults(_core.Search(SearchRequest{
-            .Text = text,
-            .GoForward = goForward,
-            .CaseSensitive = caseSensitive,
-            .RegularExpression = regularExpression,
-            .ExecuteSearch = false,
-            .ScrollIntoView = false,
-            .ScrollOffset = _searchScrollOffset,
-        }));
+        const auto request = SearchRequest{ text, goForward, caseSensitive, regularExpression, true, _searchScrollOffset };
+        _handleSearchResults(_core.Search(request));
    }

    void TermControl::_handleSearchResults(SearchResults results)
--- a/src/cascadia/TerminalCore/ICoreSettings.idl
+++ b/src/cascadia/TerminalCore/ICoreSettings.idl
@@ -121,7 +121,6 @@ namespace Microsoft.Terminal.Core
        String WordDelimiters { get; };

        Boolean ForceVTInput { get; };
-        Boolean AllowKittyKeyboardMode { get; };
        Boolean AllowVtChecksumReport { get; };
        Boolean AllowVtClipboardWrite { get; };
        Boolean TrimBlockSelection { get; };
--- a/src/cascadia/TerminalCore/Terminal.cpp
+++ b/src/cascadia/TerminalCore/Terminal.cpp
@@ -98,7 +98,6 @@ void Terminal::UpdateSettings(ICoreSettings settings)
    }

    _getTerminalInput().ForceDisableWin32InputMode(settings.ForceVTInput());
-    _getTerminalInput().ForceDisableKittyKeyboardProtocol(!settings.AllowKittyKeyboardMode());

    if (settings.TabColor() == nullptr)
    {
@@ -513,27 +512,52 @@ std::wstring Terminal::GetHyperlinkAtViewportPosition(const til::point viewportP

 std::wstring Terminal::GetHyperlinkAtBufferPosition(const til::point bufferPos)
 {
-    const auto& buffer = _activeBuffer();
-
    // Case 1: buffer position has a hyperlink stored in the buffer
-    const auto attr = buffer.GetCellDataAt(bufferPos)->TextAttr();
+    const auto attr = _activeBuffer().GetCellDataAt(bufferPos)->TextAttr();
    if (attr.IsHyperlink())
    {
-        return buffer.GetHyperlinkUriFromId(attr.GetHyperlinkId());
+        return _activeBuffer().GetHyperlinkUriFromId(attr.GetHyperlinkId());
    }

    // Case 2: buffer position may point to an auto-detected hyperlink
-    // Check cached interval tree (covers visible viewport +/- viewport height)
-    if (const auto results = _patternIntervalTree.findOverlapping({ bufferPos.x + 1, bufferPos.y }, bufferPos); !results.empty())
+    // Case 2 - Step 1: get the auto-detected hyperlink
+    std::optional<interval_tree::Interval<til::point, size_t>> result;
+    const auto visibleViewport = _GetVisibleViewport();
+    if (visibleViewport.IsInBounds(bufferPos))
    {
-        for (const auto& result : results)
+        // Hyperlink is in the current view, so let's just get it
+        auto viewportPos = bufferPos;
+        visibleViewport.ConvertToOrigin(&viewportPos);
+        result = GetHyperlinkIntervalFromViewportPosition(viewportPos);
+        if (result.has_value())
        {
-            if (result.value == _hyperlinkPatternId)
-            {
-                return buffer.GetPlainText(result.start, result.stop);
-            }
+            result->start = _ConvertToBufferCell(result->start, false);
+            result->stop = _ConvertToBufferCell(result->stop, true);
        }
    }
+    else
+    {
+        // Hyperlink is outside of the current view.
+        // We need to find if there's a pattern at that location.
+        const auto patterns = _getPatterns(bufferPos.y, bufferPos.y);
+
+        // NOTE: patterns is stored with top y-position being 0,
+        //       so we need to cleverly set the y-pos to 0.
+        const til::point viewportPos{ bufferPos.x, 0 };
+        const auto results = patterns.findOverlapping(viewportPos, viewportPos);
+        if (!results.empty())
+        {
+            result = results.front();
+            result->start.y += bufferPos.y;
+            result->stop.y += bufferPos.y;
+        }
+    }
+
+    // Case 2 - Step 2: get the auto-detected hyperlink
+    if (result.has_value() && result->value == _hyperlinkPatternId)
+    {
+        return _activeBuffer().GetPlainText(result->start, result->stop);
+    }
    return {};
 }

@@ -553,25 +577,17 @@ uint16_t Terminal::GetHyperlinkIdAtViewportPosition(const til::point viewportPos
 // Arguments:
 // - The position relative to the viewport
 // Return value:
-// - The interval representing the start and end coordinates (viewport-relative)
+// - The interval representing the start and end coordinates
 std::optional<PointTree::interval> Terminal::GetHyperlinkIntervalFromViewportPosition(const til::point viewportPos)
 {
-    // GH#18177: The tree stores buffer-absolute coordinates
-    // Convert viewport-relative (y=0 at visible start) to buffer-absolute
-    const auto visStart = _VisibleStartIndex();
-    const til::point bufferPos{ viewportPos.x, viewportPos.y + visStart };
-    const auto results = _patternIntervalTree.findOverlapping({ bufferPos.x + 1, bufferPos.y }, bufferPos);
+    const auto results = _patternIntervalTree.findOverlapping({ viewportPos.x + 1, viewportPos.y }, viewportPos);
    if (results.size() > 0)
    {
        for (const auto& result : results)
        {
            if (result.value == _hyperlinkPatternId)
            {
-                // Convert back to viewport-relative coordinates
-                auto interval = result;
-                interval.start.y -= visStart;
-                interval.stop.y -= visStart;
-                return interval;
+                return result;
            }
        }
    }
@@ -790,8 +806,11 @@ TerminalInput::OutputType Terminal::FocusChanged(const bool focused)
 // - The interval tree containing regions that need to be invalidated
 void Terminal::_InvalidatePatternTree()
 {
+    const auto vis = _VisibleStartIndex();
    _patternIntervalTree.visit_all([&](const PointTree::interval& interval) {
-        _InvalidateFromCoords(interval.start, interval.stop);
+        const til::point startCoord{ interval.start.x, interval.start.y + vis };
+        const til::point endCoord{ interval.stop.x, interval.stop.y + vis };
+        _InvalidateFromCoords(startCoord, endCoord);
    });
 }

@@ -1189,16 +1208,7 @@ void Terminal::SetPlayMidiNoteCallback(std::function<void(const int, const int,
 void Terminal::UpdatePatternsUnderLock()
 {
    _InvalidatePatternTree();
-    const auto visStart = _VisibleStartIndex();
-    const auto visEnd = _VisibleEndIndex();
-    const auto viewportHeight = visEnd - visStart;
-
-    // GH#18177: Scan extra rows beyond the viewport so that URLs
-    // wrapping across the viewport boundary are matched in full
-    const auto bufferSize = _activeBuffer().GetSize();
-    const auto beg = std::max<til::CoordType>(0, visStart - viewportHeight);
-    const auto end = std::min(bufferSize.BottomInclusive(), visEnd + viewportHeight);
-    _patternIntervalTree = _getPatterns(beg, end);
+    _patternIntervalTree = _getPatterns(_VisibleStartIndex(), _VisibleEndIndex());
    _InvalidatePatternTree();
 }

@@ -1413,8 +1423,10 @@ PointTree Terminal::_getPatterns(til::CoordType beg, til::CoordType end) const
        {
            do
            {
-                // PointTree uses half-open ranges and buffer-absolute coordinates.
-                const auto range = ICU::BufferRangeFromMatch(&text, re.get());
+                auto range = ICU::BufferRangeFromMatch(&text, re.get());
+                // PointTree uses half-open ranges and viewport-relative coordinates.
+                range.start.y -= beg;
+                range.end.y -= beg;
                intervals.push_back(PointTree::interval(range.start, range.end, 0));
            } while (uregex_findNext(re.get(), &status));
        }
--- a/src/cascadia/TerminalCore/Terminal.hpp
+++ b/src/cascadia/TerminalCore/Terminal.hpp
@@ -204,7 +204,7 @@ public:
    bool IsGridLineDrawingAllowed() noexcept override;
    std::wstring GetHyperlinkUri(uint16_t id) const override;
    std::wstring GetHyperlinkCustomId(uint16_t id) const override;
-    std::vector<size_t> GetPatternId(const til::point viewportPos) const override;
+    std::vector<size_t> GetPatternId(const til::point location) const override;

    std::pair<COLORREF, COLORREF> GetAttributeColors(const TextAttribute& attr) const noexcept override;
    std::span<const til::point_span> GetSelectionSpans() const noexcept override;
@@ -397,6 +397,7 @@ private:
    std::wstring _wordDelimiters;
    SelectionExpansion _multiClickSelectionMode = SelectionExpansion::Char;
    SelectionInteractionMode _selectionMode = SelectionInteractionMode::None;
+    bool _selectionIsTargetingUrl = false;
    SelectionEndpoint _selectionEndpoint = SelectionEndpoint::None;
    bool _anchorInactiveSelectionEndpoint = false;
 #pragma endregion
--- a/src/cascadia/TerminalCore/TerminalApi.cpp
+++ b/src/cascadia/TerminalCore/TerminalApi.cpp
@@ -140,7 +140,7 @@ unsigned int Terminal::GetInputCodePage() const noexcept

 void Terminal::CopyToClipboard(wil::zwstring_view content)
 {
-    if (_clipboardOperationsAllowed && _focused)
+    if (_clipboardOperationsAllowed)
    {
        _pfnCopyToClipboard(content);
    }
--- a/src/cascadia/TerminalCore/TerminalSelection.cpp
+++ b/src/cascadia/TerminalCore/TerminalSelection.cpp
@@ -254,6 +254,7 @@ void Terminal::_SetSelectionEnd(SelectionInfo* selection, const til::point viewp
        std::tie(selection->start, selection->end) = expandedAnchors;
    }
    _selectionMode = SelectionInteractionMode::Mouse;
+    _selectionIsTargetingUrl = false;
 }

 // Method Description:
@@ -398,6 +399,7 @@ void Terminal::ToggleMarkMode()
        }
        _ScrollToPoint(_selection->start);
        _selectionMode = SelectionInteractionMode::Mark;
+        _selectionIsTargetingUrl = false;
    }
 }

@@ -458,6 +460,7 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
    if (_selectionMode != SelectionInteractionMode::Mark)
    {
        // This feature only works in mark mode
+        _selectionIsTargetingUrl = false;
        return;
    }

@@ -466,10 +469,19 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
    const auto bufferSize = buffer.GetSize();
    const auto viewportHeight = _GetMutableViewport().Height();

+    // The patterns are stored relative to the "search area". Initially, this search area will be the viewport,
+    // but as we progressively search through more of the buffer, this will change.
+    // Keep track of the search area here, and use the lambda below to convert points to the search area coordinate space.
+    auto searchArea = _GetVisibleViewport();
+    auto convertToSearchArea = [&searchArea](const til::point pt) noexcept {
+        auto copy = pt;
+        searchArea.ConvertToOrigin(&copy);
+        return copy;
+    };
+
    // extracts the next/previous hyperlink from the list of hyperlink ranges provided
    auto extractResultFromList = [&](std::vector<interval_tree::Interval<til::point, size_t>>& list) noexcept {
-        const auto selectionStart = _selection->start;
-        const auto selectionEnd = _selection->end;
+        const auto selectionStartInSearchArea = convertToSearchArea(_selection->start);

        std::optional<std::pair<til::point, til::point>> resultFromList;
        if (!list.empty())
@@ -479,11 +491,12 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
                // pattern tree includes the currently selected range when going forward,
                // so we need to check if we're pointing to that one before returning it.
                auto range = list.front();
-                if (range.start == selectionStart && range.stop == selectionEnd)
+                if (_selectionIsTargetingUrl && range.start == selectionStartInSearchArea)
                {
                    if (list.size() > 1)
                    {
-                        // Selection matches the current URL, pick the next one
+                        // if we're pointing to the currently selected URL,
+                        // pick the next one.
                        range = til::at(list, 1);
                        resultFromList = { range.start, range.stop };
                    }
@@ -508,6 +521,14 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
                resultFromList = { range.start, range.stop };
            }
        }
+
+        // pattern tree stores everything as viewport coords,
+        // so we need to convert them on the way out
+        if (resultFromList)
+        {
+            searchArea.ConvertFromOrigin(&resultFromList->first);
+            searchArea.ConvertFromOrigin(&resultFromList->second);
+        }
        return resultFromList;
    };

@@ -525,8 +546,8 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
        searchEnd = _selection->start;
    }

-    // 1.A) Try searching the cached pattern tree (no scanning required)
-    auto resultList = _patternIntervalTree.findContained(searchStart, searchEnd);
+    // 1.A) Try searching the current viewport (no scrolling required)
+    auto resultList = _patternIntervalTree.findContained(convertToSearchArea(searchStart), convertToSearchArea(searchEnd));
    std::optional<std::pair<til::point, til::point>> result = extractResultFromList(resultList);
    if (!result)
    {
@@ -541,12 +562,14 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
            searchEnd = { bufferSize.RightInclusive(), searchStart.y - 1 };
            searchStart = { bufferSize.Left(), std::max(searchStart.y - viewportHeight, bufferSize.Top()) };
        }
+        searchArea = Viewport::FromDimensions(searchStart, { searchEnd.x + 1, searchEnd.y + 1 });
+
        const til::point bufferStart{ bufferSize.Origin() };
        const til::point bufferEnd{ bufferSize.RightInclusive(), ViewEndIndex() };
        while (!result && bufferSize.IsInBounds(searchStart) && bufferSize.IsInBounds(searchEnd) && searchStart <= searchEnd && bufferStart <= searchStart && searchEnd <= bufferEnd)
        {
            auto patterns = _getPatterns(searchStart.y, searchEnd.y);
-            resultList = patterns.findContained(searchStart, searchEnd);
+            resultList = patterns.findContained(convertToSearchArea(searchStart), convertToSearchArea(searchEnd));
            result = extractResultFromList(resultList);
            if (!result)
            {
@@ -560,6 +583,7 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
                    searchEnd.y -= 1;
                    searchStart.y = std::max(searchEnd.y - viewportHeight, bufferSize.Top());
                }
+                searchArea = Viewport::FromDimensions(searchStart, { searchEnd.x + 1, searchEnd.y + 1 });
            }
        }
    }
@@ -632,10 +656,11 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
    selection->start = result->first;
    selection->pivot = result->first;
    selection->end = result->second;
+    _selectionIsTargetingUrl = true;
    _selectionEndpoint = SelectionEndpoint::End;

    // 4. Scroll to the selected area (if necessary)
-    _ScrollToPoint(dir == SearchDirection::Forward ? selection->end : selection->start);
+    _ScrollToPoint(selection->end);
 }

 Terminal::UpdateSelectionParams Terminal::ConvertKeyEventToUpdateSelectionParams(const ControlKeyStates mods, const WORD vkey) const noexcept
@@ -743,6 +768,7 @@ void Terminal::UpdateSelection(SelectionDirection direction, SelectionExpansion
    }

    // 3. Actually modify the selection state
+    _selectionIsTargetingUrl = false;
    _selectionMode = std::max(_selectionMode, SelectionInteractionMode::Keyboard);

    auto selection{ _selection.write() };
@@ -785,6 +811,7 @@ void Terminal::SelectAll()
    };

    _selectionMode = SelectionInteractionMode::Keyboard;
+    _selectionIsTargetingUrl = false;
    _ScrollToPoint(_selection->start);
 }

@@ -916,6 +943,7 @@ void Terminal::ClearSelection()
    _assertLocked();
    _selection.write()->active = false;
    _selectionMode = SelectionInteractionMode::None;
+    _selectionIsTargetingUrl = false;
    _selectionEndpoint = static_cast<SelectionEndpoint>(0);
    _anchorInactiveSelectionEndpoint = false;
 }
@@ -1017,9 +1045,5 @@ void Terminal::_ScrollToPoint(const til::point pos)
        }
        _NotifyScrollEvent();
        _activeBuffer().TriggerScroll();
-
-        // Rebuild the pattern tree for the new viewport position
-        // so that callers always find a fresh cache after scrolling
-        _updateUrlDetection();
    }
 }
--- a/src/cascadia/TerminalCore/terminalrenderdata.cpp
+++ b/src/cascadia/TerminalCore/terminalrenderdata.cpp
@@ -74,16 +74,15 @@ std::wstring Microsoft::Terminal::Core::Terminal::GetHyperlinkCustomId(uint16_t
 // Method Description:
 // - Gets the regex pattern ids of a location
 // Arguments:
-// - The viewport-relative location
+// - The location
 // Return value:
 // - The pattern IDs of the location
-std::vector<size_t> Terminal::GetPatternId(const til::point viewportPos) const
+std::vector<size_t> Terminal::GetPatternId(const til::point location) const
 {
    _assertLocked();

-    // Convert viewport-relative (y=0 at visible start) to buffer-absolute
-    const til::point bufferPos{ viewportPos.x, viewportPos.y + _VisibleStartIndex() };
-    const auto intervals = _patternIntervalTree.findOverlapping({ bufferPos.x + 1, bufferPos.y }, bufferPos);
+    // Look through our interval tree for this location
+    const auto intervals = _patternIntervalTree.findOverlapping({ location.x + 1, location.y }, location);
    if (intervals.size() == 0)
    {
        return {};
--- a/src/cascadia/TerminalSettingsAppAdapterLib/TerminalSettings.cpp
+++ b/src/cascadia/TerminalSettingsAppAdapterLib/TerminalSettings.cpp
@@ -349,7 +349,6 @@ namespace winrt::Microsoft::Terminal::Settings
        _ReloadEnvironmentVariables = profile.ReloadEnvironmentVariables();
        _RainbowSuggestions = profile.RainbowSuggestions();
        _ForceVTInput = profile.ForceVTInput();
-        _AllowKittyKeyboardMode = profile.AllowKittyKeyboardMode();
        _AllowVtChecksumReport = profile.AllowVtChecksumReport();
        _AllowVtClipboardWrite = profile.AllowVtClipboardWrite();
        _PathTranslationStyle = profile.PathTranslationStyle();
@@ -376,7 +375,6 @@ namespace winrt::Microsoft::Terminal::Settings
        _DisablePartialInvalidation = globalSettings.DisablePartialInvalidation();
        _SoftwareRendering = globalSettings.SoftwareRendering();
        _TextMeasurement = globalSettings.TextMeasurement();
-        _AmbiguousWidth = globalSettings.AmbiguousWidth();
        _DefaultInputScope = globalSettings.DefaultInputScope();
        _UseBackgroundImageForWindow = globalSettings.UseBackgroundImageForWindow();
        _TrimBlockSelection = globalSettings.TrimBlockSelection();
--- a/src/cascadia/TerminalSettingsEditor/Actions.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Actions.cpp
@@ -4,7 +4,6 @@
 #include "pch.h"
 #include "Actions.h"
 #include "Actions.g.cpp"
-#include "LibraryResources.h"
 #include "../TerminalSettingsModel/AllShortcutActions.h"

 using namespace winrt::Windows::UI::Xaml;
@@ -21,9 +20,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    void Actions::OnNavigatedTo(const NavigationEventArgs& e)
    {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ActionsViewModel>();
-        _ViewModel.ReSortCommandList();
+        _ViewModel = e.Parameter().as<Editor::ActionsViewModel>();
+        _ViewModel.CurrentPage(ActionsSubPage::Base);
        auto vmImpl = get_self<ActionsViewModel>(_ViewModel);
        vmImpl->MarkAsVisited();
        _layoutUpdatedRevoker = LayoutUpdated(winrt::auto_revoke, [this](auto /*s*/, auto /*e*/) {
@@ -32,7 +30,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

            AddNewButton().Focus(FocusState::Programmatic);
        });
-        BringIntoViewWhenLoaded(args.ElementToFocus());

        TraceLoggingWrite(
            g_hTerminalSettingsEditorProvider,
--- a/src/cascadia/TerminalSettingsEditor/Actions.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Actions.xaml
@@ -164,33 +164,17 @@
                                   Style="{StaticResource KeyBindingNameTextBlockStyle}"
                                   Text="{x:Bind DisplayName, Mode=OneWay}" />
                        <!--  Key Chord Text  -->
-                        <Grid Grid.Column="1"
-                              HorizontalAlignment="Right"
-                              VerticalAlignment="Center"
-                              ColumnSpacing="4">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Border Grid.Column="0"
-                                    Padding="8,4,8,4"
-                                    Style="{ThemeResource KeyChordBorderStyle}"
-                                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(FirstKeyChordText)}">
-                                <TextBlock FontSize="14"
-                                           Style="{ThemeResource KeyChordTextBlockStyle}"
-                                           Text="{x:Bind FirstKeyChordText, Mode=OneWay}"
-                                           TextWrapping="WrapWholeWords" />
-                            </Border>
-                            <Border Grid.Column="1"
-                                    Padding="8,4,8,4"
-                                    Style="{ThemeResource KeyChordBorderStyle}"
-                                    ToolTipService.ToolTip="{x:Bind AdditionalKeyChordTooltipText, Mode=OneWay}"
-                                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(AdditionalKeyChordCountText)}">
-                                <TextBlock FontSize="14"
-                                           Style="{ThemeResource KeyChordTextBlockStyle}"
-                                           Text="{x:Bind AdditionalKeyChordCountText, Mode=OneWay}" />
-                            </Border>
-                        </Grid>
+                        <Border Grid.Column="1"
+                                Padding="8,4,8,4"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Style="{ThemeResource KeyChordBorderStyle}"
+                                Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(FirstKeyChordText)}">
+                            <TextBlock FontSize="14"
+                                       Style="{ThemeResource KeyChordTextBlockStyle}"
+                                       Text="{x:Bind FirstKeyChordText, Mode=OneWay}"
+                                       TextWrapping="WrapWholeWords" />
+                        </Border>
                    </Grid>
                </ListViewItem>
            </DataTemplate>
@@ -198,7 +182,8 @@
    </Page.Resources>

    <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
-        <StackPanel HorizontalAlignment="Stretch"
+        <StackPanel MaxWidth="600"
+                    HorizontalAlignment="Left"
                    Spacing="8"
                    Style="{StaticResource SettingsStackStyle}">
            <HyperlinkButton x:Uid="Actions_Disclaimer"
--- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp
@@ -126,23 +126,18 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    void CommandViewModel::Name(const winrt::hstring& newName)
    {
-        if (_command.Name() != newName)
+        _command.Name(newName);
+        if (newName.empty())
        {
-            _command.Name(newName);
+            // if the name was cleared, refresh the DisplayName
            _NotifyChanges(L"DisplayName", L"DisplayNameAndKeyChordAutomationPropName");
-            _cachedDisplayName.clear();
        }
+        _cachedDisplayName.clear();
    }

    winrt::hstring CommandViewModel::DisplayNameAndKeyChordAutomationPropName()
    {
-        auto result = DisplayName() + L", " + FirstKeyChordText();
-        const auto size = _KeyChordList.Size();
-        if (size > 1)
-        {
-            result = result + L" " + hstring{ RS_fmt(L"Actions_AdditionalKeyChords", winrt::to_hstring(size - 1)) };
-        }
-        return result;
+        return DisplayName() + L", " + FirstKeyChordText();
    }

    winrt::hstring CommandViewModel::FirstKeyChordText()
@@ -154,35 +149,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        return L"";
    }

-    winrt::hstring CommandViewModel::AdditionalKeyChordCountText()
-    {
-        const auto size = _KeyChordList.Size();
-        if (size > 1)
-        {
-            return winrt::hstring{ L"+" + winrt::to_hstring(size - 1) };
-        }
-        return L"";
-    }
-
-    winrt::hstring CommandViewModel::AdditionalKeyChordTooltipText()
-    {
-        const auto size = _KeyChordList.Size();
-        if (size <= 1)
-        {
-            return L"";
-        }
-        std::wstring result;
-        for (uint32_t i = 1; i < size; ++i)
-        {
-            if (!result.empty())
-            {
-                result += L"\n";
-            }
-            result += std::wstring_view{ _KeyChordList.GetAt(i).KeyChordText() };
-        }
-        return winrt::hstring{ result };
-    }
-
    winrt::hstring CommandViewModel::ID()
    {
        return _command.ID();
@@ -209,7 +175,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        kbdVM->IsInEditMode(true);
        _RegisterKeyChordVMEvents(*kbdVM);
        KeyChordList().Append(*kbdVM);
-        FocusContainer.raise(*this, *kbdVM);
    }

    winrt::hstring CommandViewModel::ActionNameTextBoxAutomationPropName()
@@ -255,10 +220,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                        break;
                    }
                }
-                if (args)
-                {
-                    actionsPageVM.DeleteKeyChord(args);
-                }
+                actionsPageVM.DeleteKeyChord(args);
            }
        });
        kcVM.PropertyChanged([weakThis{ get_weak() }](const IInspectable& sender, const Windows::UI::Xaml::Data::PropertyChangedEventArgs& args) {
@@ -321,10 +283,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                {
                    weak->_ReplaceCommandWithUserCopy(false);
                }
-                if (!weak->_command.HasName())
-                {
-                    weak->_NotifyChanges(L"DisplayName");
-                }
+                weak->_NotifyChanges(L"DisplayName");
            }
        });
    }
@@ -361,10 +320,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        _RegisterActionArgsVMEvents(*actionArgsVM);
        actionArgsVM->Initialize();
        ActionArgsVM(*actionArgsVM);
-        if (!_command.HasName())
-        {
-            _NotifyChanges(L"DisplayName");
-        }
+        _NotifyChanges(L"DisplayName");
    }

    ArgWrapper::ArgWrapper(const Model::ArgDescriptor& descriptor, const Windows::Foundation::IInspectable& value) :
@@ -543,13 +499,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        auto lifetime = get_strong();

        static constexpr winrt::guid clientGuidFiles{ 0xbd00ae34, 0x839b, 0x43f6, { 0x8b, 0x94, 0x12, 0x37, 0x1a, 0xfe, 0xea, 0xb5 } };
-
-        const auto windowRoot = WindowRoot();
-        if (!windowRoot)
-        {
-            co_return;
-        }
-        const auto parentHwnd{ reinterpret_cast<HWND>(windowRoot.GetHostingWindow()) };
+        const auto parentHwnd{ reinterpret_cast<HWND>(_WindowRoot.GetHostingWindow()) };
        auto path = co_await OpenFilePicker(parentHwnd, [](auto&& dialog) {
            THROW_IF_FAILED(dialog->SetClientGuid(clientGuidFiles));
            try
@@ -572,13 +522,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        auto lifetime = get_strong();

        static constexpr winrt::guid clientGuidFolders{ 0xa611027, 0x42be, 0x4665, { 0xaf, 0xf1, 0x3f, 0x22, 0x26, 0xe9, 0xf7, 0x4d } };
-
-        const auto windowRoot = WindowRoot();
-        if (!windowRoot)
-        {
-            co_return;
-        }
-        const auto parentHwnd{ reinterpret_cast<HWND>(windowRoot.GetHostingWindow()) };
+        ;
+        const auto parentHwnd{ reinterpret_cast<HWND>(_WindowRoot.GetHostingWindow()) };
        auto path = co_await OpenFilePicker(parentHwnd, [](auto&& dialog) {
            THROW_IF_FAILED(dialog->SetClientGuid(clientGuidFolders));
            try
@@ -1087,11 +1032,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
            // if we're in edit mode, populate the text box with the current keys
            ProposedKeys(_currentKeys);
        }
-        else if (!_currentKeys)
-        {
-            // we have left edit mode but don't have any current keys - delete this view model
-            DeleteKeyChord();
-        }
    }

    void KeyChordViewModel::AcceptChanges()
@@ -1246,25 +1186,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        CurrentPage(ActionsSubPage::Edit);
    }

-    void ActionsViewModel::ReSortCommandList()
-    {
-        if (_CommandListDirty)
-        {
-            std::vector<Editor::CommandViewModel> commandList;
-            commandList.reserve(_CommandList.Size());
-            for (const auto& cmd : _CommandList)
-            {
-                commandList.push_back(cmd);
-            }
-            std::sort(commandList.begin(), commandList.end(), [](const Editor::CommandViewModel& lhs, const Editor::CommandViewModel& rhs) {
-                return lhs.DisplayName() < rhs.DisplayName();
-            });
-            _CommandList = single_threaded_observable_vector(std::move(commandList));
-            _NotifyChanges(L"CommandList");
-            _CommandListDirty = false;
-        }
-    }
-
    void ActionsViewModel::CurrentCommand(const Editor::CommandViewModel& newCommand)
    {
        _CurrentCommand = newCommand;
@@ -1435,17 +1356,5 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        cmdVM->DeleteRequested({ this, &ActionsViewModel::_CmdVMDeleteRequestedHandler });
        cmdVM->PropagateColorSchemeRequested({ this, &ActionsViewModel::_CmdVMPropagateColorSchemeRequestedHandler });
        cmdVM->PropagateColorSchemeNamesRequested({ this, &ActionsViewModel::_CmdVMPropagateColorSchemeNamesRequestedHandler });
-        cmdVM->PropertyChanged([weakThis{ get_weak() }](const IInspectable& sender, const Windows::UI::Xaml::Data::PropertyChangedEventArgs& args) {
-            if (const auto self{ weakThis.get() })
-            {
-                const auto senderVM{ sender.as<Editor::CommandViewModel>() };
-                const auto propertyName{ args.PropertyName() };
-                if (propertyName == L"DisplayName")
-                {
-                    // when a command's name changes, note that we need to re-sort the command list when we navigate back to the actions page
-                    self->_CommandListDirty = true;
-                }
-            }
-        });
    }
 }
--- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h
@@ -37,6 +37,7 @@ Abstract:
 #pragma once

 #include "ActionsViewModel.g.h"
+#include "NavigateToCommandArgs.g.h"
 #include "CommandViewModel.g.h"
 #include "ArgWrapper.g.h"
 #include "ActionArgsViewModel.g.h"
@@ -47,6 +48,21 @@ Abstract:

 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToCommandArgs : NavigateToCommandArgsT<NavigateToCommandArgs>
+    {
+    public:
+        NavigateToCommandArgs(CommandViewModel command, Editor::IHostedInWindow windowRoot) :
+            _Command(command),
+            _WindowRoot(windowRoot) {}
+
+        Editor::IHostedInWindow WindowRoot() const noexcept { return _WindowRoot; }
+        Editor::CommandViewModel Command() const noexcept { return _Command; }
+
+    private:
+        Editor::IHostedInWindow _WindowRoot;
+        Editor::CommandViewModel _Command{ nullptr };
+    };
+
    struct ModifyKeyChordEventArgs : ModifyKeyChordEventArgsT<ModifyKeyChordEventArgs>
    {
    public:
@@ -74,8 +90,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        winrt::hstring DisplayNameAndKeyChordAutomationPropName();

        winrt::hstring FirstKeyChordText();
-        winrt::hstring AdditionalKeyChordCountText();
-        winrt::hstring AdditionalKeyChordTooltipText();

        winrt::hstring ID();
        bool IsUserAction();
@@ -127,8 +141,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        winrt::hstring Type() const noexcept { return _descriptor.Type; };
        Model::ArgTypeHint TypeHint() const noexcept { return _descriptor.TypeHint; };
        bool Required() const noexcept { return _descriptor.Required; };
-        Editor::IHostedInWindow WindowRoot() const noexcept { return _WeakWindowRoot.get(); }
-        void WindowRoot(const Editor::IHostedInWindow& value) { _WeakWindowRoot = value; }

        // We cannot use the macro here because we need to implement additional logic for the setter
        Windows::Foundation::IInspectable EnumValue() const noexcept { return _EnumValue; };
@@ -174,10 +186,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        VIEW_MODEL_OBSERVABLE_PROPERTY(Editor::ColorSchemeViewModel, DefaultColorScheme, nullptr);
        VIEW_MODEL_OBSERVABLE_PROPERTY(Windows::Foundation::IInspectable, Value, nullptr);
        WINRT_PROPERTY(Windows::Foundation::Collections::IVector<winrt::hstring>, ColorSchemeNamesList, nullptr);
+        WINRT_PROPERTY(Editor::IHostedInWindow, WindowRoot, nullptr);

    private:
        Model::ArgDescriptor _descriptor;
-        winrt::weak_ref<Editor::IHostedInWindow> _WeakWindowRoot{ nullptr };
        Windows::Foundation::IInspectable _EnumValue{ nullptr };
        Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Editor::EnumEntry> _EnumList;
        Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Editor::FlagEntry> _FlagList;
@@ -258,7 +270,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        bool DisplayBadge() const noexcept;

        void AddNewCommand();
-        void ReSortCommandList();

        void CurrentCommand(const Editor::CommandViewModel& newCommand);
        Editor::CommandViewModel CurrentCommand();
@@ -280,7 +291,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        Model::CascadiaSettings _Settings;
        Windows::Foundation::Collections::IMap<Model::ShortcutAction, winrt::hstring> _AvailableActionsAndNamesMap;
        Windows::Foundation::Collections::IMap<winrt::hstring, Model::ShortcutAction> _NameToActionMap;
-        bool _CommandListDirty{ false };

        void _MakeCommandVMsHelper();
        void _RegisterCmdVMEvents(com_ptr<implementation::CommandViewModel>& cmdVM);
--- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl
+++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl
@@ -35,6 +35,12 @@ namespace Microsoft.Terminal.Settings.Editor
        CommandViewModel ViewModel { get; };
    }

+    runtimeclass NavigateToCommandArgs
+    {
+        CommandViewModel Command { get; };
+        IHostedInWindow WindowRoot { get; };
+    }
+
    runtimeclass ModifyKeyChordEventArgs
    {
        Microsoft.Terminal.Control.KeyChord OldKeys { get; };
@@ -55,8 +61,6 @@ namespace Microsoft.Terminal.Settings.Editor
        // View-model specific
        String DisplayName { get; };
        String FirstKeyChordText { get; };
-        String AdditionalKeyChordCountText { get; };
-        String AdditionalKeyChordTooltipText { get; };
        String DisplayNameAndKeyChordAutomationPropName { get; };

        // UI side (command list page)
@@ -166,7 +170,6 @@ namespace Microsoft.Terminal.Settings.Editor
        void UpdateSettings(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);

        void AddNewCommand();
-        void ReSortCommandList();

        ActionsSubPage CurrentPage;
        Boolean DisplayBadge { get; };
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.cpp
+++ b/src/cascadia/TerminalSettingsEditor/AddProfile.cpp
@@ -26,9 +26,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    void AddProfile::OnNavigatedTo(const NavigationEventArgs& e)
    {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _State = args.ViewModel().as<Editor::AddProfilePageNavigationState>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _State = e.Parameter().as<Editor::AddProfilePageNavigationState>();

        TraceLoggingWrite(
            g_hTerminalSettingsEditorProvider,
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
@@ -37,8 +37,7 @@
            </Button>
        </Border>
        <StackPanel Margin="{StaticResource StandardControlMargin}">
-            <local:SettingContainer x:Name="DuplicateProfile"
-                                    x:Uid="AddProfile_Duplicate">
+            <local:SettingContainer x:Uid="AddProfile_Duplicate">
                <ComboBox x:Name="Profiles"
                          AutomationProperties.AccessibilityView="Content"
                          ItemsSource="{x:Bind State.Settings.AllProfiles, Mode=OneWay}"
--- a/src/cascadia/TerminalSettingsEditor/Appearances.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.cpp
@@ -1138,27 +1138,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        INITIALIZE_BINDABLE_ENUM_SETTING(IntenseTextStyle, IntenseTextStyle, winrt::Microsoft::Terminal::Settings::Model::IntenseStyle, L"Appearance_IntenseTextStyle", L"Content");
    }

-    // Appearances doesn't implement HasScrollViewer<T> which normally adds this function.
-    void Appearances::BringIntoViewWhenLoaded(hstring elementToFocus)
-    {
-        if (elementToFocus.empty())
-        {
-            return;
-        }
-
-        _loadedRevoker = this->Loaded(winrt::auto_revoke, [weakThis{ get_weak() }, elementToFocus](auto&&, auto&&) {
-            if (const auto strongThis = weakThis.get())
-            {
-                if (const auto& controlToFocus{ strongThis->FindName(elementToFocus).try_as<Controls::Control>() })
-                {
-                    controlToFocus.as<FrameworkElement>().StartBringIntoView();
-                    controlToFocus.Focus(FocusState::Programmatic);
-                }
-                strongThis->_loadedRevoker.revoke();
-            }
-        });
-    }
-
    IObservableVector<Editor::Font> Appearances::FilteredFontList()
    {
        if (!_filteredFonts)
@@ -1444,15 +1423,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    safe_void_coroutine Appearances::BackgroundImage_Click(const IInspectable&, const RoutedEventArgs&)
    {
-        const auto lifetime = get_strong();
+        auto lifetime = get_strong();

-        const auto windowRoot = WindowRoot();
-        if (!windowRoot)
-        {
-            co_return;
-        }
-        const auto parentHwnd{ reinterpret_cast<HWND>(windowRoot.GetHostingWindow()) };
-        const auto file = co_await OpenImagePicker(parentHwnd);
+        const auto parentHwnd{ reinterpret_cast<HWND>(WindowRoot().GetHostingWindow()) };
+        auto file = co_await OpenImagePicker(parentHwnd);
        if (!file.empty())
        {
            Appearance().SetBackgroundImagePath(file);
--- a/src/cascadia/TerminalSettingsEditor/Appearances.h
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.h
@@ -188,14 +188,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
    struct Appearances : AppearancesT<Appearances>
    {
        Appearances();
-        void BringIntoViewWhenLoaded(hstring elementToFocus);

        // CursorShape visibility logic
        bool IsVintageCursor() const;

-        Editor::IHostedInWindow WindowRoot() const noexcept { return _WeakWindowRoot.get(); }
-        void WindowRoot(const Editor::IHostedInWindow& value) noexcept { _WeakWindowRoot = value; }
-
        Windows::Foundation::Collections::IObservableVector<Editor::Font> FilteredFontList();
        bool ShowAllFonts() const noexcept;
        void ShowAllFonts(bool value);
@@ -214,7 +210,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        bool IsCustomFontWeight();

        til::property_changed_event PropertyChanged;
-        winrt::Windows::UI::Xaml::FrameworkElement::Loaded_revoker _loadedRevoker;

        WINRT_PROPERTY(Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Editor::EnumEntry>, FontWeightList);

@@ -223,12 +218,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

        DEPENDENCY_PROPERTY(Editor::AppearanceViewModel, Appearance);
        WINRT_PROPERTY(Editor::ProfileViewModel, SourceProfile, nullptr);
+        WINRT_PROPERTY(IHostedInWindow, WindowRoot, nullptr);
        GETSET_BINDABLE_ENUM_SETTING(BackgroundImageStretchMode, Windows::UI::Xaml::Media::Stretch, Appearance().BackgroundImageStretchMode);

        GETSET_BINDABLE_ENUM_SETTING(IntenseTextStyle, Microsoft::Terminal::Settings::Model::IntenseStyle, Appearance().IntenseTextStyle);

    private:
-        winrt::weak_ref<Editor::IHostedInWindow> _WeakWindowRoot{ nullptr };
        Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _ViewModelChangedRevoker;
        std::array<Windows::UI::Xaml::Controls::Primitives::ToggleButton, 9> _BIAlignmentButtons;
        Windows::Foundation::Collections::IMap<uint16_t, Microsoft::Terminal::Settings::Editor::EnumEntry> _FontWeightMap;
--- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -75,8 +75,7 @@
                       Style="{StaticResource TextBlockSubHeaderStyle}" />
            <!--  Color Scheme  -->
            <!--  This currently only display the Dark color scheme, even if the user has a pair of schemes set.  -->
-            <local:SettingContainer x:Name="ColorScheme"
-                                    x:Uid="Profile_ColorScheme"
+            <local:SettingContainer x:Uid="Profile_ColorScheme"
                                    ClearSettingValue="{x:Bind Appearance.ClearColorScheme}"
                                    CurrentValueAccessibleName="{x:Bind Appearance.CurrentColorScheme.Name, Mode=OneWay}"
                                    HasSettingValue="{x:Bind Appearance.HasDarkColorSchemeName, Mode=OneWay}"
@@ -285,20 +284,17 @@
                              IsChecked="{x:Bind ShowAllFonts, Mode=TwoWay}" />
                </StackPanel>
            </local:SettingContainer>
-            <local:SettingContainer x:Name="MissingFontFaces"
-                                    x:Uid="Profile_MissingFontFaces"
+            <local:SettingContainer x:Uid="Profile_MissingFontFaces"
                                    HelpText="{x:Bind Appearance.MissingFontFaces, Mode=OneWay}"
                                    Style="{StaticResource SettingContainerErrorStyle}"
                                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.MissingFontFaces), Mode=OneWay}" />
-            <local:SettingContainer x:Name="ProportionalFontFaces"
-                                    x:Uid="Profile_ProportionalFontFaces"
+            <local:SettingContainer x:Uid="Profile_ProportionalFontFaces"
                                    HelpText="{x:Bind Appearance.ProportionalFontFaces, Mode=OneWay}"
                                    Style="{StaticResource SettingContainerWarningStyle}"
                                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.ProportionalFontFaces), Mode=OneWay}" />

            <!--  Font Size  -->
-            <local:SettingContainer x:Name="FontSize"
-                                    x:Uid="Profile_FontSize"
+            <local:SettingContainer x:Uid="Profile_FontSize"
                                    ClearSettingValue="{x:Bind Appearance.ClearFontSize}"
                                    HasSettingValue="{x:Bind Appearance.HasFontSize, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.FontSizeOverrideSource, Mode=OneWay}"
@@ -314,8 +310,7 @@
            </local:SettingContainer>

            <!--  Line Height  -->
-            <local:SettingContainer x:Name="LineHeight"
-                                    x:Uid="Profile_LineHeight"
+            <local:SettingContainer x:Uid="Profile_LineHeight"
                                    ClearSettingValue="{x:Bind Appearance.ClearLineHeight}"
                                    HasSettingValue="{x:Bind Appearance.HasLineHeight, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.LineHeightOverrideSource, Mode=OneWay}"
@@ -331,8 +326,7 @@
            </local:SettingContainer>

            <!--  Cell Width  -->
-            <local:SettingContainer x:Name="CellWidth"
-                                    x:Uid="Profile_CellWidth"
+            <local:SettingContainer x:Uid="Profile_CellWidth"
                                    ClearSettingValue="{x:Bind Appearance.ClearCellWidth}"
                                    HasSettingValue="{x:Bind Appearance.HasCellWidth, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.CellWidthOverrideSource, Mode=OneWay}"
@@ -348,8 +342,7 @@
            </local:SettingContainer>

            <!--  Font Weight  -->
-            <local:SettingContainer x:Name="FontWeight"
-                                    x:Uid="Profile_FontWeight"
+            <local:SettingContainer x:Uid="Profile_FontWeight"
                                    ClearSettingValue="{x:Bind Appearance.ClearFontWeight}"
                                    HasSettingValue="{x:Bind Appearance.HasFontWeight, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.FontWeightOverrideSource, Mode=OneWay}"
@@ -385,8 +378,7 @@
                    </Grid>
                </StackPanel>
            </local:SettingContainer>
-            <local:SettingContainer x:Name="FontAxes"
-                                    x:Uid="Profile_FontAxes"
+            <local:SettingContainer x:Uid="Profile_FontAxes"
                                    ClearSettingValue="{x:Bind Appearance.ClearFontAxes}"
                                    HasSettingValue="{x:Bind Appearance.HasFontAxes, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.FontAxesOverrideSource, Mode=OneWay}"
@@ -413,8 +405,7 @@
                    </muxc:DropDownButton>
                </StackPanel>
            </local:SettingContainer>
-            <local:SettingContainer x:Name="FontFeatures"
-                                    x:Uid="Profile_FontFeatures"
+            <local:SettingContainer x:Uid="Profile_FontFeatures"
                                    ClearSettingValue="{x:Bind Appearance.ClearFontFeatures}"
                                    HasSettingValue="{x:Bind Appearance.HasFontFeatures, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.FontFeaturesOverrideSource, Mode=OneWay}"
@@ -443,8 +434,7 @@
            </local:SettingContainer>

            <!--  Builtin Glyphs  -->
-            <local:SettingContainer x:Name="EnableBuiltinGlyphs"
-                                    x:Uid="Profile_EnableBuiltinGlyphs"
+            <local:SettingContainer x:Uid="Profile_EnableBuiltinGlyphs"
                                    ClearSettingValue="{x:Bind Appearance.ClearEnableBuiltinGlyphs}"
                                    HasSettingValue="{x:Bind Appearance.HasEnableBuiltinGlyphs, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.EnableBuiltinGlyphsOverrideSource, Mode=OneWay}">
@@ -453,8 +443,7 @@
            </local:SettingContainer>

            <!--  Color Glyphs  -->
-            <local:SettingContainer x:Name="EnableColorGlyphs"
-                                    x:Uid="Profile_EnableColorGlyphs"
+            <local:SettingContainer x:Uid="Profile_EnableColorGlyphs"
                                    ClearSettingValue="{x:Bind Appearance.ClearEnableColorGlyphs}"
                                    HasSettingValue="{x:Bind Appearance.HasEnableColorGlyphs, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.EnableColorGlyphsOverrideSource, Mode=OneWay}">
@@ -463,8 +452,7 @@
            </local:SettingContainer>

            <!--  Retro Terminal Effect  -->
-            <local:SettingContainer x:Name="RetroTerminalEffect"
-                                    x:Uid="Profile_RetroTerminalEffect"
+            <local:SettingContainer x:Uid="Profile_RetroTerminalEffect"
                                    ClearSettingValue="{x:Bind Appearance.ClearRetroTerminalEffect}"
                                    HasSettingValue="{x:Bind Appearance.HasRetroTerminalEffect, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.RetroTerminalEffectOverrideSource, Mode=OneWay}">
@@ -473,8 +461,7 @@
            </local:SettingContainer>

            <!--  Adjust Indistinguishable Colors  -->
-            <local:SettingContainer x:Name="AdjustIndistinguishableColors"
-                                    x:Uid="Profile_AdjustIndistinguishableColors"
+            <local:SettingContainer x:Uid="Profile_AdjustIndistinguishableColors"
                                    ClearSettingValue="{x:Bind Appearance.ClearAdjustIndistinguishableColors}"
                                    HasSettingValue="{x:Bind Appearance.HasAdjustIndistinguishableColors, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.AdjustIndistinguishableColorsOverrideSource, Mode=OneWay}">
@@ -492,8 +479,7 @@
                       Style="{StaticResource TextBlockSubHeaderStyle}" />

            <!--  Cursor Shape  -->
-            <local:SettingContainer x:Name="CursorShape"
-                                    x:Uid="Profile_CursorShape"
+            <local:SettingContainer x:Uid="Profile_CursorShape"
                                    ClearSettingValue="{x:Bind Appearance.ClearCursorShape}"
                                    HasSettingValue="{x:Bind Appearance.HasCursorShape, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.CursorShapeOverrideSource, Mode=OneWay}">
@@ -505,8 +491,7 @@
            </local:SettingContainer>

            <!--  Cursor Height  -->
-            <local:SettingContainer x:Name="CursorHeight"
-                                    x:Uid="Profile_CursorHeight"
+            <local:SettingContainer x:Uid="Profile_CursorHeight"
                                    ClearSettingValue="{x:Bind Appearance.ClearCursorHeight}"
                                    HasSettingValue="{x:Bind Appearance.HasCursorHeight, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.CursorHeightOverrideSource, Mode=OneWay}"
@@ -578,8 +563,7 @@
            </local:SettingContainer>

            <!--  Background Image Stretch Mode  -->
-            <local:SettingContainer x:Name="BackgroundImageStretchMode"
-                                    x:Uid="Profile_BackgroundImageStretchMode"
+            <local:SettingContainer x:Uid="Profile_BackgroundImageStretchMode"
                                    ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageStretchMode}"
                                    HasSettingValue="{x:Bind Appearance.HasBackgroundImageStretchMode, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.BackgroundImageStretchModeOverrideSource, Mode=OneWay}"
@@ -592,8 +576,7 @@
            </local:SettingContainer>

            <!--  Background Image Alignment  -->
-            <local:SettingContainer x:Name="BackgroundImageAlignment"
-                                    x:Uid="Profile_BackgroundImageAlignment"
+            <local:SettingContainer x:Uid="Profile_BackgroundImageAlignment"
                                    ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageAlignment}"
                                    CurrentValue="{x:Bind Appearance.BackgroundImageAlignmentCurrentValue, Mode=OneWay}"
                                    HasSettingValue="{x:Bind Appearance.HasBackgroundImageAlignment, Mode=OneWay}"
@@ -781,8 +764,7 @@
            </local:SettingContainer>

            <!--  Background Image Opacity  -->
-            <local:SettingContainer x:Name="BackgroundImageOpacity"
-                                    x:Uid="Profile_BackgroundImageOpacity"
+            <local:SettingContainer x:Uid="Profile_BackgroundImageOpacity"
                                    ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageOpacity}"
                                    HasSettingValue="{x:Bind Appearance.HasBackgroundImageOpacity, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.BackgroundImageOpacityOverrideSource, Mode=OneWay}"
@@ -808,8 +790,7 @@
                       Style="{StaticResource TextBlockSubHeaderStyle}" />

            <!--  Intense is bold, bright  -->
-            <local:SettingContainer x:Name="IntenseTextStyle"
-                                    x:Uid="Appearance_IntenseTextStyle"
+            <local:SettingContainer x:Uid="Appearance_IntenseTextStyle"
                                    ClearSettingValue="{x:Bind Appearance.ClearIntenseTextStyle}"
                                    HasSettingValue="{x:Bind Appearance.HasIntenseTextStyle, Mode=OneWay}"
                                    SettingOverrideSource="{x:Bind Appearance.IntenseTextStyleOverrideSource, Mode=OneWay}">
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
@@ -33,10 +33,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    void ColorSchemes::OnNavigatedTo(const NavigationEventArgs& e)
    {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ColorSchemesPageViewModel>();
+        _ViewModel = e.Parameter().as<Editor::ColorSchemesPageViewModel>();
        _ViewModel.CurrentPage(ColorSchemesSubPage::Base);
-        BringIntoViewWhenLoaded(args.ElementToFocus());

        _layoutUpdatedRevoker = LayoutUpdated(winrt::auto_revoke, [this](auto /*s*/, auto /*e*/) {
            // Only let this succeed once.
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.cpp
@@ -16,7 +16,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        _settings{ settings }
    {
        INITIALIZE_BINDABLE_ENUM_SETTING(TextMeasurement, TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, L"Globals_TextMeasurement_", L"Text");
-        INITIALIZE_BINDABLE_ENUM_SETTING(AmbiguousWidth, AmbiguousWidth, winrt::Microsoft::Terminal::Control::AmbiguousWidth, L"Globals_AmbiguousWidth_", L"Text");
    }

    bool CompatibilityViewModel::DebugFeaturesAvailable() const noexcept
@@ -55,9 +54,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    void Compatibility::OnNavigatedTo(const NavigationEventArgs& e)
    {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::CompatibilityViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _ViewModel = e.Parameter().as<Editor::CompatibilityViewModel>();

        TraceLoggingWrite(
            g_hTerminalSettingsEditorProvider,
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.h
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.h
@@ -26,7 +26,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), AllowHeadless);
        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), DebugFeaturesEnabled);
        GETSET_BINDABLE_ENUM_SETTING(TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, _settings.GlobalSettings().TextMeasurement);
-        GETSET_BINDABLE_ENUM_SETTING(AmbiguousWidth, winrt::Microsoft::Terminal::Control::AmbiguousWidth, _settings.GlobalSettings().AmbiguousWidth);

    private:
        Model::CascadiaSettings _settings;
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.idl
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.idl
@@ -20,9 +20,6 @@ namespace Microsoft.Terminal.Settings.Editor

        IInspectable CurrentTextMeasurement;
        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> TextMeasurementList { get; };
-
-        IInspectable CurrentAmbiguousWidth;
-        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> AmbiguousWidthList { get; };
    }

    [default_interface] runtimeclass Compatibility : Windows.UI.Xaml.Controls.Page
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
@@ -26,15 +26,13 @@

    <StackPanel Style="{StaticResource SettingsStackStyle}">
        <!--  Allow Headless  -->
-        <local:SettingContainer x:Name="AllowHeadless"
-                                x:Uid="Globals_AllowHeadless">
+        <local:SettingContainer x:Uid="Globals_AllowHeadless">
            <ToggleSwitch IsOn="{x:Bind ViewModel.AllowHeadless, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>

        <!--  Text Measurement  -->
-        <local:SettingContainer x:Name="TextMeasurement"
-                                x:Uid="Globals_TextMeasurement">
+        <local:SettingContainer x:Uid="Globals_TextMeasurement">
            <ComboBox AutomationProperties.AccessibilityView="Content"
                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                      ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
@@ -42,26 +40,15 @@
                      Style="{StaticResource ComboBoxSettingStyle}" />
        </local:SettingContainer>

-        <!--  Ambiguous Width  -->
-        <local:SettingContainer x:Uid="Globals_AmbiguousWidth">
-            <ComboBox AutomationProperties.AccessibilityView="Content"
-                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                      ItemsSource="{x:Bind ViewModel.AmbiguousWidthList}"
-                      SelectedItem="{x:Bind ViewModel.CurrentAmbiguousWidth, Mode=TwoWay}"
-                      Style="{StaticResource ComboBoxSettingStyle}" />
-        </local:SettingContainer>
-
        <!--  Debug Features  -->
-        <local:SettingContainer x:Name="DebugFeaturesEnabled"
-                                x:Uid="Globals_DebugFeaturesEnabled"
+        <local:SettingContainer x:Uid="Globals_DebugFeaturesEnabled"
                                Visibility="{x:Bind ViewModel.DebugFeaturesAvailable}">
            <ToggleSwitch IsOn="{x:Bind ViewModel.DebugFeaturesEnabled, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>

        <!--  Reset Application State  -->
-        <local:SettingContainer x:Name="ResetApplicationState"
-                                x:Uid="Settings_ResetApplicationState">
+        <local:SettingContainer x:Uid="Settings_ResetApplicationState">
            <Button x:Uid="Settings_ResetApplicationStateButton"
                    Style="{StaticResource DeleteButtonStyle}">
                <Button.Flyout>
@@ -82,8 +69,7 @@
        </local:SettingContainer>

        <!--  Reset to Default Settings  -->
-        <local:SettingContainer x:Name="ResetToDefaultSettings"
-                                x:Uid="Settings_ResetToDefaultSettings">
+        <local:SettingContainer x:Uid="Settings_ResetToDefaultSettings">
            <Button x:Uid="Settings_ResetToDefaultSettingsButton"
                    Style="{StaticResource DeleteButtonStyle}">
                <Button.Flyout>
--- a/src/cascadia/TerminalSettingsEditor/EditAction.cpp
+++ b/src/cascadia/TerminalSettingsEditor/EditAction.cpp
@@ -8,9 +8,7 @@
 #include "../TerminalSettingsModel/AllShortcutActions.h"

 using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::UI::Xaml::Navigation;
-using namespace winrt::Windows::Foundation::Collections;

 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
@@ -20,8 +18,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    void EditAction::OnNavigatedTo(const NavigationEventArgs& e)
    {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::CommandViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToCommandArgs>();
+        _ViewModel = args.Command();
        _propagateWindowRootRevoker = _ViewModel.PropagateWindowRootRequested(
            winrt::auto_revoke,
            [windowRoot = args.WindowRoot()](const IInspectable&, const Editor::ArgWrapper& wrapper) {
@@ -38,9 +36,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                {
                    if (auto kcVM{ args.try_as<KeyChordViewModel>() })
                    {
-                        // Force a layout update in case this key chord was newly added
-                        page->KeyChordListView().ScrollIntoView(*kcVM);
-                        page->KeyChordListView().UpdateLayout();
                        if (const auto& container = page->KeyChordListView().ContainerFromItem(*kcVM))
                        {
                            container.as<Controls::ListViewItem>().Focus(FocusState::Programmatic);
@@ -54,86 +49,5 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

            CommandNameTextBox().Focus(FocusState::Programmatic);
        });
-
-        // Initialize AutoSuggestBox with current action and store last valid action
-        if (_ViewModel.ProposedShortcutActionName())
-        {
-            const auto currentAction = winrt::unbox_value<winrt::hstring>(_ViewModel.ProposedShortcutActionName());
-            ShortcutActionBox().Text(currentAction);
-            _lastValidAction = currentAction;
-        }
-    }
-
-    void EditAction::ShortcutActionBox_GotFocus(const IInspectable& sender, const RoutedEventArgs&)
-    {
-        // Only rebuild the list if we don't have a cached list or if the cached list is filtered
-        if (!_filteredActions || !_currentActionFilter.empty())
-        {
-            // Open the suggestions list with all available actions
-            std::vector<winrt::hstring> allActions;
-            for (const auto& action : _ViewModel.AvailableShortcutActions())
-            {
-                allActions.push_back(action);
-            }
-
-            _filteredActions = winrt::single_threaded_observable_vector(std::move(allActions));
-            _currentActionFilter = L"";
-            sender.as<AutoSuggestBox>().ItemsSource(_filteredActions);
-        }
-        sender.as<AutoSuggestBox>().IsSuggestionListOpen(true);
-    }
-
-    void EditAction::ShortcutActionBox_TextChanged(const AutoSuggestBox& sender, const AutoSuggestBoxTextChangedEventArgs& args)
-    {
-        if (args.Reason() == AutoSuggestionBoxTextChangeReason::UserInput)
-        {
-            const auto searchText = sender.Text();
-            std::vector<winrt::hstring> filtered;
-
-            for (const auto& action : _ViewModel.AvailableShortcutActions())
-            {
-                // TODO: Update this to use fzf later
-                if (til::contains_linguistic_insensitive(action, searchText))
-                {
-                    filtered.push_back(action);
-                }
-            }
-
-            _filteredActions = winrt::single_threaded_observable_vector(std::move(filtered));
-            _currentActionFilter = searchText;
-            sender.ItemsSource(_filteredActions);
-        }
-    }
-
-    void EditAction::ShortcutActionBox_QuerySubmitted(const AutoSuggestBox& sender, const AutoSuggestBoxQuerySubmittedEventArgs& args)
-    {
-        const auto submittedText = args.QueryText();
-
-        for (const auto& action : _ViewModel.AvailableShortcutActions())
-        {
-            if (action == submittedText)
-            {
-                _ViewModel.ProposedShortcutActionName(winrt::box_value(submittedText));
-                _lastValidAction = submittedText;
-                return;
-            }
-        }
-
-        // If we get here, we never found a match.
-        // Revert to the last valid action
-        sender.Text(_lastValidAction);
-    }
-
-    void EditAction::ShortcutActionBox_LostFocus(const IInspectable& sender, const RoutedEventArgs&)
-    {
-        // The auto suggest box does a weird thing where it reverts to the last query text when you
-        // keyboard navigate out of it. Intercept it here and keep the correct text.
-        const auto box = sender.as<AutoSuggestBox>();
-        const auto currentText = box.Text();
-
-        if (currentText != _lastValidAction && !_lastValidAction.empty())
-        {
-            box.Text(_lastValidAction);
-        }
    }
 }
--- a/src/cascadia/TerminalSettingsEditor/EditAction.h
+++ b/src/cascadia/TerminalSettingsEditor/EditAction.h
@@ -20,19 +20,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

        WINRT_OBSERVABLE_PROPERTY(Editor::CommandViewModel, ViewModel, PropertyChanged.raise, nullptr);

-        void ShortcutActionBox_GotFocus(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& args);
-        void ShortcutActionBox_TextChanged(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const winrt::Windows::UI::Xaml::Controls::AutoSuggestBoxTextChangedEventArgs& args);
-        void ShortcutActionBox_QuerySubmitted(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const winrt::Windows::UI::Xaml::Controls::AutoSuggestBoxQuerySubmittedEventArgs& args);
-        void ShortcutActionBox_LostFocus(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& args);
-
    private:
        friend struct EditActionT<EditAction>; // for Xaml to bind events
        winrt::Windows::UI::Xaml::FrameworkElement::LayoutUpdated_revoker _layoutUpdatedRevoker;
        Editor::CommandViewModel::PropagateWindowRootRequested_revoker _propagateWindowRootRevoker;
        Editor::CommandViewModel::FocusContainer_revoker _focusContainerRevoker;
-        winrt::Windows::Foundation::Collections::IObservableVector<winrt::hstring> _filteredActions{ nullptr };
-        winrt::hstring _lastValidAction;
-        winrt::hstring _currentActionFilter;
    };
 }

--- a/src/cascadia/TerminalSettingsEditor/EditAction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/EditAction.xaml
@@ -136,7 +136,7 @@
            </Style>
            <Style x:Key="KeyChordEditorStyle"
                   TargetType="local:KeyChordListener">
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
+                <Setter Property="HorizontalAlignment" Value="Left" />
                <Setter Property="VerticalAlignment" Value="Center" />
            </Style>
            <x:Int32 x:Key="EditButtonSize">32</x:Int32>
@@ -157,64 +157,63 @@
                <Setter Property="Height" Value="{StaticResource EditButtonSize}" />
                <Setter Property="Width" Value="{StaticResource EditButtonSize}" />
            </Style>
-            <Style x:Key="TextBlockGroupingStyle"
-                   BasedOn="{StaticResource BodyStrongTextBlockStyle}"
-                   TargetType="TextBlock">
-                <Setter Property="MaxWidth" Value="{StaticResource StandardControlMaxWidth}" />
-                <Setter Property="Margin" Value="0,0,0,4" />
-                <Setter Property="FontSize" Value="16" />
-            </Style>

            <!--  Templates  -->
            <DataTemplate x:Key="KeyChordTemplate"
                          x:DataType="local:KeyChordViewModel">
                <ListViewItem IsTabStop="False"
                              Style="{StaticResource KeyBindingContainerStyle}">
-                    <Grid Padding="-4,0,0,0"
+                    <Grid Padding="2,0,2,0"
                          VerticalAlignment="Center">
                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                            <ColumnDefinition Width="Auto" />
                            <ColumnDefinition Width="Auto" />
                            <ColumnDefinition Width="Auto" />
                        </Grid.ColumnDefinitions>
                        <Button Grid.Column="0"
-                                Background="{ThemeResource AppBarItemBackgroundThemeBrush}"
                                Click="{x:Bind ToggleEditMode}"
+                                Style="{ThemeResource KeyChordBorderStyle}"
                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(IsInEditMode), Mode=OneWay}">
                            <TextBlock FontSize="14"
+                                       Style="{ThemeResource KeyChordTextBlockStyle}"
                                       Text="{x:Bind KeyChordText, Mode=OneWay}"
                                       TextWrapping="WrapWholeWords" />
                        </Button>
-                        <local:KeyChordListener Grid.Column="0"
-                                                Keys="{x:Bind ProposedKeys, Mode=TwoWay}"
-                                                Style="{StaticResource KeyChordEditorStyle}"
-                                                Visibility="{x:Bind IsInEditMode, Mode=OneWay}" />
-                        <Button x:Uid="Actions_CancelButton"
-                                Grid.Column="1"
+                        <Grid Grid.Column="0"
+                              ColumnSpacing="8"
+                              Visibility="{x:Bind IsInEditMode, Mode=OneWay}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <!--  Edit Mode: Key Chord Listener  -->
+                            <local:KeyChordListener Grid.Column="0"
+                                                    Keys="{x:Bind ProposedKeys, Mode=TwoWay}"
+                                                    Style="{StaticResource KeyChordEditorStyle}" />
+
+                            <!--  Cancel editing the action  -->
+                            <Button x:Uid="Actions_CancelButton"
+                                    Grid.Column="1"
+                                    AutomationProperties.Name="{x:Bind CancelButtonName}"
+                                    Click="{x:Bind CancelChanges}"
+                                    Style="{StaticResource EditButtonStyle}">
+                                <FontIcon FontSize="{StaticResource EditButtonIconSize}"
+                                          Glyph="&#xE711;" />
+                            </Button>
+
+                            <!--  Accept changes  -->
+                            <Button x:Uid="Actions_AcceptButton"
+                                    Grid.Column="2"
+                                    AutomationProperties.Name="{x:Bind AcceptButtonName}"
+                                    Click="{x:Bind AcceptChanges}"
+                                    Flyout="{x:Bind AcceptChangesFlyout, Mode=OneWay}"
+                                    Style="{StaticResource AccentEditButtonStyle}">
+                                <FontIcon FontSize="{StaticResource EditButtonIconSize}"
+                                          Glyph="&#xE8FB;" />
+                            </Button>
+                        </Grid>
+                        <Button Grid.Column="1"
                                Margin="8,0,0,0"
-                                AutomationProperties.Name="{x:Bind CancelButtonName}"
-                                Click="{x:Bind CancelChanges}"
-                                Style="{StaticResource EditButtonStyle}"
-                                Visibility="{x:Bind IsInEditMode, Mode=OneWay}">
-                            <FontIcon FontSize="{StaticResource EditButtonIconSize}"
-                                      Glyph="&#xE711;" />
-                        </Button>
-
-                        <Button x:Uid="Actions_AcceptButton"
-                                Grid.Column="2"
-                                Margin="8,0,8,0"
-                                AutomationProperties.Name="{x:Bind AcceptButtonName}"
-                                Click="{x:Bind AcceptChanges}"
-                                Flyout="{x:Bind AcceptChangesFlyout, Mode=OneWay}"
-                                Style="{StaticResource AccentEditButtonStyle}"
-                                Visibility="{x:Bind IsInEditMode, Mode=OneWay}">
-                            <FontIcon FontSize="{StaticResource EditButtonIconSize}"
-                                      Glyph="&#xE8FB;" />
-                        </Button>
-
-                        <Button Grid.Column="3"
-                                HorizontalAlignment="Left"
                                AutomationProperties.Name="{x:Bind DeleteButtonName}"
                                Style="{StaticResource DeleteSmallButtonStyle}">
                            <Button.Content>
@@ -244,14 +243,13 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
                               VerticalAlignment="Center"
                               Text="{x:Bind Name}"
                               TextWrapping="WrapWholeWords" />
                    <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                    AutomationProperties.Name="{x:Bind Name}"
                                    LargeChange="1"
                                    Maximum="100"
@@ -269,14 +267,13 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
                               VerticalAlignment="Center"
                               Text="{x:Bind Name}"
                               TextWrapping="WrapWholeWords" />
                    <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                    AutomationProperties.Name="{x:Bind Name}"
                                    LargeChange="1"
                                    Maximum="999"
@@ -294,14 +291,13 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
                               VerticalAlignment="Center"
                               Text="{x:Bind Name}"
                               TextWrapping="WrapWholeWords" />
                    <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                    AutomationProperties.Name="{x:Bind Name}"
                                    LargeChange="1"
                                    Maximum="999"
@@ -319,14 +315,13 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
                               VerticalAlignment="Center"
                               Text="{x:Bind Name}"
                               TextWrapping="WrapWholeWords" />
                    <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                    AutomationProperties.Name="{x:Bind Name}"
                                    LargeChange="1"
                                    Maximum="999"
@@ -344,14 +339,13 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
                               VerticalAlignment="Center"
                               Text="{x:Bind Name}"
                               TextWrapping="WrapWholeWords" />
                    <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                    AutomationProperties.Name="{x:Bind Name}"
                                    LargeChange="1"
                                    Maximum="999"
@@ -369,14 +363,13 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
                               VerticalAlignment="Center"
                               Text="{x:Bind Name}"
                               TextWrapping="WrapWholeWords" />
                    <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                    AutomationProperties.Name="{x:Bind Name}"
                                    LargeChange="0.2"
                                    Maximum="1"
@@ -394,7 +387,7 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*"
+                        <ColumnDefinition Width="Auto"
                                          MinWidth="196" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
@@ -415,14 +408,13 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
                               VerticalAlignment="Center"
                               Text="{x:Bind Name}"
                               TextWrapping="WrapWholeWords" />
                    <ComboBox Grid.Column="1"
-                              HorizontalAlignment="Stretch"
                              AutomationProperties.Name="{x:Bind Name}"
                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                              ItemsSource="{x:Bind EnumList, Mode=OneWay}"
@@ -490,14 +482,13 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
                               VerticalAlignment="Center"
                               Text="{x:Bind Name}"
                               TextWrapping="WrapWholeWords" />
                    <ToggleSwitch Grid.Column="1"
-                                  HorizontalAlignment="Left"
                                  AutomationProperties.Name="{x:Bind Name}"
                                  IsOn="{x:Bind UnboxBool(Value), Mode=TwoWay, BindBack=BoolOptionalBindBack}" />
                </Grid>
@@ -510,14 +501,13 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
                               VerticalAlignment="Center"
                               Text="{x:Bind Name}"
                               TextWrapping="WrapWholeWords" />
                    <CheckBox Grid.Column="1"
-                              HorizontalAlignment="Left"
                              AutomationProperties.Name="{x:Bind Name}"
                              IsChecked="{x:Bind UnboxBoolOptional(Value), Mode=TwoWay, BindBack=BoolOptionalBindBack}"
                              IsThreeState="True" />
@@ -536,14 +526,13 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
                               VerticalAlignment="Center"
                               Text="{x:Bind Name}"
                               TextWrapping="WrapWholeWords" />
                    <ComboBox Grid.Column="1"
-                              HorizontalAlignment="Stretch"
                              AutomationProperties.Name="{x:Bind Name}"
                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                              ItemsSource="{x:Bind EnumList, Mode=OneWay}"
@@ -597,7 +586,7 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
                               VerticalAlignment="Center"
@@ -619,7 +608,7 @@
                      ColumnSpacing="8">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <TextBlock Grid.Column="0"
                               VerticalAlignment="Center"
@@ -657,98 +646,73 @@

    <Border MaxWidth="{StaticResource StandardControlMaxWidth}"
            Margin="{StaticResource SettingStackMargin}">
-        <Grid Margin="{StaticResource SettingStackMargin}"
-              HorizontalAlignment="Stretch">
+        <Grid MaxWidth="600"
+              Margin="{StaticResource SettingStackMargin}"
+              HorizontalAlignment="Left"
+              ColumnSpacing="16"
+              RowSpacing="8">
            <Grid.RowDefinitions>
                <RowDefinition Height="Auto" />
                <RowDefinition Height="Auto" />
                <RowDefinition Height="Auto" />
                <RowDefinition Height="Auto" />
                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
            </Grid.RowDefinitions>
            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                <ColumnDefinition Width="Auto" />
                <ColumnDefinition Width="*" />
            </Grid.ColumnDefinitions>
-            <TextBlock x:Uid="Actions_CommandDetails"
+            <TextBlock x:Uid="Actions_Name"
                       Grid.Row="0"
                       Grid.Column="0"
-                       Grid.ColumnSpan="2"
-                       Margin="0,0,0,12"
-                       VerticalAlignment="Center"
-                       Style="{StaticResource TextBlockGroupingStyle}" />
-            <TextBlock x:Uid="Actions_Name"
-                       Grid.Row="1"
-                       Grid.Column="0"
-                       Margin="0,0,0,8"
                       VerticalAlignment="Center" />
            <TextBox x:Name="CommandNameTextBox"
-                     Grid.Row="1"
+                     Grid.Row="0"
                     Grid.Column="1"
-                     Margin="0,0,0,8"
-                     HorizontalAlignment="Stretch"
+                     Width="300"
+                     HorizontalAlignment="Left"
                     AutomationProperties.Name="{x:Bind ViewModel.ActionNameTextBoxAutomationPropName}"
                     PlaceholderText="{x:Bind ViewModel.DisplayName, Mode=OneWay}"
                     Text="{x:Bind ViewModel.Name, Mode=TwoWay}" />
            <TextBlock x:Uid="Actions_ShortcutAction"
+                       Grid.Row="1"
+                       Grid.Column="0"
+                       VerticalAlignment="Center" />
+            <ComboBox Grid.Row="1"
+                      Grid.Column="1"
+                      VerticalAlignment="Center"
+                      AutomationProperties.Name="{x:Bind ViewModel.ShortcutActionComboBoxAutomationPropName}"
+                      ItemsSource="{x:Bind ViewModel.AvailableShortcutActions, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.ProposedShortcutActionName, Mode=TwoWay}" />
+            <TextBlock x:Uid="Actions_Arguments"
                       Grid.Row="2"
                       Grid.Column="0"
-                       Margin="0,0,0,12"
-                       VerticalAlignment="Center" />
-            <AutoSuggestBox x:Name="ShortcutActionBox"
-                            Grid.Row="2"
-                            Grid.Column="1"
-                            Margin="0,0,0,12"
-                            VerticalAlignment="Center"
-                            AutomationProperties.Name="{x:Bind ViewModel.ShortcutActionComboBoxAutomationPropName}"
-                            GotFocus="ShortcutActionBox_GotFocus"
-                            LostFocus="ShortcutActionBox_LostFocus"
-                            QuerySubmitted="ShortcutActionBox_QuerySubmitted"
-                            TextChanged="ShortcutActionBox_TextChanged" />
-            <TextBlock x:Uid="Actions_Keybindings"
-                       Grid.Row="3"
-                       Grid.Column="0"
-                       Grid.ColumnSpan="2"
-                       Margin="0,0,0,12"
                       VerticalAlignment="Center"
-                       Style="{StaticResource TextBlockGroupingStyle}" />
-            <ListView x:Name="KeyChordListView"
-                      x:Uid="Actions_KeyBindingsListView"
-                      Grid.Row="4"
-                      Grid.Column="0"
-                      Grid.ColumnSpan="2"
-                      Margin="0,0,0,12"
-                      ItemTemplate="{StaticResource KeyChordTemplate}"
-                      ItemsSource="{x:Bind ViewModel.KeyChordList, Mode=OneWay}"
-                      SelectionMode="None">
-                <ListView.Footer>
-                    <Button Margin="0,4,0,0"
-                            Click="{x:Bind ViewModel.AddKeybinding_Click}">
-                        <TextBlock x:Uid="Actions_AddKeyChord" />
-                    </Button>
-                </ListView.Footer>
-            </ListView>
-            <TextBlock x:Uid="Actions_Arguments"
-                       Grid.Row="5"
-                       Grid.Column="0"
-                       Grid.ColumnSpan="2"
-                       Margin="0,0,0,12"
-                       VerticalAlignment="Center"
-                       Style="{StaticResource TextBlockGroupingStyle}"
                       Visibility="{x:Bind ViewModel.ActionArgsVM.HasArgs, Mode=OneWay}" />
-            <ItemsControl Grid.Row="6"
-                          Grid.Column="0"
-                          Grid.ColumnSpan="2"
-                          Margin="0,0,0,12"
-                          HorizontalAlignment="Stretch"
+            <ItemsControl Grid.Row="2"
+                          Grid.Column="1"
                          AutomationProperties.Name="{x:Bind ViewModel.AdditionalArgumentsControlAutomationPropName}"
                          IsTabStop="False"
                          ItemTemplateSelector="{StaticResource ArgsTemplateSelector}"
                          ItemsSource="{x:Bind ViewModel.ActionArgsVM.ArgValues, Mode=OneWay}" />
-            <Button Grid.Row="7"
+            <TextBlock x:Uid="Actions_Keybindings"
+                       Grid.Row="3"
+                       Grid.Column="0"
+                       VerticalAlignment="Center" />
+            <ListView x:Name="KeyChordListView"
+                      x:Uid="Actions_KeyBindingsListView"
+                      Grid.Row="3"
+                      Grid.Column="1"
+                      ItemTemplate="{StaticResource KeyChordTemplate}"
+                      ItemsSource="{x:Bind ViewModel.KeyChordList, Mode=OneWay}"
+                      SelectionMode="None">
+                <ListView.Header>
+                    <Button Click="{x:Bind ViewModel.AddKeybinding_Click}">
+                        <TextBlock x:Uid="Actions_AddKeyChord" />
+                    </Button>
+                </ListView.Header>
+            </ListView>
+            <Button Grid.Row="4"
                    Grid.Column="0"
                    IsEnabled="{x:Bind ViewModel.IsUserAction, Mode=OneWay}"
                    Style="{StaticResource DeleteButtonStyle}">
--- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp
+++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp
@@ -38,9 +38,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    void EditColorScheme::OnNavigatedTo(const NavigationEventArgs& e)
    {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ColorSchemeViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _ViewModel = e.Parameter().as<Editor::ColorSchemeViewModel>();

        const auto schemeName = _ViewModel.Name();
        NameBox().Text(schemeName);
--- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
+++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
@@ -200,8 +200,7 @@
            </Grid>
        </Border>

-        <local:SettingContainer x:Name="InboxSchemeDuplicate"
-                                x:Uid="ColorScheme_InboxSchemeDuplicate"
+        <local:SettingContainer x:Uid="ColorScheme_InboxSchemeDuplicate"
                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.IsEditable), Mode=OneWay}">
            <Button x:Name="DuplicateSchemeButton"
                    x:Uid="ColorScheme_DuplicateButton"
@@ -209,8 +208,7 @@
                    Style="{StaticResource BrowseButtonStyle}" />
        </local:SettingContainer>

-        <local:SettingContainer x:Name="ColorsHeader"
-                                x:Uid="ColorScheme_ColorsHeader"
+        <local:SettingContainer x:Uid="ColorScheme_ColorsHeader"
                                StartExpanded="True"
                                Style="{StaticResource ExpanderSettingContainerStyle}"
                                Visibility="{x:Bind ViewModel.IsEditable, Mode=OneWay}">
--- a/src/cascadia/TerminalSettingsEditor/Extensions.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.cpp
@@ -8,7 +8,6 @@
 #include "ExtensionsViewModel.g.cpp"
 #include "FragmentProfileViewModel.g.cpp"
 #include "ExtensionPackageTemplateSelector.g.cpp"
-#include "NavConstants.h"

 #include "..\WinRTUtils\inc\Utils.h"

@@ -34,17 +33,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    void Extensions::OnNavigatedTo(const NavigationEventArgs& e)
    {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ExtensionsViewModel>();
-
-        // The extensions are loaded asynchronously as a part of the VM ctor.
-        // However, there's a chance that they aren't done loading yet.
-        // Calling LoadExtensions() ensures they're loaded by the time we try to display them, and it won't do anything if they're already loaded.
+        _ViewModel = e.Parameter().as<Editor::ExtensionsViewModel>();
        auto vmImpl = get_self<ExtensionsViewModel>(_ViewModel);
-        vmImpl->LoadExtensions();
        vmImpl->ExtensionPackageIdentifierTemplateSelector(_extensionPackageIdentifierTemplateSelector);
-
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        vmImpl->LazyLoadExtensions();

        if (vmImpl->IsExtensionView())
        {
@@ -97,10 +89,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    ExtensionsViewModel::ExtensionsViewModel(const Model::CascadiaSettings& settings, const Editor::ColorSchemesPageViewModel& colorSchemesPageVM) :
        _settings{ settings },
-        _colorSchemesPageVM{ colorSchemesPageVM }
+        _colorSchemesPageVM{ colorSchemesPageVM },
+        _extensionsLoaded{ false }
    {
        UpdateSettings(settings, colorSchemesPageVM);
-        _LoadExtensionsAsync();

        PropertyChanged([this](auto&&, const PropertyChangedEventArgs& args) {
            const auto viewModelProperty{ args.PropertyName() };
@@ -220,7 +212,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        _CurrentExtensionPackage = nullptr;

        // The extension packages may not be loaded yet because we want to wait until we actually navigate to the page to do so.
-        // In that case, omit "updating" them. They'll get the proper references when we load them.
+        // In that case, omit "updating" them. They'll get the proper references when we lazy load them.
        if (_extensionPackages)
        {
            for (const auto& extPkg : _extensionPackages)
@@ -230,146 +222,139 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        }
    }

-    safe_void_coroutine ExtensionsViewModel::_LoadExtensionsAsync()
+    void ExtensionsViewModel::LazyLoadExtensions()
    {
-        auto weakThis = get_weak();
-        co_await winrt::resume_background();
-        if (auto strongThis = weakThis.get())
+        if (_extensionsLoaded)
        {
-            strongThis->LoadExtensions();
+            return;
        }
-    }
+        std::vector<Model::ExtensionPackage> extensions = wil::to_vector(_settings.Extensions());

-    void ExtensionsViewModel::LoadExtensions()
-    {
-        std::call_once(_extensionsLoaded, [this]() {
-            std::vector<Model::ExtensionPackage> extensions = wil::to_vector(_settings.Extensions());
-
-            // these vectors track components all extensions successfully added
-            std::vector<Editor::ExtensionPackageViewModel> extensionPackages;
-            std::vector<Editor::FragmentProfileViewModel> profilesModifiedTotal;
-            std::vector<Editor::FragmentProfileViewModel> profilesAddedTotal;
-            std::vector<Editor::FragmentColorSchemeViewModel> colorSchemesAddedTotal;
-            for (const auto& extPkg : extensions)
+        // these vectors track components all extensions successfully added
+        std::vector<Editor::ExtensionPackageViewModel> extensionPackages;
+        std::vector<Editor::FragmentProfileViewModel> profilesModifiedTotal;
+        std::vector<Editor::FragmentProfileViewModel> profilesAddedTotal;
+        std::vector<Editor::FragmentColorSchemeViewModel> colorSchemesAddedTotal;
+        for (const auto& extPkg : extensions)
+        {
+            auto extPkgVM = winrt::make_self<ExtensionPackageViewModel>(extPkg, _settings);
+            for (const auto& fragExt : extPkg.FragmentsView())
            {
-                auto extPkgVM = winrt::make_self<ExtensionPackageViewModel>(extPkg, _settings);
-                for (const auto& fragExt : extPkg.FragmentsView())
+                const auto extensionEnabled = GetExtensionState(fragExt.Source(), _settings);
+
+                // these vectors track everything the current extension attempted to bring in
+                std::vector<Editor::FragmentProfileViewModel> currentProfilesModified;
+                std::vector<Editor::FragmentProfileViewModel> currentProfilesAdded;
+                std::vector<Editor::FragmentColorSchemeViewModel> currentColorSchemesAdded;
+
+                if (fragExt.ModifiedProfilesView())
                {
-                    const auto extensionEnabled = GetExtensionState(fragExt.Source(), _settings);
-
-                    // these vectors track everything the current extension attempted to bring in
-                    std::vector<Editor::FragmentProfileViewModel> currentProfilesModified;
-                    std::vector<Editor::FragmentProfileViewModel> currentProfilesAdded;
-                    std::vector<Editor::FragmentColorSchemeViewModel> currentColorSchemesAdded;
-
-                    if (fragExt.ModifiedProfilesView())
+                    for (const auto&& entry : fragExt.ModifiedProfilesView())
                    {
-                        for (const auto&& entry : fragExt.ModifiedProfilesView())
+                        // Ensure entry successfully modifies a profile before creating and registering the object
+                        if (const auto& deducedProfile = _settings.FindProfile(entry.ProfileGuid()))
                        {
-                            // Ensure entry successfully modifies a profile before creating and registering the object
-                            if (const auto& deducedProfile = _settings.FindProfile(entry.ProfileGuid()))
+                            auto vm = winrt::make<FragmentProfileViewModel>(entry, fragExt, deducedProfile);
+                            currentProfilesModified.push_back(vm);
+                            if (extensionEnabled)
                            {
-                                auto vm = winrt::make<FragmentProfileViewModel>(entry, fragExt, deducedProfile);
-                                currentProfilesModified.push_back(vm);
-                                if (extensionEnabled)
-                                {
-                                    profilesModifiedTotal.push_back(vm);
-                                }
+                                profilesModifiedTotal.push_back(vm);
                            }
                        }
                    }
-
-                    if (fragExt.NewProfilesView())
-                    {
-                        for (const auto&& entry : fragExt.NewProfilesView())
-                        {
-                            // Ensure entry successfully points to a profile before creating and registering the object.
-                            // The profile may have been removed by the user.
-                            if (const auto& deducedProfile = _settings.FindProfile(entry.ProfileGuid()))
-                            {
-                                auto vm = winrt::make<FragmentProfileViewModel>(entry, fragExt, deducedProfile);
-                                currentProfilesAdded.push_back(vm);
-                                if (extensionEnabled)
-                                {
-                                    profilesAddedTotal.push_back(vm);
-                                }
-                            }
-                        }
-                    }
-
-                    if (fragExt.ColorSchemesView())
-                    {
-                        for (const auto&& entry : fragExt.ColorSchemesView())
-                        {
-                            for (const auto& schemeVM : _colorSchemesPageVM.AllColorSchemes())
-                            {
-                                if (schemeVM.Name() == entry.ColorSchemeName())
-                                {
-                                    auto vm = winrt::make<FragmentColorSchemeViewModel>(entry, fragExt, schemeVM);
-                                    currentColorSchemesAdded.push_back(vm);
-                                    if (extensionEnabled)
-                                    {
-                                        colorSchemesAddedTotal.push_back(vm);
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    // sort the lists linguistically for nicer presentation
-                    std::sort(currentProfilesModified.begin(), currentProfilesModified.end(), FragmentProfileViewModel::SortAscending);
-                    std::sort(currentProfilesAdded.begin(), currentProfilesAdded.end(), FragmentProfileViewModel::SortAscending);
-                    std::sort(currentColorSchemesAdded.begin(), currentColorSchemesAdded.end(), FragmentColorSchemeViewModel::SortAscending);
-
-                    extPkgVM->FragmentExtensions().Append(winrt::make<FragmentExtensionViewModel>(fragExt, currentProfilesModified, currentProfilesAdded, currentColorSchemesAdded));
-                    extPkgVM->PropertyChanged([&](const IInspectable& sender, const PropertyChangedEventArgs& args) {
-                        const auto viewModelProperty{ args.PropertyName() };
-                        if (viewModelProperty == L"Enabled")
-                        {
-                            // If the extension was enabled/disabled,
-                            // check if any of its fragments modified profiles, added profiles, or added color schemes.
-                            // Only notify what was affected!
-                            bool hasModifiedProfiles = false;
-                            bool hasAddedProfiles = false;
-                            bool hasAddedColorSchemes = false;
-                            for (const auto& fragExtVM : sender.as<ExtensionPackageViewModel>()->FragmentExtensions())
-                            {
-                                const auto profilesModified = fragExtVM.ProfilesModified();
-                                const auto profilesAdded = fragExtVM.ProfilesAdded();
-                                const auto colorSchemesAdded = fragExtVM.ColorSchemesAdded();
-                                hasModifiedProfiles |= profilesModified && profilesModified.Size() > 0;
-                                hasAddedProfiles |= profilesAdded && profilesAdded.Size() > 0;
-                                hasAddedColorSchemes |= colorSchemesAdded && colorSchemesAdded.Size() > 0;
-                            }
-                            if (hasModifiedProfiles)
-                            {
-                                _NotifyChanges(L"ProfilesModified");
-                            }
-                            if (hasAddedProfiles)
-                            {
-                                _NotifyChanges(L"ProfilesAdded");
-                            }
-                            if (hasAddedColorSchemes)
-                            {
-                                _NotifyChanges(L"ColorSchemesAdded");
-                            }
-                        }
-                    });
                }
-                extensionPackages.push_back(*extPkgVM);
+
+                if (fragExt.NewProfilesView())
+                {
+                    for (const auto&& entry : fragExt.NewProfilesView())
+                    {
+                        // Ensure entry successfully points to a profile before creating and registering the object.
+                        // The profile may have been removed by the user.
+                        if (const auto& deducedProfile = _settings.FindProfile(entry.ProfileGuid()))
+                        {
+                            auto vm = winrt::make<FragmentProfileViewModel>(entry, fragExt, deducedProfile);
+                            currentProfilesAdded.push_back(vm);
+                            if (extensionEnabled)
+                            {
+                                profilesAddedTotal.push_back(vm);
+                            }
+                        }
+                    }
+                }
+
+                if (fragExt.ColorSchemesView())
+                {
+                    for (const auto&& entry : fragExt.ColorSchemesView())
+                    {
+                        for (const auto& schemeVM : _colorSchemesPageVM.AllColorSchemes())
+                        {
+                            if (schemeVM.Name() == entry.ColorSchemeName())
+                            {
+                                auto vm = winrt::make<FragmentColorSchemeViewModel>(entry, fragExt, schemeVM);
+                                currentColorSchemesAdded.push_back(vm);
+                                if (extensionEnabled)
+                                {
+                                    colorSchemesAddedTotal.push_back(vm);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // sort the lists linguistically for nicer presentation
+                std::sort(currentProfilesModified.begin(), currentProfilesModified.end(), FragmentProfileViewModel::SortAscending);
+                std::sort(currentProfilesAdded.begin(), currentProfilesAdded.end(), FragmentProfileViewModel::SortAscending);
+                std::sort(currentColorSchemesAdded.begin(), currentColorSchemesAdded.end(), FragmentColorSchemeViewModel::SortAscending);
+
+                extPkgVM->FragmentExtensions().Append(winrt::make<FragmentExtensionViewModel>(fragExt, currentProfilesModified, currentProfilesAdded, currentColorSchemesAdded));
+                extPkgVM->PropertyChanged([&](const IInspectable& sender, const PropertyChangedEventArgs& args) {
+                    const auto viewModelProperty{ args.PropertyName() };
+                    if (viewModelProperty == L"Enabled")
+                    {
+                        // If the extension was enabled/disabled,
+                        // check if any of its fragments modified profiles, added profiles, or added color schemes.
+                        // Only notify what was affected!
+                        bool hasModifiedProfiles = false;
+                        bool hasAddedProfiles = false;
+                        bool hasAddedColorSchemes = false;
+                        for (const auto& fragExtVM : sender.as<ExtensionPackageViewModel>()->FragmentExtensions())
+                        {
+                            const auto profilesModified = fragExtVM.ProfilesModified();
+                            const auto profilesAdded = fragExtVM.ProfilesAdded();
+                            const auto colorSchemesAdded = fragExtVM.ColorSchemesAdded();
+                            hasModifiedProfiles |= profilesModified && profilesModified.Size() > 0;
+                            hasAddedProfiles |= profilesAdded && profilesAdded.Size() > 0;
+                            hasAddedColorSchemes |= colorSchemesAdded && colorSchemesAdded.Size() > 0;
+                        }
+                        if (hasModifiedProfiles)
+                        {
+                            _NotifyChanges(L"ProfilesModified");
+                        }
+                        if (hasAddedProfiles)
+                        {
+                            _NotifyChanges(L"ProfilesAdded");
+                        }
+                        if (hasAddedColorSchemes)
+                        {
+                            _NotifyChanges(L"ColorSchemesAdded");
+                        }
+                    }
+                });
            }
+            extensionPackages.push_back(*extPkgVM);
+        }

-            // sort the lists linguistically for nicer presentation
-            std::sort(extensionPackages.begin(), extensionPackages.end(), ExtensionPackageViewModel::SortAscending);
-            std::sort(profilesModifiedTotal.begin(), profilesModifiedTotal.end(), FragmentProfileViewModel::SortAscending);
-            std::sort(profilesAddedTotal.begin(), profilesAddedTotal.end(), FragmentProfileViewModel::SortAscending);
-            std::sort(colorSchemesAddedTotal.begin(), colorSchemesAddedTotal.end(), FragmentColorSchemeViewModel::SortAscending);
+        // sort the lists linguistically for nicer presentation
+        std::sort(extensionPackages.begin(), extensionPackages.end(), ExtensionPackageViewModel::SortAscending);
+        std::sort(profilesModifiedTotal.begin(), profilesModifiedTotal.end(), FragmentProfileViewModel::SortAscending);
+        std::sort(profilesAddedTotal.begin(), profilesAddedTotal.end(), FragmentProfileViewModel::SortAscending);
+        std::sort(colorSchemesAddedTotal.begin(), colorSchemesAddedTotal.end(), FragmentColorSchemeViewModel::SortAscending);

-            _extensionPackages = single_threaded_observable_vector<Editor::ExtensionPackageViewModel>(std::move(extensionPackages));
-            _profilesModifiedView = single_threaded_observable_vector<Editor::FragmentProfileViewModel>(std::move(profilesModifiedTotal));
-            _profilesAddedView = single_threaded_observable_vector<Editor::FragmentProfileViewModel>(std::move(profilesAddedTotal));
-            _colorSchemesAddedView = single_threaded_observable_vector<Editor::FragmentColorSchemeViewModel>(std::move(colorSchemesAddedTotal));
-        });
+        _extensionPackages = single_threaded_observable_vector<Editor::ExtensionPackageViewModel>(std::move(extensionPackages));
+        _profilesModifiedView = single_threaded_observable_vector<Editor::FragmentProfileViewModel>(std::move(profilesModifiedTotal));
+        _profilesAddedView = single_threaded_observable_vector<Editor::FragmentProfileViewModel>(std::move(profilesAddedTotal));
+        _colorSchemesAddedView = single_threaded_observable_vector<Editor::FragmentColorSchemeViewModel>(std::move(colorSchemesAddedTotal));
+        _extensionsLoaded = true;
    }

    Windows::UI::Xaml::DataTemplate ExtensionsViewModel::CurrentExtensionPackageIdentifierTemplate() const
@@ -467,20 +452,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        }
    }

-    hstring ExtensionPackageViewModel::DisplayName() const noexcept
-    {
-        // Fragment extensions may not have a DisplayName, so fall back to Source
-        const auto displayName = _package.DisplayName();
-        return displayName.empty() ? _package.Source() : displayName;
-    }
-
-    hstring ExtensionPackageViewModel::Icon() const noexcept
-    {
-        // Fragment extensions may not have an Icon, so fall back to the extensions nav icon glyph
-        const auto icon = _package.Icon();
-        return icon.empty() ? NavTagIconMap[extensionsTag] : icon;
-    }
-
    hstring ExtensionPackageViewModel::Scope() const noexcept
    {
        return _package.Scope() == Model::FragmentScope::User ? RS_(L"Extensions_ScopeUser") : RS_(L"Extensions_ScopeSystem");
--- a/src/cascadia/TerminalSettingsEditor/Extensions.h
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.h
@@ -48,14 +48,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        bool NoSchemesAdded() const noexcept { return _colorSchemesAddedView.Size() == 0; }

        // Views
-        // NOTE: the extensions are being loaded asynchronously in the ctor. _extensionPackages may be null in that brief window of time.
-        Windows::Foundation::Collections::IObservableVector<Editor::ExtensionPackageViewModel> ExtensionPackages() const noexcept { return _extensionPackages ? _extensionPackages : single_threaded_observable_vector<Editor::ExtensionPackageViewModel>(); }
+        Windows::Foundation::Collections::IObservableVector<Editor::ExtensionPackageViewModel> ExtensionPackages() const noexcept { return _extensionPackages; }
        Windows::Foundation::Collections::IObservableVector<Editor::FragmentProfileViewModel> ProfilesModified() const noexcept { return _profilesModifiedView; }
        Windows::Foundation::Collections::IObservableVector<Editor::FragmentProfileViewModel> ProfilesAdded() const noexcept { return _profilesAddedView; }
        Windows::Foundation::Collections::IObservableVector<Editor::FragmentColorSchemeViewModel> ColorSchemesAdded() const noexcept { return _colorSchemesAddedView; }

        // Methods
-        void LoadExtensions();
+        void LazyLoadExtensions();
        void UpdateSettings(const Model::CascadiaSettings& settings, const Editor::ColorSchemesPageViewModel& colorSchemesPageVM);
        void NavigateToProfile(const guid profileGuid);
        void NavigateToColorScheme(const Editor::ColorSchemeViewModel& schemeVM);
@@ -76,9 +75,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        Windows::Foundation::Collections::IObservableVector<Editor::FragmentProfileViewModel> _profilesModifiedView;
        Windows::Foundation::Collections::IObservableVector<Editor::FragmentProfileViewModel> _profilesAddedView;
        Windows::Foundation::Collections::IObservableVector<Editor::FragmentColorSchemeViewModel> _colorSchemesAddedView;
-        std::once_flag _extensionsLoaded;
+        bool _extensionsLoaded;

-        safe_void_coroutine _LoadExtensionsAsync();
        void _UpdateListViews(bool updateProfilesModified, bool updateProfilesAdded, bool updateColorSchemesAdded);
    };

@@ -95,8 +93,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        void UpdateSettings(const Model::CascadiaSettings& settings);

        Model::ExtensionPackage Package() const noexcept { return _package; }
-        hstring DisplayName() const noexcept;
-        hstring Icon() const noexcept;
        hstring Scope() const noexcept;
        bool Enabled() const;
        void Enabled(bool val);
--- a/src/cascadia/TerminalSettingsEditor/Extensions.idl
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.idl
@@ -40,8 +40,6 @@ namespace Microsoft.Terminal.Settings.Editor
    [default_interface] runtimeclass ExtensionPackageViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
    {
        Microsoft.Terminal.Settings.Model.ExtensionPackage Package { get; };
-        String DisplayName { get; };
-        String Icon { get; };
        Boolean Enabled;
        String Scope { get; };
        String AccessibleName { get; };
--- a/src/cascadia/TerminalSettingsEditor/Extensions.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.xaml
@@ -500,8 +500,7 @@
                <muxc:Expander.Content>
                    <StackPanel>
                        <!--  Scope  -->
-                        <local:SettingContainer x:Name="Scope"
-                                                x:Uid="Extensions_Scope"
+                        <local:SettingContainer x:Uid="Extensions_Scope"
                                                Content="{x:Bind ViewModel.CurrentExtensionPackage.Scope, Mode=OneWay}"
                                                IsTabStop="False"
                                                Style="{StaticResource SettingContainerWithTextContent}" />
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp
@@ -23,9 +23,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    void GlobalAppearance::OnNavigatedTo(const NavigationEventArgs& e)
    {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::GlobalAppearanceViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _ViewModel = e.Parameter().as<Editor::GlobalAppearanceViewModel>();

        TraceLoggingWrite(
            g_hTerminalSettingsEditorProvider,
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl
@@ -5,7 +5,7 @@ import "GlobalAppearanceViewModel.idl";

 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass GlobalAppearance : Windows.UI.Xaml.Controls.Page
+    [default_interface] runtimeclass GlobalAppearance : Windows.UI.Xaml.Controls.Page
    {
        GlobalAppearance();
        GlobalAppearanceViewModel ViewModel { get; };
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
@@ -28,8 +28,7 @@

    <StackPanel Style="{StaticResource SettingsStackStyle}">
        <!--  Theme  -->
-        <local:SettingContainer x:Name="Theme"
-                                x:Uid="Globals_Theme">
+        <local:SettingContainer x:Uid="Globals_Theme">
            <ComboBox AutomationProperties.AccessibilityView="Content"
                      ItemsSource="{x:Bind ViewModel.ThemeList, Mode=OneWay}"
                      SelectedItem="{x:Bind ViewModel.CurrentTheme, Mode=TwoWay}"
@@ -43,8 +42,7 @@
        </local:SettingContainer>

        <!--  Position of new tab  -->
-        <local:SettingContainer x:Name="NewTabPosition"
-                                x:Uid="Globals_NewTabPosition">
+        <local:SettingContainer x:Uid="Globals_NewTabPosition">
            <ComboBox AutomationProperties.AccessibilityView="Content"
                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                      ItemsSource="{x:Bind ViewModel.NewTabPositionList, Mode=OneWay}"
@@ -53,52 +51,45 @@
        </local:SettingContainer>

        <!--  Show Titlebar  -->
-        <local:SettingContainer x:Name="ShowTitlebar"
-                                x:Uid="Globals_ShowTitlebar">
+        <local:SettingContainer x:Uid="Globals_ShowTitlebar">
            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsInTitlebar, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}"
                          Toggled="{x:Bind ViewModel.ShowTitlebarToggled}" />
        </local:SettingContainer>

        <!--  Always show tabs  -->
-        <local:SettingContainer x:Name="AlwaysShowTabs"
-                                x:Uid="Globals_AlwaysShowTabs">
+        <local:SettingContainer x:Uid="Globals_AlwaysShowTabs">
            <ToggleSwitch IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.ShowTabsInTitlebar), Mode=OneWay}"
                          IsOn="{x:Bind ViewModel.AlwaysShowTabs, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>

        <!--  Show tabs in full screen  -->
-        <local:SettingContainer x:Name="ShowTabsFullscreen"
-                                x:Uid="Globals_ShowTabsFullscreen">
+        <local:SettingContainer x:Uid="Globals_ShowTabsFullscreen">
            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsFullscreen, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>

        <!--  Show Acrylic in Tab Row  -->
-        <local:SettingContainer x:Name="AcrylicTabRow"
-                                x:Uid="Globals_AcrylicTabRow">
+        <local:SettingContainer x:Uid="Globals_AcrylicTabRow">
            <ToggleSwitch IsOn="{x:Bind ViewModel.UseAcrylicInTabRow, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>

        <!--  Show Title in Titlebar  -->
-        <local:SettingContainer x:Name="ShowTitleInTitlebar"
-                                x:Uid="Globals_ShowTitleInTitlebar">
+        <local:SettingContainer x:Uid="Globals_ShowTitleInTitlebar">
            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTitleInTitlebar, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>

        <!--  Always on Top  -->
-        <local:SettingContainer x:Name="AlwaysOnTop"
-                                x:Uid="Globals_AlwaysOnTop">
+        <local:SettingContainer x:Uid="Globals_AlwaysOnTop">
            <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>

        <!--  Tab Width Mode  -->
-        <local:SettingContainer x:Name="TabWidthMode"
-                                x:Uid="Globals_TabWidthMode">
+        <local:SettingContainer x:Uid="Globals_TabWidthMode">
            <ComboBox AutomationProperties.AccessibilityView="Content"
                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                      ItemsSource="{x:Bind ViewModel.TabWidthModeList, Mode=OneWay}"
@@ -108,43 +99,37 @@

        <!--  Disable Animations  -->
        <!--  NOTE: the UID is "DisablePaneAnimationsReversed" not "DisablePaneAnimations". See GH#9124 for more details.  -->
-        <local:SettingContainer x:Name="DisableAnimations"
-                                x:Uid="Globals_DisableAnimationsReversed">
+        <local:SettingContainer x:Uid="Globals_DisableAnimationsReversed">
            <ToggleSwitch IsOn="{x:Bind ViewModel.InvertedDisableAnimations, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>

        <!--  Always Show Notification Icon  -->
-        <local:SettingContainer x:Name="AlwaysShowNotificationIcon"
-                                x:Uid="Globals_AlwaysShowNotificationIcon">
+        <local:SettingContainer x:Uid="Globals_AlwaysShowNotificationIcon">
            <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowNotificationIcon, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>

        <!--  Minimize To Notification Area  -->
-        <local:SettingContainer x:Name="MinimizeToNotificationArea"
-                                x:Uid="Globals_MinimizeToNotificationArea">
+        <local:SettingContainer x:Uid="Globals_MinimizeToNotificationArea">
            <ToggleSwitch IsOn="{x:Bind ViewModel.MinimizeToNotificationArea, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>

        <!--  Automatically hide window  -->
-        <local:SettingContainer x:Name="AutoHideWindow"
-                                x:Uid="Globals_AutoHideWindow">
+        <local:SettingContainer x:Uid="Globals_AutoHideWindow">
            <ToggleSwitch IsOn="{x:Bind ViewModel.AutoHideWindow, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>

        <!--  Show Admin Shield  -->
-        <local:SettingContainer x:Name="ShowAdminShield"
-                                x:Uid="Globals_ShowAdminShield">
+        <local:SettingContainer x:Uid="Globals_ShowAdminShield">
            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowAdminShield, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>

        <!--  Enable Unfocused Acrylic  -->
-        <local:SettingContainer x:Name="EnableUnfocusedAcrylic"
-                                x:Uid="Globals_EnableUnfocusedAcrylic">
+        <local:SettingContainer x:Uid="Globals_EnableUnfocusedAcrylic">
            <ToggleSwitch IsOn="{x:Bind ViewModel.EnableUnfocusedAcrylic, Mode=TwoWay}"
                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
        </local:SettingContainer>
--- a/src/cascadia/TerminalSettingsEditor/IconPicker.cpp
+++ b/src/cascadia/TerminalSettingsEditor/IconPicker.cpp
@@ -1,320 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "IconPicker.h"
-#include "IconPicker.g.cpp"
-
-#include <LibraryResources.h>
-#include "SegoeFluentIconList.h"
-#include "../../types/inc/utils.hpp"
-#include "../WinRTUtils/inc/Utils.h"
-
-using namespace winrt;
-using namespace winrt::Windows::UI;
-using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Navigation;
-using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::UI::Xaml::Media;
-using namespace winrt::Windows::Foundation;
-using namespace winrt::Windows::Foundation::Collections;
-using namespace winrt::Microsoft::UI::Xaml::Controls;
-
-namespace winrt
-{
-    namespace MUX = Microsoft::UI::Xaml;
-    namespace WUX = Windows::UI::Xaml;
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    static constexpr std::wstring_view HideIconValue{ L"none" };
-
-    Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> IconPicker::_BuiltInIcons{ nullptr };
-    Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> IconPicker::_IconTypes{ nullptr };
-    DependencyProperty IconPicker::_CurrentIconPathProperty{ nullptr };
-
-    Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> IconPicker::BuiltInIcons() noexcept
-    {
-        if (!_BuiltInIcons)
-        {
-            // lazy load the built-in icons
-            std::vector<Editor::EnumEntry> builtInIcons;
-            for (auto& [val, name] : s_SegoeFluentIcons)
-            {
-                builtInIcons.emplace_back(make<EnumEntry>(hstring{ name }, box_value(val)));
-            }
-            _BuiltInIcons = single_threaded_observable_vector<Editor::EnumEntry>(std::move(builtInIcons));
-        }
-        return _BuiltInIcons;
-    }
-
-    Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> IconPicker::IconTypes() noexcept
-    {
-        if (!_IconTypes)
-        {
-            // lazy load the icon types
-            std::vector<Editor::EnumEntry> iconTypes;
-            iconTypes.reserve(4);
-            iconTypes.emplace_back(make<EnumEntry>(RS_(L"IconPicker_IconTypeNone"), box_value(IconType::None)));
-            iconTypes.emplace_back(make<EnumEntry>(RS_(L"IconPicker_IconTypeFontIcon"), box_value(IconType::FontIcon)));
-            iconTypes.emplace_back(make<EnumEntry>(RS_(L"IconPicker_IconTypeEmoji"), box_value(IconType::Emoji)));
-            iconTypes.emplace_back(make<EnumEntry>(RS_(L"IconPicker_IconTypeImage"), box_value(IconType::Image)));
-            _IconTypes = winrt::single_threaded_observable_vector<Editor::EnumEntry>(std::move(iconTypes));
-        }
-        return _IconTypes;
-    }
-
-    IconPicker::IconPicker()
-    {
-        _InitializeProperties();
-        InitializeComponent();
-
-        _DeduceCurrentIconType();
-        PropertyChanged([this](auto&&, const PropertyChangedEventArgs& args) {
-            const auto propertyName{ args.PropertyName() };
-            // "CurrentIconPath" changes are handled by _OnCurrentIconPathChanged()
-            if (propertyName == L"CurrentIconType")
-            {
-                PropertyChanged.raise(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"UsingNoIcon" });
-                PropertyChanged.raise(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"UsingBuiltInIcon" });
-                PropertyChanged.raise(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"UsingEmojiIcon" });
-                PropertyChanged.raise(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"UsingImageIcon" });
-            }
-            else if (propertyName == L"CurrentBuiltInIcon")
-            {
-                CurrentIconPath(unbox_value<hstring>(_CurrentBuiltInIcon.EnumValue()));
-            }
-            else if (propertyName == L"CurrentEmojiIcon")
-            {
-                CurrentIconPath(CurrentEmojiIcon());
-            }
-        });
-    }
-
-    void IconPicker::_InitializeProperties()
-    {
-        // Initialize any dependency properties here.
-        // This performs a lazy load on these properties, instead of
-        // initializing them when the DLL loads.
-        if (!_CurrentIconPathProperty)
-        {
-            _CurrentIconPathProperty =
-                DependencyProperty::Register(
-                    L"CurrentIconPath",
-                    xaml_typename<hstring>(),
-                    xaml_typename<Editor::IconPicker>(),
-                    PropertyMetadata{ nullptr, PropertyChangedCallback{ &IconPicker::_OnCurrentIconPathChanged } });
-        }
-    }
-
-    void IconPicker::_OnCurrentIconPathChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)
-    {
-        d.as<IconPicker>()->_DeduceCurrentIconType();
-    }
-
-    safe_void_coroutine IconPicker::Icon_Click(const IInspectable&, const RoutedEventArgs&)
-    {
-        auto lifetime = get_strong();
-
-        const auto parentHwnd{ reinterpret_cast<HWND>(WindowRoot().GetHostingWindow()) };
-        auto file = co_await OpenImagePicker(parentHwnd);
-        if (!file.empty())
-        {
-            CurrentIconPath(file);
-        }
-    }
-
-    void IconPicker::BuiltInIconPicker_GotFocus(const IInspectable& sender, const RoutedEventArgs& /*e*/)
-    {
-        _updateIconFilter({});
-        sender.as<AutoSuggestBox>().IsSuggestionListOpen(true);
-    }
-
-    void IconPicker::BuiltInIconPicker_QuerySubmitted(const AutoSuggestBox& /*sender*/, const AutoSuggestBoxQuerySubmittedEventArgs& e)
-    {
-        const auto iconEntry = unbox_value_or<Editor::EnumEntry>(e.ChosenSuggestion(), nullptr);
-        if (!iconEntry)
-        {
-            return;
-        }
-        CurrentBuiltInIcon(iconEntry);
-    }
-
-    void IconPicker::BuiltInIconPicker_TextChanged(const AutoSuggestBox& sender, const AutoSuggestBoxTextChangedEventArgs& e)
-    {
-        if (e.Reason() != AutoSuggestionBoxTextChangeReason::UserInput)
-        {
-            return;
-        }
-        std::wstring_view filter{ sender.Text() };
-        filter = til::trim(filter, L' ');
-        _updateIconFilter(filter);
-    }
-
-    void IconPicker::_updateIconFilter(std::wstring_view filter)
-    {
-        if (_iconFilter != filter)
-        {
-            _filteredBuiltInIcons = nullptr;
-            _iconFilter = filter;
-            _updateFilteredIconList();
-            PropertyChanged.raise(*this, PropertyChangedEventArgs{ L"FilteredBuiltInIconList" });
-        }
-    }
-
-    Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> IconPicker::FilteredBuiltInIconList()
-    {
-        if (!_filteredBuiltInIcons)
-        {
-            _updateFilteredIconList();
-        }
-        return _filteredBuiltInIcons;
-    }
-
-    void IconPicker::_updateFilteredIconList()
-    {
-        _filteredBuiltInIcons = BuiltInIcons();
-        if (_iconFilter.empty())
-        {
-            return;
-        }
-
-        // Find matching icons and populate the filtered list
-        std::vector<Editor::EnumEntry> filtered;
-        filtered.reserve(_filteredBuiltInIcons.Size());
-        for (const auto& icon : _filteredBuiltInIcons)
-        {
-            if (til::contains_linguistic_insensitive(icon.EnumName(), _iconFilter))
-            {
-                filtered.emplace_back(icon);
-            }
-        }
-        _filteredBuiltInIcons = winrt::single_threaded_observable_vector(std::move(filtered));
-    }
-
-    void IconPicker::CurrentIconType(const Windows::Foundation::IInspectable& value)
-    {
-        if (_currentIconType != value)
-        {
-            // Switching from...
-            if (_currentIconType && unbox_value<IconType>(_currentIconType.as<Editor::EnumEntry>().EnumValue()) == IconType::Image)
-            {
-                // Stash the current value of Icon. If the user
-                // switches out of then back to IconType::Image, we want
-                // the path that we display in the text box to remain unchanged.
-                _lastIconPath = CurrentIconPath();
-            }
-
-            // Set the member here instead of after setting Icon() below!
-            // We have an Icon property changed handler defined for when we discard changes.
-            // Inadvertently, that means that we call this setter again.
-            // Setting the member here means that we early exit at the beginning of the function
-            //  because _currentIconType == value.
-            _currentIconType = value;
-
-            // Switched to...
-            switch (unbox_value<IconType>(value.as<Editor::EnumEntry>().EnumValue()))
-            {
-            case IconType::None:
-            {
-                CurrentIconPath(winrt::hstring{ HideIconValue });
-                break;
-            }
-            case IconType::Image:
-            {
-                if (!_lastIconPath.empty())
-                {
-                    // Conversely, if we switch to Image,
-                    // retrieve that saved value and apply it
-                    CurrentIconPath(_lastIconPath);
-                }
-                break;
-            }
-            case IconType::FontIcon:
-            {
-                if (_CurrentBuiltInIcon)
-                {
-                    CurrentIconPath(unbox_value<hstring>(_CurrentBuiltInIcon.EnumValue()));
-                }
-                break;
-            }
-            case IconType::Emoji:
-            {
-                // Don't set Icon here!
-                // Clear out the text box so we direct the user to use the emoji picker.
-                CurrentEmojiIcon({});
-            }
-            }
-            // We're not using the VM's Icon() setter above,
-            // so notify HasIcon changed manually
-            PropertyChanged.raise(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"CurrentIconType" });
-            PropertyChanged.raise(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"HasIcon" });
-        }
-    }
-
-    bool IconPicker::UsingNoIcon() const
-    {
-        return _currentIconType == IconTypes().GetAt(0);
-    }
-
-    bool IconPicker::UsingBuiltInIcon() const
-    {
-        return _currentIconType == IconTypes().GetAt(1);
-    }
-
-    bool IconPicker::UsingEmojiIcon() const
-    {
-        return _currentIconType == IconTypes().GetAt(2);
-    }
-
-    bool IconPicker::UsingImageIcon() const
-    {
-        return _currentIconType == IconTypes().GetAt(3);
-    }
-
-    void IconPicker::_DeduceCurrentIconType()
-    {
-        const auto icon = CurrentIconPath();
-        if (icon.empty() || icon == HideIconValue)
-        {
-            _currentIconType = IconTypes().GetAt(0);
-        }
-        else if (icon.size() == 1 && (L'\uE700' <= til::at(icon, 0) && til::at(icon, 0) <= L'\uF8B3'))
-        {
-            _currentIconType = IconTypes().GetAt(1);
-            _DeduceCurrentBuiltInIcon();
-        }
-        else if (::Microsoft::Console::Utils::IsLikelyToBeEmojiOrSymbolIcon(icon))
-        {
-            // We already did a range check for MDL2 Assets in the previous one,
-            // so if we're out of that range but still short, assume we're an emoji
-            _currentIconType = IconTypes().GetAt(2);
-        }
-        else
-        {
-            _currentIconType = IconTypes().GetAt(3);
-        }
-        PropertyChanged.raise(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"CurrentIconType" });
-    }
-
-    void IconPicker::_DeduceCurrentBuiltInIcon()
-    {
-        const auto icon = CurrentIconPath();
-        for (uint32_t i = 0; i < BuiltInIcons().Size(); i++)
-        {
-            const auto& builtIn = BuiltInIcons().GetAt(i);
-            if (icon == unbox_value<hstring>(builtIn.EnumValue()))
-            {
-                CurrentBuiltInIcon(builtIn);
-                return;
-            }
-        }
-        CurrentBuiltInIcon(BuiltInIcons().GetAt(0));
-    }
-
-    WUX::Controls::IconSource IconPicker::BuiltInIconConverter(const IInspectable& iconVal)
-    {
-        return Microsoft::Terminal::UI::IconPathConverter::IconSourceWUX(unbox_value<hstring>(iconVal));
-    }
-}
--- a/src/cascadia/TerminalSettingsEditor/IconPicker.h
+++ b/src/cascadia/TerminalSettingsEditor/IconPicker.h
@@ -1,68 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "IconPicker.g.h"
-#include "EnumEntry.h"
-#include "Utils.h"
-#include "cppwinrt_utils.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct IconPicker : public HasScrollViewer<IconPicker>, IconPickerT<IconPicker>
-    {
-    public:
-        IconPicker();
-
-        static constexpr std::wstring_view HideIconValue{ L"none" };
-        static Windows::UI::Xaml::Controls::IconSource BuiltInIconConverter(const Windows::Foundation::IInspectable& iconVal);
-        static Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> BuiltInIcons() noexcept;
-        static Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> IconTypes() noexcept;
-
-        Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> FilteredBuiltInIconList();
-        safe_void_coroutine Icon_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
-        void BuiltInIconPicker_GotFocus(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
-        void BuiltInIconPicker_TextChanged(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const Windows::UI::Xaml::Controls::AutoSuggestBoxTextChangedEventArgs& e);
-        void BuiltInIconPicker_QuerySubmitted(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const Windows::UI::Xaml::Controls::AutoSuggestBoxQuerySubmittedEventArgs& e);
-
-        Windows::Foundation::IInspectable CurrentIconType() const noexcept { return _currentIconType; }
-        void CurrentIconType(const Windows::Foundation::IInspectable& value);
-
-        Editor::IHostedInWindow WindowRoot() const noexcept { return _weakWindowRoot.get(); }
-        void WindowRoot(const Editor::IHostedInWindow& value) noexcept { _weakWindowRoot = value; }
-
-        bool UsingNoIcon() const;
-        bool UsingBuiltInIcon() const;
-        bool UsingEmojiIcon() const;
-        bool UsingImageIcon() const;
-
-        til::property_changed_event PropertyChanged;
-        WINRT_OBSERVABLE_PROPERTY(hstring, CurrentEmojiIcon, PropertyChanged.raise);
-        WINRT_OBSERVABLE_PROPERTY(Editor::EnumEntry, CurrentBuiltInIcon, PropertyChanged.raise, nullptr);
-
-        DEPENDENCY_PROPERTY(hstring, CurrentIconPath);
-
-    private:
-        static Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> _BuiltInIcons;
-        static Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> _IconTypes;
-        Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> _filteredBuiltInIcons;
-        std::wstring _iconFilter;
-        Windows::Foundation::IInspectable _currentIconType{};
-        winrt::hstring _lastIconPath;
-        winrt::weak_ref<Editor::IHostedInWindow> _weakWindowRoot;
-
-        static void _InitializeProperties();
-        static void _OnCurrentIconPathChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
-
-        void _DeduceCurrentIconType();
-        void _DeduceCurrentBuiltInIcon();
-        void _updateIconFilter(std::wstring_view filter);
-        void _updateFilteredIconList();
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(IconPicker);
-}
--- a/src/cascadia/TerminalSettingsEditor/IconPicker.idl
+++ b/src/cascadia/TerminalSettingsEditor/IconPicker.idl
@@ -1,41 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import "EnumEntry.idl";
-import "MainPage.idl";
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    enum IconType
-    {
-        None = 0,
-        FontIcon,
-        Image,
-        Emoji
-    };
-
-    [default_interface] runtimeclass IconPicker : Windows.UI.Xaml.Controls.UserControl, Windows.UI.Xaml.Data.INotifyPropertyChanged
-    {
-        IconPicker();
-
-        IInspectable CurrentIconType;
-        Windows.Foundation.Collections.IObservableVector<EnumEntry> IconTypes { get; };
-
-        Boolean UsingBuiltInIcon { get; };
-        Boolean UsingEmojiIcon { get; };
-        Boolean UsingImageIcon { get; };
-
-        String CurrentEmojiIcon;
-        
-        EnumEntry CurrentBuiltInIcon;
-        Windows.Foundation.Collections.IObservableVector<EnumEntry> BuiltInIcons { get; };
-        Windows.Foundation.Collections.IObservableVector<EnumEntry> FilteredBuiltInIconList { get; };
-
-        static Windows.UI.Xaml.Controls.IconSource BuiltInIconConverter(IInspectable iconVal);
-
-        String CurrentIconPath;
-        static Windows.UI.Xaml.DependencyProperty CurrentIconPathProperty { get; };
-
-        IHostedInWindow WindowRoot;
-    }
-}
--- a/src/cascadia/TerminalSettingsEditor/IconPicker.xaml
+++ b/src/cascadia/TerminalSettingsEditor/IconPicker.xaml
@@ -1,100 +0,0 @@
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-    the MIT License. See LICENSE in the project root for license information.
-->
-<UserControl x:Class="Microsoft.Terminal.Settings.Editor.IconPicker"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="using:Microsoft.Terminal.Settings.Editor"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:model="using:Microsoft.Terminal.Settings.Model"
-             xmlns:mtu="using:Microsoft.Terminal.UI"
-             xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-             mc:Ignorable="d">
-
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="CommonResources.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
-    <Grid ColumnSpacing="12">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="auto" />
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="auto" />
-        </Grid.ColumnDefinitions>
-
-        <!--  Icon Type  -->
-        <ComboBox x:Uid="IconPicker_IconType"
-                  Grid.Column="0"
-                  ItemsSource="{x:Bind IconTypes}"
-                  SelectedItem="{x:Bind CurrentIconType, Mode=TwoWay}">
-            <ComboBox.ItemTemplate>
-                <DataTemplate x:DataType="local:EnumEntry">
-                    <TextBlock Text="{x:Bind EnumName}" />
-                </DataTemplate>
-            </ComboBox.ItemTemplate>
-        </ComboBox>
-
-        <!--  Built-In Icon  -->
-        <AutoSuggestBox x:Uid="IconPicker_BuiltInIcon"
-                        Grid.Column="1"
-                        GotFocus="BuiltInIconPicker_GotFocus"
-                        ItemsSource="{x:Bind FilteredBuiltInIconList, Mode=OneWay}"
-                        QuerySubmitted="BuiltInIconPicker_QuerySubmitted"
-                        Text="{x:Bind CurrentBuiltInIcon.EnumName, Mode=OneWay}"
-                        TextBoxStyle="{StaticResource TextBoxSettingStyle}"
-                        TextChanged="BuiltInIconPicker_TextChanged"
-                        Visibility="{x:Bind UsingBuiltInIcon, Mode=OneWay}">
-            <AutoSuggestBox.ItemTemplate>
-                <DataTemplate x:DataType="local:EnumEntry">
-                    <Grid ColumnSpacing="12">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="16" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-
-                        <IconSourceElement Grid.Column="0"
-                                           Width="16"
-                                           Height="16"
-                                           IconSource="{x:Bind local:IconPicker.BuiltInIconConverter(EnumValue), Mode=OneTime}" />
-                        <TextBlock Grid.Column="1"
-                                   Text="{x:Bind EnumName}" />
-                    </Grid>
-                </DataTemplate>
-            </AutoSuggestBox.ItemTemplate>
-        </AutoSuggestBox>
-
-        <!--  Image (File) Icon  -->
-        <TextBox x:Uid="IconPicker_ImagePathBox"
-                 Grid.Column="1"
-                 MaxWidth="Infinity"
-                 HorizontalAlignment="Stretch"
-                 FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
-                 IsSpellCheckEnabled="False"
-                 Style="{StaticResource TextBoxSettingStyle}"
-                 Text="{x:Bind CurrentIconPath, Mode=TwoWay}"
-                 Visibility="{x:Bind UsingImageIcon, Mode=OneWay}" />
-        <Button x:Uid="IconPicker_IconBrowse"
-                Grid.Column="2"
-                Margin="0"
-                VerticalAlignment="Top"
-                Click="Icon_Click"
-                Style="{StaticResource BrowseButtonStyle}"
-                Visibility="{x:Bind UsingImageIcon, Mode=OneWay}" />
-
-        <!--  Emoji Icon  -->
-        <TextBox x:Uid="IconPicker_EmojiBox"
-                 Grid.Column="1"
-                 MaxWidth="Infinity"
-                 FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
-                 IsSpellCheckEnabled="False"
-                 Style="{StaticResource TextBoxSettingStyle}"
-                 Text="{x:Bind CurrentEmojiIcon, Mode=TwoWay}"
-                 Visibility="{x:Bind UsingEmojiIcon, Mode=OneWay}" />
-    </Grid>
-</UserControl>
--- a/src/cascadia/TerminalSettingsEditor/Interaction.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.cpp
@@ -21,9 +21,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    void Interaction::OnNavigatedTo(const NavigationEventArgs& e)
    {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::InteractionViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _ViewModel = e.Parameter().as<Editor::InteractionViewModel>();

        TraceLoggingWrite(
            g_hTerminalSettingsEditorProvider,
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -27,15 +27,13 @@
    <StackPanel>
        <StackPanel Style="{StaticResource SettingsStackStyle}">
            <!--  Copy On Select  -->
-            <local:SettingContainer x:Name="CopyOnSelect"
-                                    x:Uid="Globals_CopyOnSelect">
+            <local:SettingContainer x:Uid="Globals_CopyOnSelect">
                <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
            </local:SettingContainer>

            <!--  Copy Format  -->
-            <local:SettingContainer x:Name="CopyFormat"
-                                    x:Uid="Globals_CopyFormat">
+            <local:SettingContainer x:Uid="Globals_CopyFormat">
                <ComboBox AutomationProperties.AccessibilityView="Content"
                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                          ItemsSource="{x:Bind ViewModel.CopyFormatList, Mode=OneWay}"
@@ -44,22 +42,19 @@
            </local:SettingContainer>

            <!--  Trim Block Selection  -->
-            <local:SettingContainer x:Name="TrimBlockSelection"
-                                    x:Uid="Globals_TrimBlockSelection">
+            <local:SettingContainer x:Uid="Globals_TrimBlockSelection">
                <ToggleSwitch IsOn="{x:Bind ViewModel.TrimBlockSelection, Mode=TwoWay}"
                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
            </local:SettingContainer>

            <!--  Trim Paste  -->
-            <local:SettingContainer x:Name="TrimPaste"
-                                    x:Uid="Globals_TrimPaste">
+            <local:SettingContainer x:Uid="Globals_TrimPaste">
                <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, Mode=TwoWay}"
                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
            </local:SettingContainer>

            <!--  Word Delimiters  -->
-            <local:SettingContainer x:Name="WordDelimiters"
-                                    x:Uid="Globals_WordDelimiters"
+            <local:SettingContainer x:Uid="Globals_WordDelimiters"
                                    CurrentValue="{x:Bind ViewModel.WordDelimiters, Mode=OneWay}"
                                    Style="{StaticResource ExpanderSettingContainerStyle}">
                <TextBox IsSpellCheckEnabled="False"
@@ -68,15 +63,13 @@
            </local:SettingContainer>

            <!--  Snap On Resize  -->
-            <local:SettingContainer x:Name="SnapToGridOnResize"
-                                    x:Uid="Globals_SnapToGridOnResize">
+            <local:SettingContainer x:Uid="Globals_SnapToGridOnResize">
                <ToggleSwitch IsOn="{x:Bind ViewModel.SnapToGridOnResize, Mode=TwoWay}"
                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
            </local:SettingContainer>

            <!--  Tab Switcher Mode  -->
-            <local:SettingContainer x:Name="TabSwitcherMode"
-                                    x:Uid="Globals_TabSwitcherMode">
+            <local:SettingContainer x:Uid="Globals_TabSwitcherMode">
                <ComboBox AutomationProperties.AccessibilityView="Content"
                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                          ItemsSource="{x:Bind ViewModel.TabSwitcherModeList}"
@@ -85,36 +78,31 @@
            </local:SettingContainer>

            <!--  Focus Follow Mouse Mode  -->
-            <local:SettingContainer x:Name="FocusFollowMouse"
-                                    x:Uid="Globals_FocusFollowMouse">
+            <local:SettingContainer x:Uid="Globals_FocusFollowMouse">
                <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
            </local:SettingContainer>

            <!--  Enable Font Size Changes with Scrolling  -->
-            <local:SettingContainer x:Name="ScrollToZoom"
-                                    x:Uid="Globals_ScrollToZoom">
+            <local:SettingContainer x:Uid="Globals_ScrollToZoom">
                <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToZoom, Mode=TwoWay}"
                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
            </local:SettingContainer>

            <!--  Enable Window Opacity Changes with Scrolling  -->
-            <local:SettingContainer x:Name="ScrollToChangeOpacity"
-                                    x:Uid="Globals_ScrollToChangeOpacity">
+            <local:SettingContainer x:Uid="Globals_ScrollToChangeOpacity">
                <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToChangeOpacity, Mode=TwoWay}"
                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
            </local:SettingContainer>

            <!--  Detect URLs  -->
-            <local:SettingContainer x:Name="DetectURLs"
-                                    x:Uid="Globals_DetectURLs">
+            <local:SettingContainer x:Uid="Globals_DetectURLs">
                <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, Mode=TwoWay}"
                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
            </local:SettingContainer>

            <!--  Search Web Default Query URL  -->
-            <local:SettingContainer x:Name="SearchWebDefaultQueryUrl"
-                                    x:Uid="Globals_SearchWebDefaultQueryUrl"
+            <local:SettingContainer x:Uid="Globals_SearchWebDefaultQueryUrl"
                                    CurrentValue="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=OneWay}"
                                    Style="{StaticResource ExpanderSettingContainerStyle}">
                <TextBox IsSpellCheckEnabled="False"
@@ -123,8 +111,7 @@
            </local:SettingContainer>

            <!--  Enable Color Selection  -->
-            <local:SettingContainer x:Name="EnableColorSelection"
-                                    x:Uid="Globals_EnableColorSelection">
+            <local:SettingContainer x:Uid="Globals_EnableColorSelection">
                <ToggleSwitch IsOn="{x:Bind ViewModel.EnableColorSelection, Mode=TwoWay}"
                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
            </local:SettingContainer>
@@ -136,29 +123,25 @@
                       Style="{StaticResource TextBlockSubHeaderStyle}" />

            <!--  Close All Tabs Warning  -->
-            <local:SettingContainer x:Name="ConfirmCloseAllTabs"
-                                    x:Uid="Globals_ConfirmCloseAllTabs">
+            <local:SettingContainer x:Uid="Globals_ConfirmCloseAllTabs">
                <ToggleSwitch IsOn="{x:Bind ViewModel.ConfirmCloseAllTabs, Mode=TwoWay}"
                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
            </local:SettingContainer>

            <!--  Input Service Warning  -->
-            <local:SettingContainer x:Name="InputServiceWarning"
-                                    x:Uid="Globals_InputServiceWarning">
+            <local:SettingContainer x:Uid="Globals_InputServiceWarning">
                <ToggleSwitch IsOn="{x:Bind ViewModel.InputServiceWarning, Mode=TwoWay}"
                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
            </local:SettingContainer>

            <!--  Large Paste Warning  -->
-            <local:SettingContainer x:Name="WarnAboutLargePaste"
-                                    x:Uid="Globals_WarnAboutLargePaste">
+            <local:SettingContainer x:Uid="Globals_WarnAboutLargePaste">
                <ToggleSwitch IsOn="{x:Bind ViewModel.WarnAboutLargePaste, Mode=TwoWay}"
                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
            </local:SettingContainer>

            <!--  Multi Line Paste Warning  -->
-            <local:SettingContainer x:Name="WarnAboutMultiLinePaste"
-                                    x:Uid="Globals_WarnAboutMultiLinePaste">
+            <local:SettingContainer x:Uid="Globals_WarnAboutMultiLinePaste">
                <ComboBox AutomationProperties.AccessibilityView="Content"
                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                          ItemsSource="{x:Bind WarnAboutMultiLinePasteList}"
--- a/src/cascadia/TerminalSettingsEditor/Launch.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Launch.cpp
@@ -38,9 +38,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

    void Launch::OnNavigatedTo(const NavigationEventArgs& e)
    {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::LaunchViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _ViewModel = e.Parameter().as<Editor::LaunchViewModel>();
        auto innerViewModel{ winrt::get_self<Editor::implementation::LaunchViewModel>(_ViewModel) };
        /* coroutine dispatch */ innerViewModel->PrepareStartOnUserLoginSettings();

--- a/src/cascadia/TerminalSettingsEditor/Launch.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Launch.xaml
@@ -44,9 +44,9 @@
    <StackPanel>
        <StackPanel Style="{StaticResource SettingsStackStyle}">
            <!--  Default Profile  -->
-            <local:SettingContainer x:Name="DefaultProfile"
-                                    x:Uid="Globals_DefaultProfile">
-                <ComboBox ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
+            <local:SettingContainer x:Uid="Globals_DefaultProfile">
+                <ComboBox x:Name="DefaultProfile"
+                          ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
                          SelectedItem="{x:Bind ViewModel.CurrentDefaultProfile, Mode=TwoWay}"
                          Style="{StaticResource ComboBoxSettingStyle}">
                    <ComboBox.ItemTemplate>
@@ -141,8 +141,7 @@
            </local:SettingContainer>

            <!--  Language  -->
-            <local:SettingContainer x:Name="Language"
-                                    x:Uid="Globals_Language">
+            <local:SettingContainer x:Uid="Globals_Language">
                <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}"
                          SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}"
                          Style="{StaticResource ComboBoxSettingStyle}">
@@ -155,8 +154,7 @@
            </local:SettingContainer>

            <!--  Language  -->
-            <local:SettingContainer x:Name="DefaultInputScope"
-                                    x:Uid="Globals_DefaultInputScope">
+            <local:SettingContainer x:Uid="Globals_DefaultInputScope">
                <ComboBox AutomationProperties.AccessibilityView="Content"
                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                          ItemsSource="{x:Bind ViewModel.DefaultInputScopeList}"
@@ -165,8 +163,7 @@
            </local:SettingContainer>

            <!--  Start on User Login  -->
-            <local:SettingContainer x:Name="StartOnUserLogin"
-                                    x:Uid="Globals_StartOnUserLogin"
+            <local:SettingContainer x:Uid="Globals_StartOnUserLogin"
                                    HelpText="{x:Bind ViewModel.StartOnUserLoginStatefulHelpText, Mode=OneWay}"
                                    Visibility="{x:Bind ViewModel.StartOnUserLoginAvailable, Mode=OneTime}">
                <ToggleSwitch IsEnabled="{x:Bind ViewModel.StartOnUserLoginConfigurable, Mode=OneWay}"
@@ -175,8 +172,7 @@
            </local:SettingContainer>

            <!--  First Window Behavior  -->
-            <local:SettingContainer x:Name="FirstWindowPreference"
-                                    x:Uid="Globals_FirstWindowPreference">
+            <local:SettingContainer x:Uid="Globals_FirstWindowPreference">
                <ComboBox AutomationProperties.AccessibilityView="Content"
                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                          ItemsSource="{x:Bind ViewModel.FirstWindowPreferenceList}"
@@ -185,8 +181,7 @@
            </local:SettingContainer>

            <!--  Windowing Behavior  -->
-            <local:SettingContainer x:Name="WindowingBehavior"
-                                    x:Uid="Globals_WindowingBehavior">
+            <local:SettingContainer x:Uid="Globals_WindowingBehavior">
                <ComboBox AutomationProperties.AccessibilityView="Content"
                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                          ItemsSource="{x:Bind ViewModel.WindowingBehaviorList}"
@@ -195,8 +190,7 @@
            </local:SettingContainer>

            <!--  Launch Size  -->
-            <local:SettingContainer x:Name="LaunchSize"
-                                    x:Uid="Globals_LaunchSize"
+            <local:SettingContainer x:Uid="Globals_LaunchSize"
                                    CurrentValue="{x:Bind ViewModel.LaunchSizeCurrentValue, Mode=OneWay}"
                                    Style="{StaticResource ExpanderSettingContainerStyle}">
                <Grid ColumnSpacing="12"
@@ -239,8 +233,7 @@
            </local:SettingContainer>

            <!--  Launch Parameters  -->
-            <local:SettingContainer x:Name="LaunchParameters"
-                                    x:Uid="Globals_LaunchParameters"
+            <local:SettingContainer x:Uid="Globals_LaunchParameters"
                                    CurrentValue="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}"
                                    Style="{StaticResource ExpanderSettingContainerStyle}">
                <Grid RowSpacing="8">
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
--- a/src/cascadia/TerminalSettingsEditor/MainPage.h
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.h
@@ -5,9 +5,7 @@

 #include "MainPage.g.h"
 #include "Breadcrumb.g.h"
-#include "NavigateToPageArgs.g.h"
 #include "Utils.h"
-#include "SearchIndex.h"

 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
@@ -25,24 +23,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        WINRT_PROPERTY(BreadcrumbSubPage, SubPage);
    };

-    struct NavigateToPageArgs : NavigateToPageArgsT<NavigateToPageArgs>
-    {
-    public:
-        NavigateToPageArgs(Windows::Foundation::IInspectable viewModel, Editor::IHostedInWindow windowRoot, const hstring& elementToFocus = {}) :
-            _ViewModel(viewModel),
-            _WeakWindowRoot(windowRoot),
-            _ElementToFocus(elementToFocus) {}
-
-        Editor::IHostedInWindow WindowRoot() const noexcept { return _WeakWindowRoot.get(); }
-        Windows::Foundation::IInspectable ViewModel() const noexcept { return _ViewModel; }
-        hstring ElementToFocus() const noexcept { return _ElementToFocus; }
-
-    private:
-        winrt::weak_ref<Editor::IHostedInWindow> _WeakWindowRoot;
-        Windows::Foundation::IInspectable _ViewModel{ nullptr };
-        hstring _ElementToFocus{};
-    };
-
    struct MainPage : MainPageT<MainPage>
    {
        MainPage() = delete;
@@ -50,10 +30,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

        void UpdateSettings(const Model::CascadiaSettings& settings);

-        safe_void_coroutine SettingsSearchBox_TextChanged(const Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const Windows::UI::Xaml::Controls::AutoSuggestBoxTextChangedEventArgs& args);
-        void SettingsSearchBox_QuerySubmitted(const Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const Windows::UI::Xaml::Controls::AutoSuggestBoxQuerySubmittedEventArgs& args);
-        void SettingsSearchBox_SuggestionChosen(const Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const Windows::UI::Xaml::Controls::AutoSuggestBoxSuggestionChosenEventArgs& args);
-
        void SettingsNav_Loaded(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
        void SettingsNav_ItemInvoked(const Microsoft::UI::Xaml::Controls::NavigationView& sender, const Microsoft::UI::Xaml::Controls::NavigationViewItemInvokedEventArgs& args);
        void SaveButton_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
@@ -90,30 +66,23 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        void _AddProfileHandler(const winrt::guid profileGuid);

        void _SetupProfileEventHandling(const winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel profile);
-        void _SetupColorSchemesEventHandling();
-        void _SetupActionsEventHandling();
-        void _NavigateToProfileSubPage(const Editor::ProfileViewModel& profile, ProfileSubPage page, const IInspectable& breadcrumbTag, const hstring& elementToFocus);

        void _PreNavigateHelper();
-        void _Navigate(const IInspectable& vm, BreadcrumbSubPage subPage, hstring elementToFocus = {});
+        void _Navigate(hstring clickedItemTag, BreadcrumbSubPage subPage);
+        void _Navigate(const Editor::ProfileViewModel& profile, BreadcrumbSubPage subPage);
+        void _Navigate(const Editor::NewTabMenuEntryViewModel& ntmEntryVM, BreadcrumbSubPage subPage);
+        void _Navigate(const Editor::ExtensionPackageViewModel& extPkgVM, BreadcrumbSubPage subPage);
        void _NavigateToProfileHandler(const IInspectable& sender, winrt::guid profileGuid);
        void _NavigateToColorSchemeHandler(const IInspectable& sender, const IInspectable& args);
-        Microsoft::UI::Xaml::Controls::NavigationViewItem _FindProfileNavItem(winrt::guid profileGuid) const;

        void _UpdateBackgroundForMica();
        void _MoveXamlParsedNavItemsIntoItemSource();

-        safe_void_coroutine _UpdateSearchIndex();
-
-        winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel _profileDefaultsVM{ nullptr };
-        Windows::Foundation::Collections::IVector<winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel> _profileVMs{ nullptr };
        winrt::Microsoft::Terminal::Settings::Editor::ColorSchemesPageViewModel _colorSchemesPageVM{ nullptr };
        winrt::Microsoft::Terminal::Settings::Editor::ActionsViewModel _actionsVM{ nullptr };
        winrt::Microsoft::Terminal::Settings::Editor::NewTabMenuViewModel _newTabMenuPageVM{ nullptr };
        winrt::Microsoft::Terminal::Settings::Editor::ExtensionsViewModel _extensionsVM{ nullptr };

-        Windows::Foundation::IAsyncOperation<Windows::Foundation::Collections::IObservableVector<Windows::Foundation::IInspectable>> _currentSearch{ nullptr };
-
        Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _profileViewModelChangedRevoker;
        Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _colorSchemesPageViewModelChangedRevoker;
        Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _actionsViewModelChangedRevoker;
--- a/src/cascadia/TerminalSettingsEditor/MainPage.idl
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.idl
@@ -16,14 +16,6 @@ namespace Microsoft.Terminal.Settings.Editor
        UInt64 GetHostingWindow();
    }

-    // This is used to pass data between pages during navigation.
-    runtimeclass NavigateToPageArgs
-    {
-        IHostedInWindow WindowRoot { get; };
-        IInspectable ViewModel { get; };
-        String ElementToFocus { get; };
-    }
-
    enum BreadcrumbSubPage
    {
        None = 0,
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -99,85 +99,62 @@
            </Grid>
        </muxc:NavigationView.Header>

-        <muxc:NavigationView.AutoSuggestBox>
-            <AutoSuggestBox x:Name="SettingsSearchBox"
-                            x:Uid="Nav_SearchBox"
-                            QueryIcon="Find"
-                            QuerySubmitted="SettingsSearchBox_QuerySubmitted"
-                            SuggestionChosen="SettingsSearchBox_SuggestionChosen"
-                            TextChanged="SettingsSearchBox_TextChanged">
-                <AutoSuggestBox.ItemTemplate>
-                    <DataTemplate x:DataType="local:FilteredSearchResult">
-                        <Grid HorizontalAlignment="Stretch"
-                              ColumnSpacing="8">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-
-                            <ContentPresenter Grid.Column="0"
-                                              HorizontalAlignment="Center"
-                                              VerticalAlignment="Center"
-                                              Content="{x:Bind Icon}" />
-                            <StackPanel Grid.Column="1"
-                                        VerticalAlignment="Center">
-                                <TextBlock FontSize="{ThemeResource BodyTextBlockFontSize}"
-                                           Foreground="{ThemeResource TextFillColorPrimary}"
-                                           Text="{x:Bind Label}"
-                                           TextTrimming="CharacterEllipsis" />
-                                <TextBlock FontSize="{ThemeResource CaptionTextBlockFontSize}"
-                                           Foreground="{ThemeResource TextFillColorSecondary}"
-                                           Text="{x:Bind SecondaryLabel}"
-                                           TextTrimming="CharacterEllipsis"
-                                           Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(SecondaryLabel)}" />
-                            </StackPanel>
-
-                            <ToolTipService.ToolTip>
-                                <StackPanel>
-                                    <TextBlock FontSize="{ThemeResource CaptionTextBlockFontSize}"
-                                               Foreground="{ThemeResource TextFillColorPrimary}"
-                                               Text="{x:Bind Label}" />
-                                    <TextBlock FontSize="{ThemeResource CaptionTextBlockFontSize}"
-                                               Foreground="{ThemeResource TextFillColorSecondary}"
-                                               Text="{x:Bind SecondaryLabel}"
-                                               Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(SecondaryLabel)}" />
-                                </StackPanel>
-                            </ToolTipService.ToolTip>
-                        </Grid>
-                    </DataTemplate>
-                </AutoSuggestBox.ItemTemplate>
-            </AutoSuggestBox>
-        </muxc:NavigationView.AutoSuggestBox>
-
        <muxc:NavigationView.MenuItems>
+
            <muxc:NavigationViewItem x:Name="LaunchNavItem"
                                     x:Uid="Nav_Launch"
-                                     Tag="Launch_Nav" />
+                                     Tag="Launch_Nav">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xE7B5;" />
+                </muxc:NavigationViewItem.Icon>
+            </muxc:NavigationViewItem>

            <muxc:NavigationViewItem x:Name="InteractionNavItem"
                                     x:Uid="Nav_Interaction"
-                                     Tag="Interaction_Nav" />
+                                     Tag="Interaction_Nav">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xE7C9;" />
+                </muxc:NavigationViewItem.Icon>
+            </muxc:NavigationViewItem>

            <muxc:NavigationViewItem x:Name="AppearanceNavItem"
                                     x:Uid="Nav_Appearance"
-                                     Tag="GlobalAppearance_Nav" />
+                                     Tag="GlobalAppearance_Nav">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xE771;" />
+                </muxc:NavigationViewItem.Icon>
+            </muxc:NavigationViewItem>

            <muxc:NavigationViewItem x:Name="ColorSchemesNavItem"
                                     x:Uid="Nav_ColorSchemes"
-                                     Tag="ColorSchemes_Nav" />
-
+                                     Tag="ColorSchemes_Nav">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xE790;" />
+                </muxc:NavigationViewItem.Icon>
+            </muxc:NavigationViewItem>

            <muxc:NavigationViewItem x:Name="RenderingNavItem"
                                     x:Uid="Nav_Rendering"
-                                     Tag="Rendering_Nav" />
+                                     Tag="Rendering_Nav">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xE7F8;" />
+                </muxc:NavigationViewItem.Icon>
+            </muxc:NavigationViewItem>

            <muxc:NavigationViewItem x:Name="CompatibilityNavItem"
                                     x:Uid="Nav_Compatibility"
-                                     Tag="Compatibility_Nav" />
+                                     Tag="Compatibility_Nav">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xEC7A;" />
+                </muxc:NavigationViewItem.Icon>
+            </muxc:NavigationViewItem>

            <muxc:NavigationViewItem x:Name="ActionsNavItem"
                                     x:Uid="Nav_Actions"
                                     Tag="Actions_Nav">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xE765;" />
+                </muxc:NavigationViewItem.Icon>
                <muxc:NavigationViewItem.InfoBadge>
                    <muxc:InfoBadge Style="{StaticResource NewInfoBadge}"
                                    Visibility="{x:Bind ActionsVM.DisplayBadge, Mode=OneWay}" />
@@ -186,24 +163,42 @@

            <muxc:NavigationViewItem x:Name="NewTabMenuNavItem"
                                     x:Uid="Nav_NewTabMenu"
-                                     Tag="NewTabMenu_Nav" />
+                                     Tag="NewTabMenu_Nav">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xE71d;" />
+                </muxc:NavigationViewItem.Icon>
+            </muxc:NavigationViewItem>

            <muxc:NavigationViewItem x:Name="ExtensionsNavItem"
                                     x:Uid="Nav_Extensions"
-                                     Tag="Extensions_Nav" />
+                                     Tag="Extensions_Nav">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xEA86;" />
+                </muxc:NavigationViewItem.Icon>
+            </muxc:NavigationViewItem>

            <muxc:NavigationViewItemHeader x:Uid="Nav_Profiles" />

            <muxc:NavigationViewItem x:Name="BaseLayerMenuItem"
                                     x:Uid="Nav_ProfileDefaults"
-                                     Tag="GlobalProfile_Nav" />
+                                     Tag="GlobalProfile_Nav">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xE81E;" />
+                </muxc:NavigationViewItem.Icon>
+            </muxc:NavigationViewItem>
+
        </muxc:NavigationView.MenuItems>

        <muxc:NavigationView.FooterMenuItems>
+            <!--  The OpenJson item needs both Tapped and KeyDown handler  -->
            <muxc:NavigationViewItem x:Name="OpenJsonNavItem"
                                     x:Uid="Nav_OpenJSON"
                                     SelectsOnInvoked="False"
-                                     Tag="OpenJson_Nav" />
+                                     Tag="OpenJson_Nav">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon Glyph="&#xE713;" />
+                </muxc:NavigationViewItem.Icon>
+            </muxc:NavigationViewItem>
        </muxc:NavigationView.FooterMenuItems>

        <Grid>
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
@@ -69,10 +69,6 @@
      <DependentUpon>NullableColorPicker.xaml</DependentUpon>
      <SubType>Code</SubType>
    </ClInclude>
-    <ClInclude Include="IconPicker.h">
-      <DependentUpon>IconPicker.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
    <ClInclude Include="EditColorScheme.h">
      <DependentUpon>EditColorScheme.xaml</DependentUpon>
      <SubType>Code</SubType>
@@ -93,8 +89,6 @@
      <DependentUpon>NewTabMenu.xaml</DependentUpon>
    </ClInclude>
    <ClInclude Include="pch.h" />
-    <ClInclude Include="SearchIndex.h" />
-    <ClInclude Include="NavConstants.h" />
    <ClInclude Include="MainPage.h">
      <DependentUpon>MainPage.xaml</DependentUpon>
    </ClInclude>
@@ -175,8 +169,6 @@
    </ClInclude>
    <ClInclude Include="Utils.h" />
    <ClInclude Include="PreviewConnection.h" />
-    <ClInclude Include="$(GeneratedFilesDir)GeneratedSettingsIndex.g.h" />
-    <ClInclude Include="../fzf/fzf.h" />
  </ItemGroup>
  <!-- ========================= XAML files ======================== -->
  <ItemGroup>
@@ -201,9 +193,6 @@
    <Page Include="NullableColorPicker.xaml">
      <SubType>Designer</SubType>
    </Page>
-    <Page Include="IconPicker.xaml">
-      <SubType>Designer</SubType>
-    </Page>
    <Page Include="EditColorScheme.xaml">
      <SubType>Designer</SubType>
    </Page>
@@ -280,10 +269,6 @@
      <DependentUpon>NullableColorPicker.xaml</DependentUpon>
      <SubType>Code</SubType>
    </ClCompile>
-    <ClCompile Include="IconPicker.cpp">
-      <DependentUpon>IconPicker.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
    <ClCompile Include="EditColorScheme.cpp">
      <DependentUpon>EditColorScheme.xaml</DependentUpon>
      <SubType>Code</SubType>
@@ -306,7 +291,6 @@
    <ClCompile Include="pch.cpp">
      <PrecompiledHeader>Create</PrecompiledHeader>
    </ClCompile>
-    <ClCompile Include="SearchIndex.cpp" />
    <ClCompile Include="MainPage.cpp">
      <DependentUpon>MainPage.xaml</DependentUpon>
    </ClCompile>
@@ -389,8 +373,6 @@
    <ClCompile Include="PreviewConnection.cpp">
      <DependentUpon>PreviewConnection.h</DependentUpon>
    </ClCompile>
-    <ClCompile Include="$(GeneratedFilesDir)GeneratedSettingsIndex.g.cpp" />
-    <ClCompile Include="../fzf/fzf.cpp" />
  </ItemGroup>
  <!-- ========================= idl Files ======================== -->
  <ItemGroup>
@@ -415,10 +397,6 @@
      <DependentUpon>NullableColorPicker.xaml</DependentUpon>
      <SubType>Code</SubType>
    </Midl>
-    <Midl Include="IconPicker.idl">
-      <DependentUpon>IconPicker.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Midl>
    <Midl Include="EditColorScheme.idl">
      <DependentUpon>EditColorScheme.xaml</DependentUpon>
      <SubType>Code</SubType>
@@ -447,7 +425,6 @@
      <DependentUpon>Rendering.xaml</DependentUpon>
      <SubType>Code</SubType>
    </Midl>
-    <Midl Include="SearchIndex.idl" />
    <Midl Include="MainPage.idl">
      <DependentUpon>MainPage.xaml</DependentUpon>
    </Midl>
@@ -564,10 +541,4 @@
  <!-- This -must- go after cppwinrt.build.post.props because that includes many VS-provided props including appcontainer.common.props, which stomps on what cppwinrt.targets did. -->
  <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
  <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
-  <Target Name="GenerateSettingsIndex"
-          Inputs="@(Page);$(OpenConsoleDir)tools\GenerateSettingsIndex.ps1"
-          Outputs="$(GeneratedFilesDir)GeneratedSettingsIndex.g.h;$(GeneratedFilesDir)GeneratedSettingsIndex.g.cpp"
-          BeforeTargets="ClCompile">
-    <Exec Command="pwsh.exe -NoProfile -ExecutionPolicy Unrestricted &quot;$(OpenConsoleDir)tools\GenerateSettingsIndex.ps1&quot; -SourceDir &quot;$(MSBuildThisFileDirectory).&quot; -OutputDir &quot;$(MSBuildThisFileDirectory)$(GeneratedFilesDir).&quot;" />
-  </Target>
 </Project>
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
@@ -55,7 +55,6 @@
    <Page Include="AddProfile.xaml" />
    <Page Include="KeyChordListener.xaml" />
    <Page Include="NullableColorPicker.xaml" />
-    <Page Include="IconPicker.xaml" />
    <Page Include="NewTabMenu.xaml" />
  </ItemGroup>
 </Project>
--- a/src/cascadia/TerminalSettingsEditor/NavConstants.h
+++ b/src/cascadia/TerminalSettingsEditor/NavConstants.h
@@ -1,40 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include <til/static_map.h>
-
-// Navigation tags used to identify pages in the Settings UI NavigationView.
-// These tags are stored as the Tag property on NavigationViewItems.
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    inline constexpr std::wstring_view openJsonTag{ L"OpenJson_Nav" };
-    inline constexpr std::wstring_view launchTag{ L"Launch_Nav" };
-    inline constexpr std::wstring_view interactionTag{ L"Interaction_Nav" };
-    inline constexpr std::wstring_view renderingTag{ L"Rendering_Nav" };
-    inline constexpr std::wstring_view compatibilityTag{ L"Compatibility_Nav" };
-    inline constexpr std::wstring_view actionsTag{ L"Actions_Nav" };
-    inline constexpr std::wstring_view newTabMenuTag{ L"NewTabMenu_Nav" };
-    inline constexpr std::wstring_view extensionsTag{ L"Extensions_Nav" };
-    inline constexpr std::wstring_view globalProfileTag{ L"GlobalProfile_Nav" };
-    inline constexpr std::wstring_view addProfileTag{ L"AddProfile" };
-    inline constexpr std::wstring_view colorSchemesTag{ L"ColorSchemes_Nav" };
-    inline constexpr std::wstring_view globalAppearanceTag{ L"GlobalAppearance_Nav" };
-
-    // Map from navigation tags to Segoe MDL2 Assets icon glyphs
-    inline constexpr til::static_map NavTagIconMap{
-        std::pair{ launchTag, L"\xE7B5" }, /* Set Lock Screen */
-        std::pair{ interactionTag, L"\xE7C9" }, /* Touch Pointer */
-        std::pair{ globalAppearanceTag, L"\xE771" }, /* Personalize */
-        std::pair{ colorSchemesTag, L"\xE790" }, /* Color */
-        std::pair{ renderingTag, L"\xE7F8" }, /* Device Laptop No Pic */
-        std::pair{ compatibilityTag, L"\xEC7A" }, /* Developer Tools */
-        std::pair{ actionsTag, L"\xE765" }, /* Keyboard Classic */
-        std::pair{ newTabMenuTag, L"\xE71D" }, /* All Apps */
-        std::pair{ extensionsTag, L"\xEA86" }, /* Puzzle */
-        std::pair{ globalProfileTag, L"\xE81E" }, /* Map Layers */
-        std::pair{ addProfileTag, L"\xE710" }, /* Add */
-        std::pair{ openJsonTag, L"\xE713" }, /* Settings */
-    };
-}
--- a/Show More
+++ b/Show More