ci(wtr): fix cargo build PowerShell script and add x86 triple mapping

Two fixes:
1. Replace splat-array invocation with explicit if/else branches.
   The splat was passing a malformed argument (cargo's clap reported
   'unexpected argument "-"').
2. Add 'x86' -> 'i686-pc-windows-msvc' case in the switch and include
   that target in RustInstaller's additionalTargets. The pipeline matrix
   builds x86 too, not just x64/arm64.

Also added a LASTEXITCODE check so cargo build failures surface
properly even with ErrorActionPreference set.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

.github/actions/spelling/expect/expect.txt

@@ -17,7 +17,6 @@ ADDSTRING
 ADDTOOL
 adml
 admx
-Affordance
 AFill
 AFX
 AHelper
@@ -1076,7 +1075,6 @@ NOCONTEXTHELP
 NOCOPYBITS
 nodiscard
 NODUP
-NODEFAULT
 noexcepts
 NOFONT
 NOHIDDENTEXT
@@ -1107,6 +1105,7 @@ NOSIZE
 NOSNAPSHOT
 NOTHOUSANDS
 NOTICKS
+notif
 NOTIMEOUTIFNOTHUNG
 NOTIMPL
 NOTOPMOST
@@ -1562,7 +1561,6 @@ SMARTQUOTE
 SMTO
 snapcx
 snapcy
-SND
 snk
 SOLIDBOX
 Solutiondir

build/pipelines/templates-v2/job-build-project.yml

@@ -21,6 +21,10 @@ parameters:
     displayName: "Build Everything (Overrides all other build options)"
     type: boolean
     default: false
+  - name: enableRustBuild
+    displayName: "Build src/tools/wtr (requires RustInstaller extension + microsoft/Dart Azure Artifact feeds)"
+    type: boolean
+    default: true
   - name: pgoBuildMode
     type: string
     default: None
@@ -166,6 +170,80 @@ jobs:
       .\build\scripts\Generate-ThirdPartyNotices.ps1 -MarkdownNoticePath .\NOTICE.md -OutputPath .\src\cascadia\CascadiaPackage\NOTICE.html
     displayName: Generate NOTICE.html from NOTICE.md
 
+  - ${{ if eq(parameters.enableRustBuild, true) }}:
+    # ────────────────────────────────────────────────────────────────────────
+    # Rust toolchain for src/tools/wtr (1ES-compliant pattern).
+    # Placed early — before vcpkg/nuget/VC-tools setup — so that Rust pipeline
+    # validation is independent of any C++ build environment problems.
+    #
+    # Pipeline lives at: https://microsoft.visualstudio.com/Dart/
+    # Reference for this pattern: microsoft/sudo (.pipelines/OneBranch.Common.yml)
+    #
+    # Compliance notes (per 1ES Rust workflow guidance):
+    #   1. Toolchain comes from the org-level `RustTools` Azure Artifact NuGet
+    #      feed (already exists on `microsoft` ADO org; same feed used by
+    #      microsoft/sudo, microsoft/vscode, microsoft/edit, microsoft/qdk).
+    #   2. Crates resolve through a project-level Azure Artifact Cargo feed
+    #      named `Cargo` in microsoft/Dart (with crates.io upstream).
+    #   3. The Rust version uses the `ms-prod-X.YY` channel, pinned in
+    #      `src/tools/wtr/rust-toolchain.toml`.
+    #   4. Component Governance scanning of Cargo.lock is auto-injected by
+    #      1ES PT (no extra task needed here).
+    #
+    # Prerequisites — until in place, leave `enableRustBuild` parameter false:
+    #   - Azure Artifact Cargo feed `Cargo` exists in microsoft/Dart with
+    #     `crates.io` upstream. (Project-scope, terminal team can create it.)
+    #   - The CI account ("Project Collection Build Service (microsoft)") has
+    #     at least Collaborator permission on the `RustTools` feed.
+    # ────────────────────────────────────────────────────────────────────────
+    - task: RustInstaller@1
+      displayName: Install Rust toolchain (MSRustup)
+      inputs:
+        rustVersion: ms-prod-1.93
+        toolchainFeed: https://pkgs.dev.azure.com/microsoft/_packaging/RustTools/nuget/v3/index.json
+        # NOTE: we deliberately do NOT set `cratesIoFeedOverride` here. That
+        # parameter injects an env-var registry override named `ms_crates_io`
+        # which CargoAuthenticate cannot see (it scans config files, not env
+        # vars), so the override registry ends up unauthenticated and Azure
+        # Artifacts returns 404 on its sparse-index endpoint.
+        # Instead, the registry + source replacement lives in
+        # src/tools/wtr/.cargo/config.toml — CargoAuthenticate@0 (next step)
+        # tokens it, and cargo's normal config-file resolution picks it up.
+        additionalTargets: 'x86_64-pc-windows-msvc i686-pc-windows-msvc aarch64-pc-windows-msvc'
+
+    # CargoAuthenticate issues a Bearer token (using System.AccessToken) for
+    # every Azure Artifacts Cargo feed referenced in the config file.
+    # Required: without it, Azure Artifacts returns 404 on the sparse index
+    # endpoint and cargo reports "config.json not found in registry".
+    # This is the canonical 1ES Rust auth pattern (mirrors microsoft/edit).
+    - task: CargoAuthenticate@0
+      displayName: Authenticate Cargo feeds
+      inputs:
+        configFile: src/tools/wtr/.cargo/config.toml
+
+    # Separate fetch step: some 1ES pools disable network during the build
+    # phase. Fetching upfront keeps `cargo build --frozen` fully offline.
+    - script: cargo fetch --manifest-path src/tools/wtr/Cargo.toml --locked
+      displayName: Fetch crates (offline-friendly)
+
+    - pwsh: |-
+        $ErrorActionPreference = 'Stop'
+        $triple = switch ('$(BuildPlatform)') {
+          'x64'   { 'x86_64-pc-windows-msvc' }
+          'x86'   { 'i686-pc-windows-msvc' }
+          'arm64' { 'aarch64-pc-windows-msvc' }
+          default { 'x86_64-pc-windows-msvc' }
+        }
+        $config = '$(BuildConfiguration)'
+        Write-Host "Building wtr for $triple ($config)"
+        if ($config -eq 'Release') {
+          cargo build --manifest-path src/tools/wtr/Cargo.toml --target $triple --frozen --release
+        } else {
+          cargo build --manifest-path src/tools/wtr/Cargo.toml --target $triple --frozen
+        }
+        if ($LASTEXITCODE -ne 0) { throw "cargo build failed with exit code $LASTEXITCODE" }
+      displayName: Build src/tools/wtr (Cargo)
+
   - template: .\steps-install-vcpkg.yml
 
   - template: .\steps-restore-nuget.yml

build/scripts/Set-LatestVCToolsVersion.ps1

@@ -10,13 +10,30 @@ $VCToolsRoot = Join-Path $VSRoot "VC\Tools\MSVC"
 # differs from the version on the files themselves. We might as well check
 # whether the version we just found _actually exists_ before we use it.
 # We'll use whichever highest version exists.
+#
+# Some pool images report a package version (e.g. 14.44.35208) but ship only
+# package metadata, not the actual toolchain — the version folder either
+# doesn't exist or is empty. Detect both cases by also requiring a non-empty
+# `bin` subdirectory (where cl.exe / link.exe live).
 $PackageVCToolPath = Join-Path $VCToolsRoot $LatestVCToolsVersion
-If ($Null -Eq (Get-Item $PackageVCToolPath -ErrorAction:Ignore)) {
-    $VCToolsVersions = Get-ChildItem $VCToolsRoot | ForEach-Object {
+$PackageVCBinPath = Join-Path $PackageVCToolPath "bin"
+$PackageIsValid = ($Null -Ne (Get-Item $PackageVCToolPath -ErrorAction:Ignore)) -And `
+                  ($Null -Ne (Get-Item $PackageVCBinPath  -ErrorAction:Ignore))
+If (-Not $PackageIsValid) {
+    $VCToolsVersions = Get-ChildItem $VCToolsRoot -Directory -ErrorAction:Ignore | Where-Object {
+        # Only consider directories that actually contain a populated `bin`.
+        $binDir = Join-Path $_.FullName "bin"
+        (Test-Path $binDir) -And ((Get-ChildItem $binDir -Recurse -File -ErrorAction:Ignore | Select-Object -First 1) -Ne $Null)
+    } | ForEach-Object {
         [Version]$_.Name
     } | Sort -Descending
     $LatestActualVCToolsVersion = $VCToolsVersions | Select -First 1
 
+    If ($Null -Eq $LatestActualVCToolsVersion) {
+        Write-Error "No usable VC Tools installation found under $VCToolsRoot. Package version was $LatestVCToolsVersion. This typically indicates a partial/broken pool image (DD-1541167)."
+        Exit 1
+    }
+
     If ([Version]$LatestVCToolsVersion -Ne $LatestActualVCToolsVersion) {
         Write-Output "VC Tools Mismatch: Directory = $LatestActualVCToolsVersion, Package = $LatestVCToolsVersion"
         $LatestVCToolsVersion = $LatestActualVCToolsVersion.ToString(3)

doc/cascadia/profiles.schema.json

@@ -2472,13 +2472,6 @@
           },
           "type": "array"
         },
-        "safeUriSchemes": {
-          "description": "Specifies a list of URI schemes that are considered safe. No confirmation will be required to open URIs with these schemes.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
         "rendering.graphicsAPI": {
           "description": "Direct3D 11 provides a more performant and feature-rich experience, whereas Direct2D is more stable. The default option \"Automatic\" will pick the API that best fits your graphics hardware. If you experience significant issues, consider using Direct2D.",
           "type": "string",

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -24,6 +24,21 @@
     <EntryPointProjectUniqueName>..\WindowsTerminal\WindowsTerminal.vcxproj</EntryPointProjectUniqueName>
     <DebuggerType>NativeOnly</DebuggerType>
   </PropertyGroup>
+
+  <!-- Map MSBuild Platform to Rust target triple for wtr.exe inclusion. -->
+  <PropertyGroup>
+    <WtrRustTarget Condition="'$(Platform)'=='x64'">x86_64-pc-windows-msvc</WtrRustTarget>
+    <WtrRustTarget Condition="'$(Platform)'=='ARM64'">aarch64-pc-windows-msvc</WtrRustTarget>
+    <WtrRustProfile Condition="'$(Configuration)'=='Debug'">debug</WtrRustProfile>
+    <WtrRustProfile Condition="'$(Configuration)'!='Debug'">release</WtrRustProfile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="$(SolutionDir)src\tools\wtr\target\$(WtrRustTarget)\$(WtrRustProfile)\wtr.exe"
+             Condition="Exists('$(SolutionDir)src\tools\wtr\target\$(WtrRustTarget)\$(WtrRustProfile)\wtr.exe')">
+      <Link>wtr.exe</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <PropertyGroup Condition="!Exists('CascadiaPackage_TemporaryKey.pfx')">
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
     <AppxBundle>Never</AppxBundle>

src/cascadia/TerminalApp/CommandPalette.xaml

@@ -344,7 +344,7 @@
                 <TextBlock x:Name="_parentCommandText"
                            Padding="16,4"
                            VerticalAlignment="Center"
-                           FontWeight="SemiBold"
+                           FontStyle="Italic"
                            Text="{x:Bind ParentCommandName, Mode=OneWay}" />
             </StackPanel>
 
@@ -358,8 +358,8 @@
 
                 <ScrollViewer MaxHeight="200"
                               VerticalScrollBarVisibility="Auto">
-                    <TextBlock Text="{x:Bind ParsedCommandLineText, Mode=OneWay}"
-                               TextAlignment="Left"
+                    <TextBlock FontStyle="Italic"
+                               Text="{x:Bind ParsedCommandLineText, Mode=OneWay}"
                                TextWrapping="Wrap" />
                 </ScrollViewer>
             </Border>
@@ -371,6 +371,7 @@
                     Visibility="Collapsed">
                 <TextBlock Padding="12,0"
                            VerticalAlignment="Center"
+                           FontStyle="Italic"
                            Text="{x:Bind NoMatchesText, Mode=OneWay}" />
             </Border>
 

src/cascadia/TerminalApp/HighlightedTextControl.cpp

@@ -152,8 +152,8 @@ namespace winrt::TerminalApp::implementation
                     }
                     else
                     {
-                        // Default style: semibold
-                        run.FontWeight(FontWeights::SemiBold());
+                        // Default style: bold
+                        run.FontWeight(FontWeights::Bold());
                     }
                     inlinesCollection.Append(run);
 

src/cascadia/TerminalApp/Resources/en-US/Resources.resw

@@ -443,13 +443,13 @@
     <value>Open a new tab</value>
   </data>
   <data name="NewPaneRun.Text" xml:space="preserve">
-    <value>Alt + Click to split the current window</value>
+    <value>Alt+Click to split the current window</value>
   </data>
   <data name="NewWindowRun.Text" xml:space="preserve">
-    <value>Shift + Click to open a new window</value>
+    <value>Shift+Click to open a new window</value>
   </data>
   <data name="ElevatedRun.Text" xml:space="preserve">
-    <value>Ctrl + Click to open as administrator</value>
+    <value>Ctrl+Click to open as administrator</value>
   </data>
   <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Close</value>

src/cascadia/TerminalApp/Resources/zh-CN/Resources.resw

@@ -496,48 +496,12 @@
     <value>第三方通知</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
-    <value>取消</value>
-  </data>
   <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
     <value>是否要关闭所有窗口?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
-    <value>全部关闭</value>
-  </data>
   <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
     <value>是否要关闭所有标签页?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>全部关闭</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>是否要关闭此选项卡?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>关闭选项卡</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>是否要关闭此窗格?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>关闭窗格</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>是否要关闭这些选项卡?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>关闭选项卡</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>是否要关闭这些窗格?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>关闭窗格</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>不再询问</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>取消</value>
   </data>

src/cascadia/TerminalApp/SuggestionsControl.xaml

@@ -167,7 +167,7 @@
                 <TextBlock x:Name="_parentCommandText"
                            Padding="16,4"
                            VerticalAlignment="Center"
-                           FontWeight="SemiBold"
+                           FontStyle="Italic"
                            Text="{x:Bind ParentCommandName, Mode=OneWay}" />
             </StackPanel>
 
@@ -179,6 +179,7 @@
                     Visibility="Collapsed">
                 <TextBlock Padding="12,0"
                            VerticalAlignment="Center"
+                           FontStyle="Italic"
                            Text="{x:Bind NoMatchesText, Mode=OneWay}" />
             </Border>
 
@@ -227,7 +228,7 @@
                         Visibility="Collapsed">
                 <TextBlock x:Name="_descriptionTitle"
                            FontSize="14"
-                           FontWeight="SemiBold"
+                           FontWeight="Bold"
                            IsTextSelectionEnabled="True"
                            TextWrapping="WrapWholeWords">
                     <TextBlock.ContextFlyout>

src/cascadia/TerminalApp/Tab.cpp

@@ -235,14 +235,14 @@ namespace winrt::TerminalApp::implementation
 
         auto textBlock = WUX::Controls::TextBlock{};
         textBlock.TextWrapping(WUX::TextWrapping::Wrap);
-        textBlock.TextAlignment(WUX::TextAlignment::Left);
+        textBlock.TextAlignment(WUX::TextAlignment::Center);
         textBlock.Inlines().Append(titleRun);
 
         if (!_keyChord.empty())
         {
             auto keyChordRun = WUX::Documents::Run();
             keyChordRun.Text(_keyChord);
-            textBlock.Inlines().Append(WUX::Documents::LineBreak{});
+            keyChordRun.FontStyle(winrt::Windows::UI::Text::FontStyle::Italic);
             textBlock.Inlines().Append(WUX::Documents::LineBreak{});
             textBlock.Inlines().Append(keyChordRun);
         }

src/cascadia/TerminalApp/TabRowControl.xaml

@@ -71,9 +71,11 @@
                     <ToolTipService.ToolTip>
                         <ToolTip Placement="Mouse">
                             <TextBlock TextWrapping="Wrap">
-                                <Run x:Uid="NewTabRun" /> <LineBreak /><LineBreak />
-                                <Run x:Uid="NewPaneRun" /> <LineBreak />
-                                <Run x:Uid="NewWindowRun" />
+                                <Run x:Uid="NewTabRun" /> <LineBreak />
+                                <Run x:Uid="NewPaneRun"
+                                     FontStyle="Italic" /> <LineBreak />
+                                <Run x:Uid="NewWindowRun"
+                                     FontStyle="Italic" />
                             </TextBlock>
                         </ToolTip>
                     </ToolTipService.ToolTip>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -1295,15 +1295,17 @@ namespace winrt::TerminalApp::implementation
         newTabRun.Text(RS_(L"NewTabRun/Text"));
         auto newPaneRun = WUX::Documents::Run();
         newPaneRun.Text(RS_(L"NewPaneRun/Text"));
+        newPaneRun.FontStyle(FontStyle::Italic);
         auto newWindowRun = WUX::Documents::Run();
         newWindowRun.Text(RS_(L"NewWindowRun/Text"));
+        newWindowRun.FontStyle(FontStyle::Italic);
         auto elevatedRun = WUX::Documents::Run();
         elevatedRun.Text(RS_(L"ElevatedRun/Text"));
+        elevatedRun.FontStyle(FontStyle::Italic);
 
         auto textBlock = WUX::Controls::TextBlock{};
         textBlock.Inlines().Append(newTabRun);
         textBlock.Inlines().Append(WUX::Documents::LineBreak{});
-        textBlock.Inlines().Append(WUX::Documents::LineBreak{});
         textBlock.Inlines().Append(newPaneRun);
         textBlock.Inlines().Append(WUX::Documents::LineBreak{});
         textBlock.Inlines().Append(newWindowRun);
@@ -3305,15 +3307,13 @@ namespace winrt::TerminalApp::implementation
         return true;
     }
 
-    bool TerminalPage::_IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri) const
+    bool TerminalPage::_IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri)
     {
-        const auto& schemeName = parsedUri.SchemeName();
-
-        if (schemeName == L"http" || schemeName == L"https")
+        if (parsedUri.SchemeName() == L"http" || parsedUri.SchemeName() == L"https")
         {
             return true;
         }
-        if (schemeName == L"file")
+        if (parsedUri.SchemeName() == L"file")
         {
             static const auto pathext{ wil::TryGetEnvironmentVariableW<std::wstring>(L"PATHEXT") };
             const auto filename = parsedUri.Path();
@@ -3327,16 +3327,6 @@ namespace winrt::TerminalApp::implementation
 
             return true;
         }
-        if (const auto& safeSchemes = _settings.GlobalSettings().SafeUriSchemes())
-        {
-            for (const auto& scheme : safeSchemes)
-            {
-                if (til::equals_insensitive_ascii(schemeName, scheme))
-                {
-                    return true;
-                }
-            }
-        }
 
         return false;
     }

src/cascadia/TerminalApp/TerminalPage.h

@@ -438,7 +438,7 @@ namespace winrt::TerminalApp::implementation
 
         safe_void_coroutine _OpenHyperlinkHandler(const IInspectable sender, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs);
         static bool _IsUriSupported(const winrt::Windows::Foundation::Uri& parsedUri);
-        bool _IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri) const;
+        static bool _IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri);
 
         void _ShowCouldNotOpenDialog(winrt::hstring reason, winrt::hstring uri);
         bool _CopyText(bool dismissSelection, bool singleLine, bool withControlSequences, Microsoft::Terminal::Control::CopyFormat formats);

src/cascadia/TerminalApp/TerminalPaneContent.cpp

@@ -71,6 +71,18 @@ namespace winrt::TerminalApp::implementation
         _removeControlEvents();
 
         _control.Close();
+
+        // Clear out our media player callbacks, and stop any playing media. This
+        // will prevent the callback from being triggered after we've closed, and
+        // also make sure that our sound stops when we're closed.
+        if (_bellPlayer)
+        {
+            _bellPlayer.Pause();
+            _bellPlayer.Source(nullptr);
+            _bellPlayer.Close();
+            _bellPlayer = nullptr;
+            _bellPlayerCreated = false;
+        }
     }
 
     winrt::hstring TerminalPaneContent::Icon() const
@@ -263,15 +275,14 @@ namespace winrt::TerminalApp::implementation
                     auto sounds{ _profile.BellSound() };
                     if (sounds && sounds.Size() > 0)
                     {
-                        // Sound paths are resolved and validated by CascadiaSettings
-                        // before we reach this point.
-                        auto soundPath{ sounds.GetAt(rand() % sounds.Size()).Resolved() };
-                        PlaySoundW(soundPath.c_str(), nullptr, SND_FILENAME | SND_ASYNC | SND_SENTRY | SND_NODEFAULT);
+                        winrt::hstring soundPath{ sounds.GetAt(rand() % sounds.Size()).Resolved() };
+                        winrt::Windows::Foundation::Uri uri{ soundPath };
+                        _playBellSound(uri);
                     }
                     else
                     {
-                        const auto soundAlias = reinterpret_cast<LPCWSTR>(SND_ALIAS_SYSTEMHAND);
-                        PlaySoundW(soundAlias, nullptr, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
+                        const auto soundAlias = reinterpret_cast<LPCTSTR>(SND_ALIAS_SYSTEMHAND);
+                        PlaySound(soundAlias, NULL, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
                     }
                 }
 
@@ -289,6 +300,33 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
+    safe_void_coroutine TerminalPaneContent::_playBellSound(winrt::Windows::Foundation::Uri uri)
+    {
+        auto weakThis{ get_weak() };
+        co_await wil::resume_foreground(_control.Dispatcher());
+        if (auto pane{ weakThis.get() })
+        {
+            if (!_bellPlayerCreated)
+            {
+                // The MediaPlayer might not exist on Windows N SKU.
+                try
+                {
+                    _bellPlayerCreated = true;
+                    _bellPlayer = winrt::Windows::Media::Playback::MediaPlayer();
+                    // GH#12258: The media keys (like play/pause) should have no effect on our bell sound.
+                    _bellPlayer.CommandManager().IsEnabled(false);
+                }
+                CATCH_LOG();
+            }
+            if (_bellPlayer)
+            {
+                const auto source{ winrt::Windows::Media::Core::MediaSource::CreateFromUri(uri) };
+                const auto item{ winrt::Windows::Media::Playback::MediaPlaybackItem(source) };
+                _bellPlayer.Source(item);
+                _bellPlayer.Play();
+            }
+        }
+    }
     void TerminalPaneContent::_closeTerminalRequestedHandler(const winrt::Windows::Foundation::IInspectable& /*sender*/,
                                                              const winrt::Windows::Foundation::IInspectable& /*args*/)
     {

src/cascadia/TerminalApp/TerminalPaneContent.h

@@ -76,6 +76,9 @@ namespace winrt::TerminalApp::implementation
         std::shared_ptr<TerminalSettingsCache> _cache{};
         bool _isDefTermSession{ false };
 
+        winrt::Windows::Media::Playback::MediaPlayer _bellPlayer{ nullptr };
+        bool _bellPlayerCreated{ false };
+
         struct ControlEventTokens
         {
             winrt::Microsoft::Terminal::Control::TermControl::ConnectionStateChanged_revoker _ConnectionStateChanged;
@@ -93,6 +96,8 @@ namespace winrt::TerminalApp::implementation
         void _setupControlEvents();
         void _removeControlEvents();
 
+        safe_void_coroutine _playBellSound(winrt::Windows::Foundation::Uri uri);
+
         safe_void_coroutine _controlConnectionStateChangedHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& /*args*/);
         void _controlWarningBellHandler(const winrt::Windows::Foundation::IInspectable& sender,
                                         const winrt::Windows::Foundation::IInspectable& e);

src/cascadia/TerminalControl/ControlCore.cpp

@@ -925,7 +925,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         // Manually turn off acrylic if they turn off transparency.
         _runtimeUseAcrylic = _settings.Opacity() < 1.0 && _settings.UseAcrylic();
 
-        const auto sizeChanged = _setFontSizeUnderLock(_settings.FontSize() + _accumulatedFontSizeDelta);
+        const auto sizeChanged = _setFontSizeUnderLock(_settings.FontSize());
 
         // Update the terminal core with its new Core settings
         _terminal->UpdateSettings(_settings);
@@ -1163,10 +1163,11 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - none
     void ControlCore::ResetFontSize()
     {
-        if (std::exchange(_accumulatedFontSizeDelta, 0.f) != 0.f)
+        const auto lock = _terminal->LockForWriting();
+
+        if (_setFontSizeUnderLock(_settings.FontSize()))
         {
-            // No point in doing this if there was no delta.
-            AdjustFontSize(0);
+            _refreshSizeUnderLock();
         }
     }
 
@@ -1176,11 +1177,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - fontSizeDelta: The amount to increase or decrease the font size by.
     void ControlCore::AdjustFontSize(float fontSizeDelta)
     {
-        _accumulatedFontSizeDelta += fontSizeDelta;
-
         const auto lock = _terminal->LockForWriting();
 
-        if (_setFontSizeUnderLock(_settings.FontSize() + _accumulatedFontSizeDelta))
+        if (_setFontSizeUnderLock(_desiredFont.GetFontSize() + fontSizeDelta))
         {
             _refreshSizeUnderLock();
         }

src/cascadia/TerminalControl/ControlCore.h

@@ -391,7 +391,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         bool _colorGlyphs = true;
         CSSLengthPercentage _cellWidth;
         CSSLengthPercentage _cellHeight;
-        float _accumulatedFontSizeDelta = 0.f; // Preserved across reloads to prevent user zoom from being overwritten.
 
         // Rendering stuff.
         winrt::handle _lastSwapChainHandle{ nullptr };

src/cascadia/TerminalCore/Terminal.cpp

@@ -98,6 +98,7 @@ void Terminal::UpdateSettings(ICoreSettings settings)
     _answerbackMessage = settings.AnswerbackMessage();
     _wordDelimiters = settings.WordDelimiters();
     _suppressApplicationTitle = settings.SuppressApplicationTitle();
+    _startingTitle = settings.StartingTitle();
     _trimBlockSelection = settings.TrimBlockSelection();
     _autoMarkPrompts = settings.AutoMarkPrompts();
     _rainbowSuggestions = settings.RainbowSuggestions();
@@ -123,11 +124,6 @@ void Terminal::UpdateSettings(ICoreSettings settings)
     // Save the changes made above and in UpdateAppearance as the new default render settings.
     GetRenderSettings().SaveDefaultSettings();
 
-    if (!_startingTitle)
-    {
-        _startingTitle = settings.StartingTitle();
-    }
-
     if (!_startingTabColor && settings.StartingTabColor())
     {
         _startingTabColor = settings.StartingTabColor().Value();

src/cascadia/TerminalCore/Terminal.hpp

@@ -349,7 +349,7 @@ private:
     ::Microsoft::Console::VirtualTerminal::TerminalInput _terminalInput;
 
     std::optional<std::wstring> _title;
-    std::optional<std::wstring> _startingTitle;
+    std::wstring _startingTitle;
     std::optional<til::color> _startingTabColor;
 
     std::vector<til::point_span> _searchHighlights;

src/cascadia/TerminalCore/TerminalApi.cpp

@@ -91,12 +91,8 @@ void Terminal::SetWindowTitle(const std::wstring_view title)
     _assertLocked();
     if (!_suppressApplicationTitle)
     {
-        _title.reset();
-        if (!title.empty())
-        {
-            _title.emplace(title);
-        }
-        _pfnTitleChanged(GetConsoleTitle());
+        _title.emplace(title.empty() ? _startingTitle : title);
+        _pfnTitleChanged(_title.value());
     }
 }
 
@@ -116,13 +112,6 @@ bool Terminal::ResizeWindow(const til::CoordType width, const til::CoordType hei
         return false;
     }
 
-    const auto currentDimensions = _GetMutableViewport().Dimensions();
-
-    if (width == currentDimensions.width && height == currentDimensions.height)
-    {
-        return false;
-    }
-
     if (_pfnWindowSizeChanged)
     {
         _pfnWindowSizeChanged(width, height);

src/cascadia/TerminalCore/terminalrenderdata.cpp

@@ -184,18 +184,11 @@ void Terminal::SelectNewRegion(const til::point coordStart, const til::point coo
 std::wstring_view Terminal::GetConsoleTitle() const noexcept
 {
     _assertLocked();
-
-    if (_title)
+    if (_title.has_value())
     {
         return *_title;
     }
-
-    if (_startingTitle)
-    {
-        return *_startingTitle;
-    }
-
-    return {};
+    return _startingTitle;
 }
 
 // Method Description:

src/cascadia/TerminalSettingsEditor/Actions.cpp

@@ -7,9 +7,7 @@
 #include "LibraryResources.h"
 #include "../TerminalSettingsModel/AllShortcutActions.h"
 
-using namespace winrt::Windows::Foundation;
 using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::UI::Xaml::Navigation;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
@@ -44,65 +42,4 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
             TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
     }
-
-    // Builds the "view all" flyout lazily on the first click of a
-    // row's "..." button, then caches it on the button so subsequent clicks
-    // just re-show it.
-    void Actions::ViewAllKeyChordsButton_Click(const IInspectable& sender, const RoutedEventArgs& /*e*/)
-    {
-        const auto button = sender.try_as<Button>();
-        if (!button)
-        {
-            return;
-        }
-
-        // Retrieve cached flyout, if possible
-        if (const auto existing = button.Flyout())
-        {
-            existing.ShowAt(button);
-            return;
-        }
-
-        const auto cmdVM = button.DataContext().try_as<Editor::CommandViewModel>();
-        if (!cmdVM)
-        {
-            return;
-        }
-
-        Flyout flyout;
-        flyout.Placement(Primitives::FlyoutPlacementMode::Bottom);
-        flyout.FlyoutPresenterStyle(Resources().Lookup(box_value(L"EdgeToEdgeFlyoutPresenterStyle")).as<winrt::Windows::UI::Xaml::Style>());
-
-        StackPanel content;
-        content.Orientation(Orientation::Vertical);
-        content.MinWidth(120.0);
-
-        if (cmdVM.HasNoKeyChords())
-        {
-            const auto emptyTemplate = Resources().Lookup(box_value(L"ViewAllKeyChordsFlyoutEmptyStateTemplate")).as<DataTemplate>();
-            content.Children().Append(emptyTemplate.LoadContent().as<UIElement>());
-        }
-        else
-        {
-            const auto separatorTemplate = Resources().Lookup(box_value(L"ViewAllKeyChordsFlyoutSeparatorTemplate")).as<DataTemplate>();
-            const auto itemTemplate = Resources().Lookup(box_value(L"ViewAllKeyChordsFlyoutItemTemplate")).as<DataTemplate>();
-            const auto chords = cmdVM.KeyChordList();
-            const auto count = chords.Size();
-            for (uint32_t i = 0; i < count; ++i)
-            {
-                if (i > 0)
-                {
-                    content.Children().Append(separatorTemplate.LoadContent().as<UIElement>());
-                }
-
-                auto chordVisual = itemTemplate.LoadContent().as<Editor::KeyChordVisual>();
-                chordVisual.KeyChord(chords.GetAt(i).CurrentKeys());
-                content.Children().Append(chordVisual);
-            }
-        }
-
-        flyout.Content(content);
-        button.Flyout(flyout);
-        flyout.ShowAt(button);
-    }
 }

src/cascadia/TerminalSettingsEditor/Actions.h

@@ -17,8 +17,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
 
-        void ViewAllKeyChordsButton_Click(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& e);
-
         til::property_changed_event PropertyChanged;
         WINRT_OBSERVABLE_PROPERTY(Editor::ActionsViewModel, ViewModel, PropertyChanged.raise, nullptr);
 

src/cascadia/TerminalSettingsEditor/Actions.xaml

@@ -8,6 +8,7 @@
       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:mtu="using:Microsoft.Terminal.UI"
       mc:Ignorable="d">
 
     <Page.Resources>
@@ -16,116 +17,182 @@
                 <ResourceDictionary Source="CommonResources.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
+            <!--  Theme Dictionary  -->
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Dark">
+                    <!--  TextBox colors !  -->
+                    <SolidColorBrush x:Key="TextControlBackground"
+                                     Color="#333333" />
+                    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush"
+                                     Color="#B5B5B5" />
+                    <SolidColorBrush x:Key="TextControlForeground"
+                                     Color="#B5B5B5" />
+                    <SolidColorBrush x:Key="TextControlBorderBrush"
+                                     Color="#404040" />
+                    <SolidColorBrush x:Key="TextControlButtonForeground"
+                                     Color="#B5B5B5" />
+
+                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver"
+                                     Color="#404040" />
+                    <SolidColorBrush x:Key="TextControlForegroundPointerOver"
+                                     Color="#FFFFFF" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver"
+                                     Color="#404040" />
+                    <SolidColorBrush x:Key="TextControlButtonForegroundPointerOver"
+                                     Color="#FF4343" />
+
+                    <SolidColorBrush x:Key="TextControlBackgroundFocused"
+                                     Color="#333333" />
+                    <SolidColorBrush x:Key="TextControlForegroundFocused"
+                                     Color="#FFFFFF" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushFocused"
+                                     Color="#404040" />
+                    <SolidColorBrush x:Key="TextControlButtonForegroundPressed"
+                                     Color="#FFFFFF" />
+                    <SolidColorBrush x:Key="TextControlButtonBackgroundPressed"
+                                     Color="#FF4343" />
+
+                    <!--  KeyChordText styles  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Border">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <!--  TextBox colors !  -->
+                    <SolidColorBrush x:Key="TextControlBackground"
+                                     Color="#CCCCCC" />
+                    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush"
+                                     Color="#636363" />
+                    <SolidColorBrush x:Key="TextControlBorderBrush"
+                                     Color="#636363" />
+                    <SolidColorBrush x:Key="TextControlButtonForeground"
+                                     Color="#636363" />
+
+                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver"
+                                     Color="#DADADA" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver"
+                                     Color="#636363" />
+                    <SolidColorBrush x:Key="TextControlButtonForegroundPointerOver"
+                                     Color="#FF4343" />
+
+                    <SolidColorBrush x:Key="TextControlBackgroundFocused"
+                                     Color="#CCCCCC" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushFocused"
+                                     Color="#636363" />
+                    <SolidColorBrush x:Key="TextControlButtonForegroundPressed"
+                                     Color="#FFFFFF" />
+                    <SolidColorBrush x:Key="TextControlButtonBackgroundPressed"
+                                     Color="#FF4343" />
+
+                    <!--  KeyChordText styles  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Border">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="HighContrast">
+
+                    <!--  KeyChordText styles (use XAML defaults for High Contrast theme)  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Border" />
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock" />
+
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+
             <!--  Styles  -->
-            <Style x:Key="ActionRowItemContainerStyle"
+            <Style x:Key="KeyBindingContainerStyle"
                    BasedOn="{StaticResource DefaultListViewItemStyle}"
                    TargetType="ListViewItem">
-                <Setter Property="Padding" Value="{StaticResource SettingsCardPadding}" />
-                <Setter Property="MinHeight" Value="{StaticResource SettingsCardMinHeight}" />
-                <Setter Property="Margin" Value="{StaticResource SettingsCardItemMargin}" />
+                <Setter Property="Padding" Value="12,4,4,4" />
                 <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                 <Setter Property="XYFocusKeyboardNavigation" Value="Enabled" />
-                <Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
-                <Setter Property="BorderThickness" Value="{ThemeResource ExpanderHeaderBorderThickness}" />
-                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
             </Style>
-
-            <Style x:Key="ActionRowNameTextStyle"
+            <Style x:Key="KeyBindingNameTextBlockStyle"
                    BasedOn="{StaticResource BaseTextBlockStyle}"
                    TargetType="TextBlock">
                 <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="FontWeight" Value="Normal" />
                 <Setter Property="TextWrapping" Value="WrapWholeWords" />
             </Style>
-
-            <Style x:Key="ActionRowSubtleButtonStyle"
-                   BasedOn="{StaticResource DefaultButtonStyle}"
-                   TargetType="Button">
-                <Setter Property="MinWidth" Value="32" />
-                <Setter Property="Width" Value="32" />
-                <Setter Property="Height" Value="32" />
-                <Setter Property="Padding" Value="0" />
+            <Style x:Key="KeyChordEditorStyle"
+                   TargetType="local:KeyChordListener">
+                <Setter Property="HorizontalAlignment" Value="Right" />
                 <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="Background" Value="Transparent" />
-                <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
 
-            <!--
-                FlyoutPresenter style with no internal padding so a full-width Border
-                separator inside the flyout can reach the flyout's left/right edges.
-            -->
-            <Style x:Key="EdgeToEdgeFlyoutPresenterStyle"
-                   BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
-                   TargetType="FlyoutPresenter">
-                <Setter Property="Padding" Value="0" />
-                <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
-                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-            </Style>
+            <!--  Converters & Misc.  -->
+            <SolidColorBrush x:Key="ActionContainerBackgroundEditing"
+                             Color="{ThemeResource SystemListMediumColor}" />
+            <SolidColorBrush x:Key="ActionContainerBackground"
+                             Color="Transparent" />
 
             <!--  Templates  -->
-            <DataTemplate x:Key="ViewAllKeyChordsFlyoutSeparatorTemplate">
-                <Border Height="1"
-                        Margin="0,4,0,4"
-                        Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
-            </DataTemplate>
-
-            <DataTemplate x:Key="ViewAllKeyChordsFlyoutEmptyStateTemplate">
-                <TextBlock x:Uid="Actions_NoKeyBindings"
-                           Margin="12,8,12,8"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center"
-                           Style="{StaticResource SecondaryTextBlockStyle}" />
-            </DataTemplate>
-
-            <DataTemplate x:Key="ViewAllKeyChordsFlyoutItemTemplate">
-                <local:KeyChordVisual Margin="{ThemeResource MenuFlyoutItemThemePaddingNarrow}"
-                                      HorizontalAlignment="Right" />
-            </DataTemplate>
-
             <DataTemplate x:Key="CommandTemplate"
                           x:DataType="local:CommandViewModel">
-                <Grid AutomationProperties.Name="{x:Bind DisplayNameAndKeyChordAutomationPropName, Mode=OneWay}"
-                      ColumnSpacing="8">
-                    <Grid.ColumnDefinitions>
-                        <!--  command name  -->
-                        <ColumnDefinition Width="*" />
-                        <!--  key chord  -->
-                        <ColumnDefinition Width="Auto" />
-                        <!--  edit button  -->
-                        <ColumnDefinition Width="Auto" />
-                        <!--  "..." button  -->
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+                <ListViewItem AutomationProperties.Name="{x:Bind DisplayNameAndKeyChordAutomationPropName, Mode=OneWay}"
+                              Style="{StaticResource KeyBindingContainerStyle}">
+                    <Grid ColumnSpacing="8">
+                        <Grid.ColumnDefinitions>
+                            <!--  command name  -->
+                            <ColumnDefinition Width="*" />
+                            <!--  key chord  -->
+                            <ColumnDefinition Width="auto" />
+                        </Grid.ColumnDefinitions>
 
-                    <!--  Command Name  -->
-                    <TextBlock Grid.Column="0"
-                               Style="{StaticResource ActionRowNameTextStyle}"
-                               Text="{x:Bind DisplayName, Mode=OneWay}" />
-
-                    <!--  Key Chord  -->
-                    <local:KeyChordVisual Grid.Column="1"
-                                          HorizontalAlignment="Right"
-                                          KeyChord="{x:Bind FirstKeyChord, Mode=OneWay}" />
-
-                    <!--  Edit button  -->
-                    <Button x:Uid="Actions_EditButton"
-                            Grid.Column="2"
-                            AutomationProperties.Name="{x:Bind DisplayName, Mode=OneWay}"
-                            Click="{x:Bind Edit_Click}"
-                            Style="{StaticResource ActionRowSubtleButtonStyle}">
-                        <FontIcon FontSize="14"
-                                  Glyph="&#xE70F;" />
-                    </Button>
-
-                    <!--  "..." button + flyout  -->
-                    <Button x:Uid="Actions_ViewAllKeyChordsButton"
-                            Grid.Column="3"
-                            Click="ViewAllKeyChordsButton_Click"
-                            Style="{StaticResource ActionRowSubtleButtonStyle}">
-                        <FontIcon FontSize="14"
-                                  Glyph="&#xE712;" />
-                    </Button>
-                </Grid>
+                        <!--  Command Name  -->
+                        <TextBlock Grid.Column="0"
+                                   FontWeight="Normal"
+                                   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>
+                    </Grid>
+                </ListViewItem>
             </DataTemplate>
         </ResourceDictionary>
     </Page.Resources>
@@ -141,8 +208,7 @@
             <!--  Add New Button  -->
             <Button x:Name="AddNewButton"
                     Margin="0,12,0,0"
-                    Click="{x:Bind ViewModel.AddNewCommand}"
-                    Style="{StaticResource AccentButtonStyle}">
+                    Click="{x:Bind ViewModel.AddNewCommand}">
                 <Button.Content>
                     <StackPanel Orientation="Horizontal">
                         <FontIcon FontSize="{StaticResource StandardIconSize}"
@@ -155,42 +221,11 @@
 
             <!--  Commands  -->
             <ListView x:Name="CommandsListView"
+                      Margin="-8,0,0,0"
                       IsItemClickEnabled="True"
                       ItemClick="{x:Bind ViewModel.CmdListItemClicked}"
-                      ItemContainerStyle="{StaticResource ActionRowItemContainerStyle}"
                       ItemTemplate="{StaticResource CommandTemplate}"
-                      ItemsSource="{x:Bind ViewModel.CommandList, Mode=OneWay}"
-                      SelectionMode="None">
-                <!--
-                    The framework ListViewItemPresenter reads its per-state backgrounds
-                    from these theme resources (not from ListViewItem.Background), so we
-                    override them here to match the card chrome on ActionRowItemContainerStyle.
-                -->
-                <ListView.Resources>
-                    <ResourceDictionary>
-                        <ResourceDictionary.ThemeDictionaries>
-                            <ResourceDictionary x:Key="Default">
-                                <StaticResource x:Key="ListViewItemBackground"
-                                                ResourceKey="ExpanderHeaderBackground" />
-                                <StaticResource x:Key="ListViewItemBackgroundPointerOver"
-                                                ResourceKey="ControlFillColorSecondaryBrush" />
-                                <StaticResource x:Key="ListViewItemBackgroundPressed"
-                                                ResourceKey="ControlFillColorTertiaryBrush" />
-                                <StaticResource x:Key="ListViewItemBackgroundSelected"
-                                                ResourceKey="ExpanderHeaderBackground" />
-                                <StaticResource x:Key="ListViewItemBackgroundSelectedPointerOver"
-                                                ResourceKey="ControlFillColorSecondaryBrush" />
-                                <StaticResource x:Key="ListViewItemBackgroundSelectedPressed"
-                                                ResourceKey="ControlFillColorTertiaryBrush" />
-                            </ResourceDictionary>
-                            <ResourceDictionary x:Key="HighContrast">
-                                <StaticResource x:Key="ListViewItemBackground"
-                                                ResourceKey="SystemColorButtonFaceColorBrush" />
-                            </ResourceDictionary>
-                        </ResourceDictionary.ThemeDictionaries>
-                    </ResourceDictionary>
-                </ListView.Resources>
-            </ListView>
+                      ItemsSource="{x:Bind ViewModel.CommandList, Mode=OneWay}" />
         </StackPanel>
     </Border>
 </Page>

src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp

@@ -57,22 +57,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             return;
         }
         std::vector<Editor::KeyChordViewModel> keyChordVMs;
-        int32_t idx = 1;
         for (const auto keys : _keyChordList)
         {
-            auto kcVM{ make_self<KeyChordViewModel>(keys) };
-            kcVM->Index(idx++);
-            _RegisterKeyChordVMEvents(*kcVM);
-            keyChordVMs.push_back(*kcVM);
+            auto kcVM{ make<KeyChordViewModel>(keys) };
+            _RegisterKeyChordVMEvents(kcVM);
+            keyChordVMs.push_back(kcVM);
         }
         _KeyChordList = single_threaded_observable_vector(std::move(keyChordVMs));
-        _KeyChordList.VectorChanged([weakThis{ get_weak() }](const auto& /*sender*/, const auto& /*args*/) {
-            if (auto self{ weakThis.get() })
-            {
-                self->_ReindexKeyChordList();
-                self->_NotifyChanges(L"FirstKeyChord", L"FirstKeyChordText", L"AdditionalKeyChordCountText", L"AdditionalKeyChordTooltipText", L"DisplayNameAndKeyChordAutomationPropName");
-            }
-        });
 
         std::vector<hstring> shortcutActions;
         for (const auto [action, name] : _availableActionsAndNamesMap)
@@ -128,7 +119,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return _cachedDisplayName;
     }
 
-    winrt::hstring CommandViewModel::Name() const noexcept
+    winrt::hstring CommandViewModel::Name()
     {
         return _command.HasName() ? _command.Name() : L"";
     }
@@ -154,7 +145,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return result;
     }
 
-    winrt::hstring CommandViewModel::FirstKeyChordText() const
+    winrt::hstring CommandViewModel::FirstKeyChordText()
     {
         if (_KeyChordList.Size() != 0)
         {
@@ -163,21 +154,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return L"";
     }
 
-    Control::KeyChord CommandViewModel::FirstKeyChord() const noexcept
-    {
-        if (_KeyChordList.Size() != 0)
-        {
-            return _KeyChordList.GetAt(0).CurrentKeys();
-        }
-        return nullptr;
-    }
-
-    bool CommandViewModel::HasNoKeyChords() const noexcept
-    {
-        return _KeyChordList.Size() == 0;
-    }
-
-    winrt::hstring CommandViewModel::AdditionalKeyChordCountText() const
+    winrt::hstring CommandViewModel::AdditionalKeyChordCountText()
     {
         const auto size = _KeyChordList.Size();
         if (size > 1)
@@ -187,7 +164,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return L"";
     }
 
-    winrt::hstring CommandViewModel::AdditionalKeyChordTooltipText() const
+    winrt::hstring CommandViewModel::AdditionalKeyChordTooltipText()
     {
         const auto size = _KeyChordList.Size();
         if (size <= 1)
@@ -206,12 +183,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return winrt::hstring{ result };
     }
 
-    winrt::hstring CommandViewModel::ID() const noexcept
+    winrt::hstring CommandViewModel::ID()
     {
         return _command.ID();
     }
 
-    bool CommandViewModel::IsUserAction() const noexcept
+    bool CommandViewModel::IsUserAction()
     {
         return _command.Origin() == OriginTag::User;
     }
@@ -229,40 +206,23 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     void CommandViewModel::AddKeybinding_Click()
     {
         auto kbdVM{ make_self<KeyChordViewModel>(nullptr) };
-        kbdVM->Index(gsl::narrow_cast<int32_t>(_KeyChordList.Size()) + 1);
         kbdVM->IsInEditMode(true);
         _RegisterKeyChordVMEvents(*kbdVM);
         KeyChordList().Append(*kbdVM);
         FocusContainer.raise(*this, *kbdVM);
     }
 
-    // Reassigns 1-based Index values for every KeyChordViewModel in the list. Called
-    // whenever the list changes shape so the per-row "Key Binding #N" label stays in sync.
-    void CommandViewModel::_ReindexKeyChordList()
-    {
-        const auto size = _KeyChordList.Size();
-        for (uint32_t i = 0; i < size; ++i)
-        {
-            auto kcVM{ _KeyChordList.GetAt(i) };
-            const auto newIdx = gsl::narrow_cast<int32_t>(i) + 1;
-            if (kcVM.Index() != newIdx)
-            {
-                kcVM.Index(newIdx);
-            }
-        }
-    }
-
-    winrt::hstring CommandViewModel::ActionNameTextBoxAutomationPropName() const
+    winrt::hstring CommandViewModel::ActionNameTextBoxAutomationPropName()
     {
         return RS_(L"Actions_Name/Text");
     }
 
-    winrt::hstring CommandViewModel::ShortcutActionComboBoxAutomationPropName() const
+    winrt::hstring CommandViewModel::ShortcutActionComboBoxAutomationPropName()
     {
         return RS_(L"Actions_ShortcutAction/Text");
     }
 
-    winrt::hstring CommandViewModel::AdditionalArgumentsControlAutomationPropName() const
+    winrt::hstring CommandViewModel::AdditionalArgumentsControlAutomationPropName()
     {
         return RS_(L"Actions_Arguments/Text");
     }
@@ -313,19 +273,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                         self->FocusContainer.raise(*self, senderVM);
                     }
                 }
-                else if (propertyName == L"KeyChordText")
-                {
-                    // The first chord of the list is what the row visual on the Actions page binds to,
-                    // so propagate the change up so the row updates.
-                    if (self->_KeyChordList.Size() > 0 && self->_KeyChordList.GetAt(0) == senderVM)
-                    {
-                        self->_NotifyChanges(L"FirstKeyChord", L"FirstKeyChordText", L"DisplayNameAndKeyChordAutomationPropName");
-                    }
-                    else
-                    {
-                        self->_NotifyChanges(L"AdditionalKeyChordTooltipText");
-                    }
-                }
             }
         });
     }
@@ -1118,21 +1065,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     KeyChordViewModel::KeyChordViewModel(Control::KeyChord currentKeys)
     {
         CurrentKeys(currentKeys);
-
-        // DisplayLabel is derived from Index, so re-fire the change for it whenever Index changes.
-        PropertyChanged([this](const auto& /*sender*/, const Windows::UI::Xaml::Data::PropertyChangedEventArgs& args) {
-            if (args.PropertyName() == L"Index")
-            {
-                _NotifyChanges(L"DisplayLabel");
-            }
-        });
     }
 
     void KeyChordViewModel::CurrentKeys(const Control::KeyChord& newKeys)
     {
         _currentKeys = newKeys;
         KeyChordText(Model::KeyChordSerialization::ToString(_currentKeys));
-        _NotifyChanges(L"CurrentKeys");
     }
 
     Control::KeyChord KeyChordViewModel::CurrentKeys() const noexcept
@@ -1188,12 +1126,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     hstring KeyChordViewModel::CancelButtonName() const noexcept { return RS_(L"Actions_CancelButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"); }
     hstring KeyChordViewModel::AcceptButtonName() const noexcept { return RS_(L"Actions_AcceptButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"); }
     hstring KeyChordViewModel::DeleteButtonName() const noexcept { return RS_(L"Actions_DeleteButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"); }
-    hstring KeyChordViewModel::EditButtonName() const noexcept { return RS_(L"Actions_EditButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"); }
-
-    winrt::hstring KeyChordViewModel::DisplayLabel() const
-    {
-        return hstring{ RS_fmt(L"EditAction_KeyBindingNumberFormat", _Index) };
-    }
 
     ActionsViewModel::ActionsViewModel(Model::CascadiaSettings settings) :
         _Settings{ settings }
@@ -1402,6 +1334,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             const auto conflictingCmdName{ conflictingCmd.Name() };
             TextBlock conflictingCommandNameTB{};
             conflictingCommandNameTB.Text(fmt::format(L"\"{}\"", conflictingCmdName.empty() ? RS_(L"Actions_UnnamedCommandName") : conflictingCmdName));
+            conflictingCommandNameTB.FontStyle(Windows::UI::Text::FontStyle::Italic);
 
             TextBlock confirmationQuestionTB{};
             confirmationQuestionTB.Text(RS_(L"Actions_RenameConflictConfirmationQuestion"));

src/cascadia/TerminalSettingsEditor/ActionsViewModel.h

@@ -69,18 +69,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void Initialize();
 
         winrt::hstring DisplayName();
-        winrt::hstring Name() const noexcept;
+        winrt::hstring Name();
         void Name(const winrt::hstring& newName);
         winrt::hstring DisplayNameAndKeyChordAutomationPropName();
 
-        winrt::hstring FirstKeyChordText() const;
-        Control::KeyChord FirstKeyChord() const noexcept;
-        bool HasNoKeyChords() const noexcept;
-        winrt::hstring AdditionalKeyChordCountText() const;
-        winrt::hstring AdditionalKeyChordTooltipText() const;
+        winrt::hstring FirstKeyChordText();
+        winrt::hstring AdditionalKeyChordCountText();
+        winrt::hstring AdditionalKeyChordTooltipText();
 
-        winrt::hstring ID() const noexcept;
-        bool IsUserAction() const noexcept;
+        winrt::hstring ID();
+        bool IsUserAction();
 
         void Edit_Click();
         til::typed_event<Editor::CommandViewModel, IInspectable> EditRequested;
@@ -91,9 +89,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void AddKeybinding_Click();
 
         // UIA text
-        winrt::hstring ActionNameTextBoxAutomationPropName() const;
-        winrt::hstring ShortcutActionComboBoxAutomationPropName() const;
-        winrt::hstring AdditionalArgumentsControlAutomationPropName() const;
+        winrt::hstring ActionNameTextBoxAutomationPropName();
+        winrt::hstring ShortcutActionComboBoxAutomationPropName();
+        winrt::hstring AdditionalArgumentsControlAutomationPropName();
 
         til::typed_event<IInspectable, Editor::ArgWrapper> PropagateColorSchemeRequested;
         til::typed_event<IInspectable, Editor::ArgWrapper> PropagateColorSchemeNamesRequested;
@@ -117,7 +115,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void _RegisterActionArgsVMEvents(Editor::ActionArgsViewModel actionArgsVM);
         void _ReplaceCommandWithUserCopy(bool reinitialize);
         void _CreateAndInitializeActionArgsVMHelper();
-        void _ReindexKeyChordList();
     };
 
     struct ArgWrapper : ArgWrapperT<ArgWrapper>, ViewModelHelper<ArgWrapper>
@@ -233,19 +230,15 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void CancelChanges();
         void DeleteKeyChord();
 
-        winrt::hstring DisplayLabel() const;
-
         // UIA Text
         hstring CancelButtonName() const noexcept;
         hstring AcceptButtonName() const noexcept;
         hstring DeleteButtonName() const noexcept;
-        hstring EditButtonName() const noexcept;
 
         VIEW_MODEL_OBSERVABLE_PROPERTY(bool, IsInEditMode, false);
         VIEW_MODEL_OBSERVABLE_PROPERTY(Control::KeyChord, ProposedKeys);
         VIEW_MODEL_OBSERVABLE_PROPERTY(winrt::hstring, KeyChordText);
         VIEW_MODEL_OBSERVABLE_PROPERTY(Windows::UI::Xaml::Controls::Flyout, AcceptChangesFlyout, nullptr);
-        VIEW_MODEL_OBSERVABLE_PROPERTY(int32_t, Index, 0);
 
     public:
         til::typed_event<Editor::KeyChordViewModel, Terminal::Control::KeyChord> AddKeyChordRequested;

src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl

@@ -55,8 +55,6 @@ namespace Microsoft.Terminal.Settings.Editor
         // View-model specific
         String DisplayName { get; };
         String FirstKeyChordText { get; };
-        Microsoft.Terminal.Control.KeyChord FirstKeyChord { get; };
-        Boolean HasNoKeyChords { get; };
         String AdditionalKeyChordCountText { get; };
         String AdditionalKeyChordTooltipText { get; };
         String DisplayNameAndKeyChordAutomationPropName { get; };
@@ -140,12 +138,9 @@ namespace Microsoft.Terminal.Settings.Editor
         String KeyChordText { get; };
 
         // UI side
-        Microsoft.Terminal.Control.KeyChord CurrentKeys { get; };
         Microsoft.Terminal.Control.KeyChord ProposedKeys;
         Windows.UI.Xaml.Controls.Flyout AcceptChangesFlyout;
         Boolean IsInEditMode { get; };
-        Int32 Index;
-        String DisplayLabel { get; };
         void ToggleEditMode();
         void AcceptChanges();
         void CancelChanges();
@@ -153,7 +148,6 @@ namespace Microsoft.Terminal.Settings.Editor
         String CancelButtonName { get; };
         String AcceptButtonName { get; };
         String DeleteButtonName { get; };
-        String EditButtonName { get; };
 
         event Windows.Foundation.TypedEventHandler<KeyChordViewModel, Microsoft.Terminal.Control.KeyChord> AddKeyChordRequested;
         event Windows.Foundation.TypedEventHandler<KeyChordViewModel, ModifyKeyChordEventArgs> ModifyKeyChordRequested;

src/cascadia/TerminalSettingsEditor/Appearances.xaml

@@ -68,9 +68,9 @@
     </UserControl.Resources>
 
     <StackPanel>
-        <!--  Section: Typography settings  -->
         <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Appearance_Section_Typography"
+            <!--  Grouping: Text  -->
+            <TextBlock x:Uid="Profile_TextHeader"
                        Margin="0,0,0,4"
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
             <!--  Color Scheme  -->
@@ -484,25 +484,13 @@
                           SelectedItem="{x:Bind CurrentAdjustIndistinguishableColors, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}" />
             </local:SettingContainer>
-
-            <!--  Intense is bold, bright  -->
-            <local:SettingContainer x:Name="IntenseTextStyle"
-                                    x:Uid="Appearance_IntenseTextStyle"
-                                    ClearSettingValue="{x:Bind Appearance.ClearIntenseTextStyle}"
-                                    HasSettingValue="{x:Bind Appearance.HasIntenseTextStyle, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Appearance.IntenseTextStyleOverrideSource, Mode=OneWay}">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind IntenseTextStyleList, Mode=OneWay}"
-                          SelectedItem="{x:Bind CurrentIntenseTextStyle, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
         </StackPanel>
 
-        <!--  Section: Cursor settings  -->
+        <!--  Grouping: Cursor  -->
         <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Appearance_Section_Cursor"
+            <TextBlock x:Uid="Profile_CursorHeader"
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
+
             <!--  Cursor Shape  -->
             <local:SettingContainer x:Name="CursorShape"
                                     x:Uid="Profile_CursorShape"
@@ -556,10 +544,11 @@
             </local:SettingContainer>
         </StackPanel>
 
-        <!--  Section: Background image  -->
+        <!--  Grouping: Background  -->
         <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Appearance_Section_BackgroundImage"
+            <TextBlock x:Uid="Profile_BackgroundHeader"
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
+
             <!--  Background Image  -->
             <local:SettingContainer x:Name="BackgroundImageContainer"
                                     x:Uid="Profile_BackgroundImage"
@@ -813,5 +802,24 @@
             </local:SettingContainer>
         </StackPanel>
 
+        <!--  Grouping: Text Formatting  -->
+        <StackPanel Style="{StaticResource PivotStackStyle}">
+            <TextBlock x:Uid="Appearance_TextFormattingHeader"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+
+            <!--  Intense is bold, bright  -->
+            <local:SettingContainer x:Name="IntenseTextStyle"
+                                    x:Uid="Appearance_IntenseTextStyle"
+                                    ClearSettingValue="{x:Bind Appearance.ClearIntenseTextStyle}"
+                                    HasSettingValue="{x:Bind Appearance.HasIntenseTextStyle, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.IntenseTextStyleOverrideSource, Mode=OneWay}">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind IntenseTextStyleList, Mode=OneWay}"
+                          SelectedItem="{x:Bind CurrentIntenseTextStyle, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
+        </StackPanel>
+
     </StackPanel>
 </UserControl>

src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml

@@ -2,17 +2,16 @@
     Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
     the MIT License. See LICENSE in the project root for license information.
 -->
-<Page
-    x:Class="Microsoft.Terminal.Settings.Editor.ColorSchemes"
-    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">
+<Page x:Class="Microsoft.Terminal.Settings.Editor.ColorSchemes"
+      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">
 
     <Page.Resources>
         <ResourceDictionary>
@@ -20,76 +19,81 @@
                 <ResourceDictionary Source="CommonResources.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
-            <DataTemplate x:Key="ColorPreviewChipTemplate" x:DataType="local:ColorTableEntry">
-                <Border
-                    Width="24.5"
-                    Height="8"
-                    Background="{x:Bind mtu:Converters.ColorToBrush(Color)}" />
+            <DataTemplate x:Key="ColorPreviewChipTemplate"
+                          x:DataType="local:ColorTableEntry">
+                <Border Width="12"
+                        Height="12"
+                        Background="{x:Bind mtu:Converters.ColorToBrush(Color)}"
+                        CornerRadius="2" />
             </DataTemplate>
+
+            <Style x:Key="SchemeGridStyle"
+                   TargetType="Grid">
+                <!--  Loosely based on NonExpanderGrid style  -->
+                <Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
+                <Setter Property="MinHeight" Value="64" />
+                <Setter Property="Padding" Value="0,0,8,0" />
+            </Style>
         </ResourceDictionary>
     </Page.Resources>
 
-    <Grid
-        MaxWidth="{StaticResource StandardControlMaxWidth}"
-        Margin="0,0,0,8"
-        RowSpacing="8">
+    <Grid MaxWidth="{StaticResource StandardControlMaxWidth}"
+          Margin="0,0,0,8"
+          RowSpacing="8">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Spacing="8">
-            <TextBlock x:Uid="ColorSchemesDisclaimer" Style="{StaticResource DisclaimerStyle}" />
-            <Button
-                x:Name="AddNewButton"
-                Margin="0"
-                Click="AddNew_Click"
-                Style="{StaticResource BrowseButtonStyle}">
+        <StackPanel Grid.Row="0"
+                    Spacing="8">
+            <TextBlock x:Uid="ColorSchemesDisclaimer"
+                       Style="{StaticResource DisclaimerStyle}" />
+            <Button x:Name="AddNewButton"
+                    Margin="0"
+                    Click="AddNew_Click"
+                    Style="{StaticResource BrowseButtonStyle}">
                 <StackPanel Orientation="Horizontal">
-                    <FontIcon FontSize="{StaticResource StandardIconSize}" Glyph="&#xE710;" />
-                    <TextBlock x:Uid="ColorScheme_AddNewButton" Style="{StaticResource IconButtonTextBlockStyle}" />
+                    <FontIcon FontSize="{StaticResource StandardIconSize}"
+                              Glyph="&#xE710;" />
+                    <TextBlock x:Uid="ColorScheme_AddNewButton"
+                               Style="{StaticResource IconButtonTextBlockStyle}" />
                 </StackPanel>
             </Button>
         </StackPanel>
 
-        <GridView
-            x:Name="ColorSchemeListView"
-            Grid.Row="1"
-            MaxWidth="{StaticResource StandardControlMaxWidth}"
-            Margin="-8,8,0,0"
-            IsItemClickEnabled="True"
-            ItemClick="{x:Bind ViewModel.SchemeListItemClicked}"
-            ItemsSource="{x:Bind ViewModel.AllColorSchemes, Mode=OneWay}"
-            PreviewKeyDown="ListView_PreviewKeyDown"
-            SelectedItem="{x:Bind ViewModel.CurrentScheme, Mode=TwoWay}"
-            SelectionMode="Single">
-            <GridView.ItemContainerStyle>
-                <Style TargetType="GridViewItem">
-                    <Setter Property="Margin" Value="8"/>
-                </Style>
-            </GridView.ItemContainerStyle>
-            <GridView.Resources>
+        <ListView x:Name="ColorSchemeListView"
+                  Grid.Row="1"
+                  MaxWidth="{StaticResource StandardControlMaxWidth}"
+                  Margin="-16,0,0,0"
+                  IsItemClickEnabled="True"
+                  ItemClick="{x:Bind ViewModel.SchemeListItemClicked}"
+                  ItemsSource="{x:Bind ViewModel.AllColorSchemes, Mode=OneWay}"
+                  PreviewKeyDown="ListView_PreviewKeyDown"
+                  SelectedItem="{x:Bind ViewModel.CurrentScheme, Mode=TwoWay}"
+                  SelectionMode="Single">
+            <ListView.Resources>
                 <!--  We need this here because otherwise the background is blue in Windows 10  -->
-                <SolidColorBrush x:Key="ListViewItemBackgroundSelected" Color="{ThemeResource SystemListLowColor}" />
-            </GridView.Resources>
-            <GridView.ItemTemplate>
+                <SolidColorBrush x:Key="ListViewItemBackgroundSelected"
+                                 Color="{ThemeResource SystemListLowColor}" />
+            </ListView.Resources>
+            <ListView.ItemTemplate>
                 <DataTemplate x:DataType="local:ColorSchemeViewModel">
-                    <Grid
-                        Width="196"
-                        Height="116"
-                        Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                        BorderThickness="1"
-                        CornerRadius="{StaticResource OverlayCornerRadius}">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="0" />
-                        </Grid.RowDefinitions>
-                        <Grid Padding="8" CornerRadius="8,8,0,0" Background="{x:Bind mtu:Converters.ColorToBrush(BackgroundColor.Color), Mode=OneWay}">
-                            <TextBlock FontSize="12" TextWrapping="Wrap" FontFamily="Cascadia Code" Text="{x:Bind Name, Mode=OneWay}" Foreground="{x:Bind mtu:Converters.ColorToBrush(ForegroundColor.Color), Mode=OneWay}"/>
-                        </Grid>
+                    <Grid MaxWidth="1000"
+                          Margin="0,2,0,2"
+                          Style="{StaticResource SchemeGridStyle}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
                         <!--  Set the height of the inner grid as 48 to be 3/4 of the ListViewItem height  -->
-                        <Grid Grid.Row="1">
+                        <Grid Grid.Column="0"
+                              Height="48"
+                              Padding="12,12,8,8"
+                              VerticalAlignment="Center"
+                              Background="{x:Bind mtu:Converters.ColorToBrush(BackgroundColor.Color), Mode=OneWay}"
+                              ColumnSpacing="2"
+                              CornerRadius="{StaticResource ControlCornerRadius}"
+                              RowSpacing="2">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
@@ -105,125 +109,114 @@
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
-                            <ContentControl
-                                Grid.Row="0"
-                                Grid.Column="0"
-                                Content="{x:Bind ColorEntryAt(0), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Content="{x:Bind ColorEntryAt(1), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="0"
-                                Grid.Column="2"
-                                Content="{x:Bind ColorEntryAt(2), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="0"
-                                Grid.Column="3"
-                                Content="{x:Bind ColorEntryAt(3), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="0"
-                                Grid.Column="4"
-                                Content="{x:Bind ColorEntryAt(4), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="0"
-                                Grid.Column="5"
-                                Content="{x:Bind ColorEntryAt(5), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="0"
-                                Grid.Column="6"
-                                Content="{x:Bind ColorEntryAt(6), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="0"
-                                Grid.Column="7"
-                                Content="{x:Bind ColorEntryAt(7), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                Content="{x:Bind ColorEntryAt(8), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Content="{x:Bind ColorEntryAt(9), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="1"
-                                Grid.Column="2"
-                                Content="{x:Bind ColorEntryAt(10), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="1"
-                                Grid.Column="3"
-                                Content="{x:Bind ColorEntryAt(11), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="1"
-                                Grid.Column="4"
-                                Content="{x:Bind ColorEntryAt(12), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="1"
-                                Grid.Column="5"
-                                Content="{x:Bind ColorEntryAt(13), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="1"
-                                Grid.Column="6"
-                                Content="{x:Bind ColorEntryAt(14), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-                            <ContentControl
-                                Grid.Row="1"
-                                Grid.Column="7"
-                                Content="{x:Bind ColorEntryAt(15), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
-                                IsTabStop="False" />
-
+                            <ContentControl Grid.Row="0"
+                                            Grid.Column="0"
+                                            Content="{x:Bind ColorEntryAt(0), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="0"
+                                            Grid.Column="1"
+                                            Content="{x:Bind ColorEntryAt(1), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="0"
+                                            Grid.Column="2"
+                                            Content="{x:Bind ColorEntryAt(2), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="0"
+                                            Grid.Column="3"
+                                            Content="{x:Bind ColorEntryAt(3), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="0"
+                                            Grid.Column="4"
+                                            Content="{x:Bind ColorEntryAt(4), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="0"
+                                            Grid.Column="5"
+                                            Content="{x:Bind ColorEntryAt(5), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="0"
+                                            Grid.Column="6"
+                                            Content="{x:Bind ColorEntryAt(6), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="0"
+                                            Grid.Column="7"
+                                            Content="{x:Bind ColorEntryAt(7), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="1"
+                                            Grid.Column="0"
+                                            Content="{x:Bind ColorEntryAt(8), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="1"
+                                            Grid.Column="1"
+                                            Content="{x:Bind ColorEntryAt(9), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="1"
+                                            Grid.Column="2"
+                                            Content="{x:Bind ColorEntryAt(10), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="1"
+                                            Grid.Column="3"
+                                            Content="{x:Bind ColorEntryAt(11), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="1"
+                                            Grid.Column="4"
+                                            Content="{x:Bind ColorEntryAt(12), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="1"
+                                            Grid.Column="5"
+                                            Content="{x:Bind ColorEntryAt(13), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="1"
+                                            Grid.Column="6"
+                                            Content="{x:Bind ColorEntryAt(14), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <ContentControl Grid.Row="1"
+                                            Grid.Column="7"
+                                            Content="{x:Bind ColorEntryAt(15), Mode=OneWay}"
+                                            ContentTemplate="{StaticResource ColorPreviewChipTemplate}"
+                                            IsTabStop="False" />
+                            <TextBlock Grid.RowSpan="2"
+                                       Grid.Column="8"
+                                       Padding="10,0,10,0"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       AutomationProperties.AccessibilityView="Raw"
+                                       FontFamily="Cascadia Code"
+                                       Foreground="{x:Bind mtu:Converters.ColorToBrush(ForegroundColor.Color), Mode=OneWay}"
+                                       Text="{x:Bind Name, Mode=OneWay}" />
                         </Grid>
-                        <TextBlock
-                            Grid.Row="2" Margin="12,0,0,0"
-                            VerticalAlignment="Center"
-                            AutomationProperties.AccessibilityView="Raw"                        
-                            Text="{x:Bind Name, Mode=OneWay}" />
-                        <Border
-                            Grid.Row="2"
-                            Padding="8,4" CornerRadius="8"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Center"
-                            Background="{ThemeResource ControlFillColorSecondaryBrush}"
-                            Visibility="{x:Bind IsDefaultScheme, Mode=OneWay}">
-                            <TextBlock
-                                x:Uid="ColorScheme_DefaultTag"
-                                Grid.Column="1" FontSize="10"
-                                AutomationProperties.AccessibilityView="Raw"
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                        <Border Grid.Column="1"
+                                Margin="12,0,0,0"
+                                Padding="8,4"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Background="{ThemeResource SubtleFillColorSecondaryBrush}"
+                                BorderBrush="{ThemeResource ControlStrongStrokeColorDefaultBrush}"
+                                BorderThickness="1"
+                                CornerRadius="{StaticResource ControlCornerRadius}"
+                                Visibility="{x:Bind IsDefaultScheme, Mode=OneWay}">
+                            <TextBlock x:Uid="ColorScheme_DefaultTag"
+                                       Grid.Column="1"
+                                       AutomationProperties.AccessibilityView="Raw"
+                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                         </Border>
                     </Grid>
                 </DataTemplate>
-            </GridView.ItemTemplate>
-        </GridView>
+            </ListView.ItemTemplate>
+        </ListView>
     </Grid>
 </Page>

src/cascadia/TerminalSettingsEditor/CommonResources.xaml

@@ -64,7 +64,6 @@
 
     <local:ColorToBrushConverter x:Key="ColorToBrushConverter" />
     <local:ColorToStringConverter x:Key="ColorToStringConverter" />
-    <mtu:StringNotEmptyToVisibilityConverter x:Key="StringNotEmptyToVisibilityConverter" />
 
     <Color x:Key="DeleteButtonColor">Firebrick</Color>
 
@@ -1229,19 +1228,13 @@
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <StackPanel Grid.Column="0"
-                                    Padding="0,12,0,12"
-                                    VerticalAlignment="Center">
-                            <ContentPresenter x:Name="ContentPresenter"
-                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              Content="{TemplateBinding Content}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              ContentTransitions="{TemplateBinding ContentTransitions}" />
-                            <TextBlock Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                       Text="{Binding Tag, RelativeSource={RelativeSource Mode=TemplatedParent}}"
-                                       Visibility="{Binding Tag, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource StringNotEmptyToVisibilityConverter}}" />
-                        </StackPanel>
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          Grid.Column="0"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTransitions="{TemplateBinding ContentTransitions}" />
                         <FontIcon Grid.Column="1"
                                   Margin="20,0,8,0"
                                   HorizontalAlignment="Right"

src/cascadia/TerminalSettingsEditor/Compatibility.cpp

@@ -17,7 +17,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         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");
-        INITIALIZE_BINDABLE_ENUM_SETTING(GraphicsAPI, GraphicsAPI, winrt::Microsoft::Terminal::Control::GraphicsAPI, L"Globals_GraphicsAPI_", L"Text");
     }
 
     bool CompatibilityViewModel::DebugFeaturesAvailable() const noexcept

src/cascadia/TerminalSettingsEditor/Compatibility.h

@@ -28,10 +28,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         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);
 
-        GETSET_BINDABLE_ENUM_SETTING(GraphicsAPI, winrt::Microsoft::Terminal::Control::GraphicsAPI, _settings.GlobalSettings().GraphicsAPI);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), DisablePartialInvalidation);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), SoftwareRendering);
-
     private:
         Model::CascadiaSettings _settings;
     };

src/cascadia/TerminalSettingsEditor/Compatibility.idl

@@ -23,11 +23,6 @@ namespace Microsoft.Terminal.Settings.Editor
 
         IInspectable CurrentAmbiguousWidth;
         Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> AmbiguousWidthList { get; };
-
-        IInspectable CurrentGraphicsAPI;
-        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> GraphicsAPIList { get; };
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, DisablePartialInvalidation);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, SoftwareRendering);
     }
 
     [default_interface] runtimeclass Compatibility : Windows.UI.Xaml.Controls.Page

src/cascadia/TerminalSettingsEditor/Compatibility.xaml

@@ -25,117 +25,83 @@
     </Page.Resources>
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
-        <!--  Section: Compatibility  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Compatibility_Section_Compatibility"
-                       Margin="0,0,0,4"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Allow Headless  -->
-            <local:SettingContainer x:Name="AllowHeadless"
-                                    x:Uid="Globals_AllowHeadless">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.AllowHeadless, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Allow Headless  -->
+        <local:SettingContainer x:Name="AllowHeadless"
+                                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">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
-                          SelectedItem="{x:Bind ViewModel.CurrentTextMeasurement, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Text Measurement  -->
+        <local:SettingContainer x:Name="TextMeasurement"
+                                x:Uid="Globals_TextMeasurement">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
+                      SelectedItem="{x:Bind ViewModel.CurrentTextMeasurement, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-            <!--  Ambiguous Width  -->
-            <local:SettingContainer x:Name="AmbiguousWidth"
-                                    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>
+        <!--  Ambiguous Width  -->
+        <local:SettingContainer x:Name="AmbiguousWidth"
+                                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"
-                                    Visibility="{x:Bind ViewModel.DebugFeaturesAvailable}">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.DebugFeaturesEnabled, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Debug Features  -->
+        <local:SettingContainer x:Name="DebugFeaturesEnabled"
+                                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">
-                <Button x:Uid="Settings_ResetApplicationStateButton"
-                        Style="{StaticResource DeleteButtonStyle}">
-                    <Button.Flyout>
-                        <Flyout x:Name="ResetCacheFlyout"
-                                FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
-                            <StackPanel>
-                                <TextBlock x:Uid="Settings_ResetApplicationStateConfirmationMessageHeader"
-                                           Style="{StaticResource CustomFlyoutTextStyle}" />
-                                <TextBlock x:Uid="Settings_ResetApplicationStateConfirmationMessageBody"
-                                           FontWeight="Normal"
-                                           Style="{StaticResource CustomFlyoutTextStyle}" />
-                                <Button x:Uid="Settings_ResetApplicationStateConfirmationButton"
-                                        Click="ResetApplicationStateButton_Click" />
-                            </StackPanel>
-                        </Flyout>
-                    </Button.Flyout>
-                </Button>
-            </local:SettingContainer>
+        <!--  Reset Application State  -->
+        <local:SettingContainer x:Name="ResetApplicationState"
+                                x:Uid="Settings_ResetApplicationState">
+            <Button x:Uid="Settings_ResetApplicationStateButton"
+                    Style="{StaticResource DeleteButtonStyle}">
+                <Button.Flyout>
+                    <Flyout x:Name="ResetCacheFlyout"
+                            FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
+                        <StackPanel>
+                            <TextBlock x:Uid="Settings_ResetApplicationStateConfirmationMessageHeader"
+                                       Style="{StaticResource CustomFlyoutTextStyle}" />
+                            <TextBlock x:Uid="Settings_ResetApplicationStateConfirmationMessageBody"
+                                       FontWeight="Normal"
+                                       Style="{StaticResource CustomFlyoutTextStyle}" />
+                            <Button x:Uid="Settings_ResetApplicationStateConfirmationButton"
+                                    Click="ResetApplicationStateButton_Click" />
+                        </StackPanel>
+                    </Flyout>
+                </Button.Flyout>
+            </Button>
+        </local:SettingContainer>
 
-            <!--  Reset to Default Settings  -->
-            <local:SettingContainer x:Name="ResetToDefaultSettings"
-                                    x:Uid="Settings_ResetToDefaultSettings">
-                <Button x:Uid="Settings_ResetToDefaultSettingsButton"
-                        Style="{StaticResource DeleteButtonStyle}">
-                    <Button.Flyout>
-                        <Flyout FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
-                            <StackPanel>
-                                <TextBlock x:Uid="Settings_ResetToDefaultSettingsConfirmationMessageHeader"
-                                           Style="{StaticResource CustomFlyoutTextStyle}" />
-                                <TextBlock x:Uid="Settings_ResetToDefaultSettingsConfirmationMessageBody"
-                                           FontWeight="Normal"
-                                           Style="{StaticResource CustomFlyoutTextStyle}" />
-                                <Button x:Uid="Settings_ResetToDefaultSettingsConfirmationButton"
-                                        Click="{x:Bind ViewModel.ResetToDefaultSettings}" />
-                            </StackPanel>
-                        </Flyout>
-                    </Button.Flyout>
-                </Button>
-            </local:SettingContainer>
-        </StackPanel>
+        <!--  Reset to Default Settings  -->
+        <local:SettingContainer x:Name="ResetToDefaultSettings"
+                                x:Uid="Settings_ResetToDefaultSettings">
+            <Button x:Uid="Settings_ResetToDefaultSettingsButton"
+                    Style="{StaticResource DeleteButtonStyle}">
+                <Button.Flyout>
+                    <Flyout FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
+                        <StackPanel>
+                            <TextBlock x:Uid="Settings_ResetToDefaultSettingsConfirmationMessageHeader"
+                                       Style="{StaticResource CustomFlyoutTextStyle}" />
+                            <TextBlock x:Uid="Settings_ResetToDefaultSettingsConfirmationMessageBody"
+                                       FontWeight="Normal"
+                                       Style="{StaticResource CustomFlyoutTextStyle}" />
+                            <Button x:Uid="Settings_ResetToDefaultSettingsConfirmationButton"
+                                    Click="{x:Bind ViewModel.ResetToDefaultSettings}" />
+                        </StackPanel>
+                    </Flyout>
+                </Button.Flyout>
+            </Button>
+        </local:SettingContainer>
 
-        <!--  Section: Rendering  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Compatibility_Section_Rendering"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Graphics API  -->
-            <local:SettingContainer x:Name="GraphicsAPI"
-                                    x:Uid="Globals_GraphicsAPI">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.GraphicsAPIList}"
-                          SelectedItem="{x:Bind ViewModel.CurrentGraphicsAPI, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
-
-            <!--  Disable Partial Invalidation  -->
-            <local:SettingContainer x:Name="DisablePartialInvalidation"
-                                    x:Uid="Globals_DisablePartialInvalidation">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.DisablePartialInvalidation, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-
-            <!--  Software Rendering  -->
-            <local:SettingContainer x:Name="SoftwareRendering"
-                                    x:Uid="Globals_SoftwareRendering">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.SoftwareRendering, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
     </StackPanel>
 </Page>

src/cascadia/TerminalSettingsEditor/EditAction.xaml

@@ -17,11 +17,130 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="CommonResources.xaml" />
             </ResourceDictionary.MergedDictionaries>
+            <!--  Theme Dictionary  -->
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Dark">
+                    <!--  KeyChordText styles  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Button">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="1" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                        <!--  Override visual states  -->
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="Button">
+                                    <Grid>
+                                        <!--  Define the appearance of the button  -->
+                                        <Border x:Name="border"
+                                                Background="{TemplateBinding Background}"
+                                                BorderBrush="{TemplateBinding BorderBrush}"
+                                                BorderThickness="{TemplateBinding BorderThickness}"
+                                                CornerRadius="{TemplateBinding CornerRadius}">
+                                            <ContentPresenter HorizontalAlignment="Center"
+                                                              VerticalAlignment="Center" />
+                                        </Border>
+                                        <VisualStateManager.VisualStateGroups>
+                                            <VisualStateGroup x:Name="CommonStates">
+                                                <VisualState x:Name="Normal" />
+                                                <VisualState x:Name="PointerOver">
+                                                    <Storyboard>
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="border"
+                                                                                       Storyboard.TargetProperty="Background">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource SystemControlHighlightAccentRevealBackgroundBrush}" />
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                    </Storyboard>
+                                                </VisualState>
+                                                <VisualState x:Name="Pressed" />
+                                                <VisualState x:Name="Disabled" />
+                                            </VisualStateGroup>
+                                        </VisualStateManager.VisualStateGroups>
+                                    </Grid>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <!--  KeyChordText styles  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Button">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="1" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                        <!--  Override visual states  -->
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="Button">
+                                    <Grid>
+                                        <!--  Define the appearance of the button  -->
+                                        <Border x:Name="border"
+                                                Background="{TemplateBinding Background}"
+                                                BorderBrush="{TemplateBinding BorderBrush}"
+                                                BorderThickness="{TemplateBinding BorderThickness}"
+                                                CornerRadius="{TemplateBinding CornerRadius}">
+                                            <ContentPresenter HorizontalAlignment="Center"
+                                                              VerticalAlignment="Center" />
+                                        </Border>
+                                        <VisualStateManager.VisualStateGroups>
+                                            <VisualStateGroup x:Name="CommonStates">
+                                                <VisualState x:Name="Normal" />
+                                                <VisualState x:Name="PointerOver">
+                                                    <Storyboard>
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="border"
+                                                                                       Storyboard.TargetProperty="Background">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource SystemControlHighlightAccentRevealBackgroundBrush}" />
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                    </Storyboard>
+                                                </VisualState>
+                                                <VisualState x:Name="Pressed" />
+                                                <VisualState x:Name="Disabled" />
+                                            </VisualStateGroup>
+                                        </VisualStateManager.VisualStateGroups>
+                                    </Grid>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="HighContrast">
+                    <!--  KeyChordText styles (use XAML defaults for High Contrast theme)  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Button" />
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+
+            <GridLength x:Key="ArgumentNameWidth">148</GridLength>
 
             <!--  Styles  -->
+            <Style x:Key="KeyBindingContainerStyle"
+                   BasedOn="{StaticResource DefaultListViewItemStyle}"
+                   TargetType="ListViewItem">
+                <Setter Property="Padding" Value="4" />
+                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                <Setter Property="XYFocusKeyboardNavigation" Value="Enabled" />
+            </Style>
+            <Style x:Key="KeyChordEditorStyle"
+                   TargetType="local:KeyChordListener">
+                <Setter Property="HorizontalAlignment" Value="Stretch" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
             <x:Int32 x:Key="EditButtonSize">32</x:Int32>
             <x:Double x:Key="EditButtonIconSize">14</x:Double>
-
             <Style x:Key="EditButtonStyle"
                    BasedOn="{StaticResource DefaultButtonStyle}"
                    TargetType="Button">
@@ -30,7 +149,6 @@
                 <Setter Property="Height" Value="{StaticResource EditButtonSize}" />
                 <Setter Property="Width" Value="{StaticResource EditButtonSize}" />
             </Style>
-
             <Style x:Key="AccentEditButtonStyle"
                    BasedOn="{StaticResource AccentButtonStyle}"
                    TargetType="Button">
@@ -39,63 +157,42 @@
                 <Setter Property="Height" Value="{StaticResource EditButtonSize}" />
                 <Setter Property="Width" Value="{StaticResource EditButtonSize}" />
             </Style>
-
-            <Style x:Key="KeyChordEditorStyle"
-                   TargetType="local:KeyChordListener">
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="MinWidth" Value="160" />
+            <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>
 
-            <!--
-                Item container for the per-chord ListView. We're hosting a SettingContainer
-                inside each item, so strip the default ListViewItem visuals (padding, border,
-                hover/selection background) so they don't double up.
-            -->
-            <Style x:Key="KeyChordListViewItemStyle"
-                   BasedOn="{StaticResource DefaultListViewItemStyle}"
-                   TargetType="ListViewItem">
-                <Setter Property="Padding" Value="0" />
-                <Setter Property="Margin" Value="0" />
-                <Setter Property="MinHeight" Value="0" />
-                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                <Setter Property="Background" Value="Transparent" />
-                <Setter Property="BorderThickness" Value="0" />
-            </Style>
-
-            <!--  "Key Binding #N" template  -->
+            <!--  Templates  -->
             <DataTemplate x:Key="KeyChordTemplate"
                           x:DataType="local:KeyChordViewModel">
-                <local:SettingContainer Header="{x:Bind DisplayLabel, Mode=OneWay}">
-                    <Grid VerticalAlignment="Center"
-                          ColumnSpacing="8">
+                <ListViewItem IsTabStop="False"
+                              Style="{StaticResource KeyBindingContainerStyle}">
+                    <Grid Padding="-4,0,0,0"
+                          VerticalAlignment="Center">
                         <Grid.ColumnDefinitions>
-                            <!--  Key visual / key chord listener  -->
+                            <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
                             <ColumnDefinition Width="Auto" />
-                            <!--  Cancel button (visible only in edit mode)  -->
                             <ColumnDefinition Width="Auto" />
-                            <!--  Accept button (visible only in edit mode)  -->
-                            <ColumnDefinition Width="Auto" />
-                            <!--  Edit (pencil) button (visible only NOT in edit mode)  -->
-                            <ColumnDefinition Width="Auto" />
-                            <!--  Delete button  -->
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-
-                        <!--  Read-only key chord visual  -->
-                        <local:KeyChordVisual Grid.Column="0"
-                                              KeyChord="{x:Bind CurrentKeys, Mode=OneWay}"
-                                              Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(IsInEditMode), Mode=OneWay}" />
-
-                        <!--  Editable key chord listener  -->
+                        <Button Grid.Column="0"
+                                Background="{ThemeResource AppBarItemBackgroundThemeBrush}"
+                                Click="{x:Bind ToggleEditMode}"
+                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(IsInEditMode), Mode=OneWay}">
+                            <TextBlock FontSize="14"
+                                       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}" />
-
-                        <!--  Cancel changes (edit mode only)  -->
                         <Button x:Uid="Actions_CancelButton"
                                 Grid.Column="1"
+                                Margin="8,0,0,0"
                                 AutomationProperties.Name="{x:Bind CancelButtonName}"
                                 Click="{x:Bind CancelChanges}"
                                 Style="{StaticResource EditButtonStyle}"
@@ -104,9 +201,9 @@
                                       Glyph="&#xE711;" />
                         </Button>
 
-                        <!--  Accept changes (edit mode only)  -->
                         <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}"
@@ -116,19 +213,8 @@
                                       Glyph="&#xE8FB;" />
                         </Button>
 
-                        <!--  Edit button  -->
-                        <Button x:Uid="Actions_EditButton"
-                                Grid.Column="3"
-                                AutomationProperties.Name="{x:Bind EditButtonName}"
-                                Click="{x:Bind ToggleEditMode}"
-                                Style="{StaticResource EditButtonStyle}"
-                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(IsInEditMode), Mode=OneWay}">
-                            <FontIcon FontSize="{StaticResource EditButtonIconSize}"
-                                      Glyph="&#xE70F;" />
-                        </Button>
-
-                        <!--  Delete button  -->
-                        <Button Grid.Column="4"
+                        <Button Grid.Column="3"
+                                HorizontalAlignment="Left"
                                 AutomationProperties.Name="{x:Bind DeleteButtonName}"
                                 Style="{StaticResource DeleteSmallButtonStyle}">
                             <Button.Content>
@@ -147,23 +233,25 @@
                             </Button.Flyout>
                         </Button>
                     </Grid>
-                </local:SettingContainer>
+                </ListViewItem>
             </DataTemplate>
 
-            <!--
-                BODGY: Each ArgWrapper DataTemplate below wraps its editor control
-                in a <local:SettingContainer Header="{x:Bind Name}"> rather than sharing a
-                single outer template. This is because a bug in WinUI 2 prevents a
-                ContentPresenter + ContentTemplateSelector pattern from working correctly,
-                resulting in "Microsoft.Terminal.Settings.Editor.ArgWrapper" being shown.
-            -->
-
             <!--  Example shortcut action to test this template: Adjust Opacity  -->
             <!--  Currently that is the only Int32 arg, so just clamp the min/max values according to that  -->
             <DataTemplate x:Key="Int32Template"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <muxc:NumberBox MinWidth="160"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </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"
@@ -171,14 +259,24 @@
                                     SmallChange="10"
                                     Style="{StaticResource NumberBoxSettingStyle}"
                                     Value="{x:Bind UnboxInt32(Value), Mode=TwoWay, BindBack=Int32BindBack}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Switch To Tab  -->
             <DataTemplate x:Key="UInt32Template"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <muxc:NumberBox MinWidth="160"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </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"
@@ -186,14 +284,24 @@
                                     SmallChange="1"
                                     Style="{StaticResource NumberBoxSettingStyle}"
                                     Value="{x:Bind UnboxUInt32(Value), Mode=TwoWay, BindBack=UInt32BindBack}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Close Other Tabs  -->
             <DataTemplate x:Key="UInt32OptionalTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <muxc:NumberBox MinWidth="160"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </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"
@@ -201,14 +309,24 @@
                                     SmallChange="1"
                                     Style="{StaticResource NumberBoxSettingStyle}"
                                     Value="{x:Bind UnboxUInt32Optional(Value), Mode=TwoWay, BindBack=UInt32OptionalBindBack}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Split Pane  -->
             <DataTemplate x:Key="Int32OptionalTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <muxc:NumberBox MinWidth="160"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </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"
@@ -216,14 +334,24 @@
                                     SmallChange="1"
                                     Style="{StaticResource NumberBoxSettingStyle}"
                                     Value="{x:Bind UnboxInt32Optional(Value), Mode=TwoWay, BindBack=Int32OptionalBindBack}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Adjust Font Size  -->
             <DataTemplate x:Key="FloatTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <muxc:NumberBox MinWidth="160"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </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"
@@ -231,14 +359,24 @@
                                     SmallChange="1"
                                     Style="{StaticResource NumberBoxSettingStyle}"
                                     Value="{x:Bind UnboxFloat(Value), Mode=TwoWay, BindBack=FloatBindBack}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Split Pane  -->
             <DataTemplate x:Key="SplitSizeTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <muxc:NumberBox MinWidth="160"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </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"
@@ -246,95 +384,144 @@
                                     SmallChange="0.1"
                                     Style="{StaticResource NumberBoxSettingStyle}"
                                     Value="{x:Bind UnboxFloat(Value), Mode=TwoWay, BindBack=FloatBindBack}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Send Input  -->
             <DataTemplate x:Key="StringTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <TextBox MinWidth="248"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*"
+                                          MinWidth="196" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <TextBox Grid.Column="1"
                              AutomationProperties.Name="{x:Bind Name}"
                              Text="{x:Bind UnboxString(Value), Mode=TwoWay, BindBack=StringBindBack}"
                              TextWrapping="Wrap" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Set Color Scheme  -->
             <DataTemplate x:Key="ColorSchemeTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <ComboBox MinWidth="248"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </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}"
                               SelectedItem="{x:Bind EnumValue, Mode=TwoWay}"
                               Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Export Buffer  -->
             <DataTemplate x:Key="FilePickerTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <Grid ColumnSpacing="4">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"
-                                              MinWidth="196" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <TextBox Grid.Column="0"
-                                 AutomationProperties.Name="{x:Bind Name}"
-                                 Text="{x:Bind UnboxString(Value), Mode=TwoWay, BindBack=StringBindBack}"
-                                 TextWrapping="Wrap" />
-                        <Button x:Uid="Actions_Browse"
-                                Grid.Column="1"
-                                Click="{x:Bind BrowseForFile_Click}"
-                                Style="{StaticResource BrowseButtonStyle}" />
-                    </Grid>
-                </local:SettingContainer>
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*"
+                                          MinWidth="196" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <TextBox Grid.Column="1"
+                             AutomationProperties.Name="{x:Bind Name}"
+                             Text="{x:Bind UnboxString(Value), Mode=TwoWay, BindBack=StringBindBack}"
+                             TextWrapping="Wrap" />
+                    <Button x:Uid="Actions_Browse"
+                            Grid.Column="2"
+                            Click="{x:Bind BrowseForFile_Click}"
+                            Style="{StaticResource BrowseButtonStyle}" />
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: New Tab  -->
             <DataTemplate x:Key="FolderPickerTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <Grid ColumnSpacing="4">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"
-                                              MinWidth="196" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <TextBox Grid.Column="0"
-                                 AutomationProperties.Name="{x:Bind Name}"
-                                 Text="{x:Bind UnboxString(Value), Mode=TwoWay, BindBack=StringBindBack}"
-                                 TextWrapping="Wrap" />
-                        <Button x:Uid="Actions_Browse"
-                                Grid.Column="1"
-                                Click="{x:Bind BrowseForFolder_Click}"
-                                Style="{StaticResource BrowseButtonStyle}" />
-                    </Grid>
-                </local:SettingContainer>
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*"
+                                          MinWidth="196" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <TextBox Grid.Column="1"
+                             AutomationProperties.Name="{x:Bind Name}"
+                             Text="{x:Bind UnboxString(Value), Mode=TwoWay, BindBack=StringBindBack}"
+                             TextWrapping="Wrap" />
+                    <Button x:Uid="Actions_Browse"
+                            Grid.Column="2"
+                            Click="{x:Bind BrowseForFolder_Click}"
+                            Style="{StaticResource BrowseButtonStyle}" />
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Set Focus Mode  -->
             <DataTemplate x:Key="BoolTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <ToggleSwitch AutomationProperties.Name="{x:Bind Name}"
-                                  IsOn="{x:Bind UnboxBool(Value), Mode=TwoWay, BindBack=BoolOptionalBindBack}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </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>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Split Pane  -->
             <DataTemplate x:Key="BoolOptionalTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <CheckBox AutomationProperties.Name="{x:Bind Name}"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </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" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Resize Pane  -->
@@ -345,14 +532,24 @@
 
             <DataTemplate x:Key="EnumTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <ComboBox MinWidth="248"
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </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}"
                               SelectedItem="{x:Bind EnumValue, Mode=TwoWay}"
                               Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Copy Text  -->
@@ -375,35 +572,66 @@
 
             <DataTemplate x:Key="FlagTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
-                    <ItemsControl AutomationProperties.Name="{x:Bind Name}"
+                <Grid Margin="0,4,0,4">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
+                    <ItemsControl Grid.Column="1"
+                                  Margin="0"
+                                  HorizontalAlignment="Left"
+                                  AutomationProperties.Name="{x:Bind Name}"
                                   ItemTemplate="{StaticResource FlagItemTemplate}"
                                   ItemsSource="{x:Bind FlagList, Mode=OneWay}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Add Mark  -->
             <DataTemplate x:Key="TerminalCoreColorOptionalTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
                     <local:NullableColorPicker x:Uid="Actions_NullableColorPicker"
+                                               Grid.Column="1"
                                                AutomationProperties.Name="{x:Bind Name}"
                                                ColorSchemeVM="{x:Bind DefaultColorScheme, Mode=OneWay}"
                                                CurrentColor="{x:Bind UnboxTerminalCoreColorOptional(Value), Mode=TwoWay, BindBack=TerminalCoreColorBindBack}"
                                                NullColorPreview="{x:Bind DefaultColorScheme.ForegroundColor.Color, Mode=OneWay}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <!--  Example shortcut action to test this template: Set Tab Color  -->
             <DataTemplate x:Key="WindowsUIColorOptionalTemplate"
                           x:DataType="local:ArgWrapper">
-                <local:SettingContainer Header="{x:Bind Name}">
+                <Grid Margin="0,4,0,4"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Text="{x:Bind Name}"
+                               TextWrapping="WrapWholeWords" />
                     <local:NullableColorPicker x:Uid="Actions_NullableColorPicker"
+                                               Grid.Column="1"
                                                AutomationProperties.Name="{x:Bind Name}"
                                                ColorSchemeVM="{x:Bind DefaultColorScheme, Mode=OneWay}"
                                                CurrentColor="{x:Bind UnboxWindowsUIColorOptional(Value), Mode=TwoWay, BindBack=WindowsUIColorBindBack}"
                                                NullColorPreview="{x:Bind DefaultColorScheme.ForegroundColor.Color, Mode=OneWay}" />
-                </local:SettingContainer>
+                </Grid>
             </DataTemplate>
 
             <local:ArgsTemplateSelectors x:Key="ArgsTemplateSelector"
@@ -427,106 +655,122 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
-        <StackPanel HorizontalAlignment="Stretch"
-                    Style="{StaticResource SettingsStackStyle}">
-
-            <!--  Action type (top-most setting on the page)  -->
-            <local:SettingContainer x:Name="ActionType"
-                                    x:Uid="EditAction_ActionType">
-                <AutoSuggestBox x:Name="ShortcutActionBox"
-                                MinWidth="248"
-                                AutomationProperties.Name="{x:Bind ViewModel.ShortcutActionComboBoxAutomationPropName}"
-                                GotFocus="ShortcutActionBox_GotFocus"
-                                LostFocus="ShortcutActionBox_LostFocus"
-                                QuerySubmitted="ShortcutActionBox_QuerySubmitted"
-                                TextChanged="ShortcutActionBox_TextChanged" />
-            </local:SettingContainer>
-
-            <!--  Key bindings expander  -->
-            <local:SettingContainer x:Name="KeyBindingsContainer"
-                                    x:Uid="EditAction_KeyBindings"
-                                    StartExpanded="{x:Bind mtu:Converters.InvertBoolean(ViewModel.HasNoKeyChords), Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <StackPanel>
-                    <!--  "New key binding" button  -->
-                    <local:SettingContainer x:Name="NewKeyBinding"
-                                            x:Uid="EditAction_NewKeyBinding">
-                        <Button x:Uid="EditAction_AddKeyBinding"
-                                Click="{x:Bind ViewModel.AddKeybinding_Click}"
-                                Style="{StaticResource AccentButtonStyle}" />
-                    </local:SettingContainer>
-
-                    <!--  Existing key bindings, one container per chord  -->
-                    <ListView x:Name="KeyChordListView"
-                              x:Uid="Actions_KeyBindingsListView"
-                              HorizontalAlignment="Stretch"
-                              HorizontalContentAlignment="Stretch"
-                              IsItemClickEnabled="False"
-                              ItemContainerStyle="{StaticResource KeyChordListViewItemStyle}"
-                              ItemTemplate="{StaticResource KeyChordTemplate}"
-                              ItemsSource="{x:Bind ViewModel.KeyChordList, Mode=OneWay}"
-                              SelectionMode="None" />
-                </StackPanel>
-            </local:SettingContainer>
-
-            <!--  Additional customizations expander  -->
-            <local:SettingContainer x:Name="AdditionalCustomizations"
-                                    x:Uid="EditAction_AdditionalCustomizations"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <StackPanel>
-                    <!--  Action name  -->
-                    <local:SettingContainer x:Name="ActionName"
-                                            x:Uid="EditAction_ActionName">
-                        <TextBox x:Name="CommandNameTextBox"
-                                 MinWidth="248"
-                                 AutomationProperties.Name="{x:Bind ViewModel.ActionNameTextBoxAutomationPropName}"
-                                 PlaceholderText="{x:Bind ViewModel.DisplayName, Mode=OneWay}"
-                                 Text="{x:Bind ViewModel.Name, Mode=TwoWay}" />
-                    </local:SettingContainer>
-
-                    <!--  Action argument controls  -->
-                    <ItemsControl HorizontalAlignment="Stretch"
-                                  HorizontalContentAlignment="Stretch"
-                                  AutomationProperties.Name="{x:Bind ViewModel.AdditionalArgumentsControlAutomationPropName}"
-                                  IsTabStop="False"
-                                  ItemTemplateSelector="{StaticResource ArgsTemplateSelector}"
-                                  ItemsSource="{x:Bind ViewModel.ActionArgsVM.ArgValues, Mode=OneWay}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel HorizontalAlignment="Stretch" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                    </ItemsControl>
-                </StackPanel>
-            </local:SettingContainer>
-
-            <!--  Delete command button  -->
-            <local:SettingContainer x:Name="DeleteCommand"
-                                    x:Uid="EditAction_DeleteCommand">
-                <Button IsEnabled="{x:Bind ViewModel.IsUserAction, Mode=OneWay}"
-                        Style="{StaticResource DeleteButtonStyle}">
-                    <Button.Content>
-                        <StackPanel Orientation="Horizontal">
-                            <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                      Glyph="&#xE74D;" />
-                            <TextBlock x:Uid="Actions_DeleteButton2"
-                                       Style="{StaticResource IconButtonTextBlockStyle}" />
+    <Border MaxWidth="{StaticResource StandardControlMaxWidth}"
+            Margin="{StaticResource SettingStackMargin}">
+        <Grid Margin="{StaticResource SettingStackMargin}"
+              HorizontalAlignment="Stretch">
+            <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="*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock x:Uid="Actions_CommandDetails"
+                       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.Column="1"
+                     Margin="0,0,0,8"
+                     HorizontalAlignment="Stretch"
+                     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="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"
+                          AutomationProperties.Name="{x:Bind ViewModel.AdditionalArgumentsControlAutomationPropName}"
+                          IsTabStop="False"
+                          ItemTemplateSelector="{StaticResource ArgsTemplateSelector}"
+                          ItemsSource="{x:Bind ViewModel.ActionArgsVM.ArgValues, Mode=OneWay}" />
+            <Button Grid.Row="7"
+                    Grid.Column="0"
+                    IsEnabled="{x:Bind ViewModel.IsUserAction, Mode=OneWay}"
+                    Style="{StaticResource DeleteButtonStyle}">
+                <Button.Content>
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE74D;" />
+                        <TextBlock x:Uid="Actions_DeleteButton2"
+                                   Style="{StaticResource IconButtonTextBlockStyle}" />
+                    </StackPanel>
+                </Button.Content>
+                <Button.Flyout>
+                    <Flyout>
+                        <StackPanel>
+                            <TextBlock x:Uid="Actions_CommandDeleteConfirmationMessage"
+                                       Style="{StaticResource CustomFlyoutTextStyle}" />
+                            <Button x:Uid="Actions_CommandDeleteConfirmationButton"
+                                    Click="{x:Bind ViewModel.Delete_Click}" />
                         </StackPanel>
-                    </Button.Content>
-                    <Button.Flyout>
-                        <Flyout>
-                            <StackPanel>
-                                <TextBlock x:Uid="Actions_CommandDeleteConfirmationMessage"
-                                           Style="{StaticResource CustomFlyoutTextStyle}" />
-                                <Button x:Uid="Actions_CommandDeleteConfirmationButton"
-                                        Click="{x:Bind ViewModel.Delete_Click}" />
-                            </StackPanel>
-                        </Flyout>
-                    </Button.Flyout>
-                </Button>
-            </local:SettingContainer>
-
-        </StackPanel>
+                    </Flyout>
+                </Button.Flyout>
+            </Button>
+        </Grid>
     </Border>
 </Page>

src/cascadia/TerminalSettingsEditor/Extensions.xaml

@@ -19,6 +19,12 @@
                 <ResourceDictionary Source="CommonResources.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
+            <Style x:Key="ItalicDisclaimerStyle"
+                   BasedOn="{StaticResource DisclaimerStyle}"
+                   TargetType="TextBlock">
+                <Setter Property="FontStyle" Value="Italic" />
+            </Style>
+
             <Style x:Key="CodeBlockStyle"
                    TargetType="TextBlock">
                 <Setter Property="FontFamily" Value="Cascadia Mono, Consolas" />

src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml

@@ -27,152 +27,126 @@
     </Page.Resources>
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
-        <!--  Section: Visual style  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Globals_Section_VisualStyle"
-                       Margin="0,0,0,4"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Theme  -->
-            <local:SettingContainer x:Name="Theme"
-                                    x:Uid="Globals_Theme">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemsSource="{x:Bind ViewModel.ThemeList, Mode=OneWay}"
-                          SelectedItem="{x:Bind ViewModel.CurrentTheme, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate x:DataType="model:Theme">
-                            <TextBlock Text="{x:Bind local:GlobalAppearanceViewModel.ThemeNameConverter((model:Theme)), Mode=OneWay}" />
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
-            </local:SettingContainer>
+        <!--  Theme  -->
+        <local:SettingContainer x:Name="Theme"
+                                x:Uid="Globals_Theme">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemsSource="{x:Bind ViewModel.ThemeList, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.CurrentTheme, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate x:DataType="model:Theme">
+                        <TextBlock Text="{x:Bind local:GlobalAppearanceViewModel.ThemeNameConverter((model:Theme)), Mode=OneWay}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </local:SettingContainer>
 
-            <!--  Show Acrylic in Tab Row  -->
-            <local:SettingContainer x:Name="AcrylicTabRow"
-                                    x:Uid="Globals_AcrylicTabRow">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.UseAcrylicInTabRow, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Position of new tab  -->
+        <local:SettingContainer x:Name="NewTabPosition"
+                                x:Uid="Globals_NewTabPosition">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.NewTabPositionList, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.CurrentNewTabPosition, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-            <!--  Enable Unfocused Acrylic  -->
-            <local:SettingContainer x:Name="EnableUnfocusedAcrylic"
-                                    x:Uid="Globals_EnableUnfocusedAcrylic">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.EnableUnfocusedAcrylic, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Show Titlebar  -->
+        <local:SettingContainer x:Name="ShowTitlebar"
+                                x:Uid="Globals_ShowTitlebar">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsInTitlebar, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}"
+                          Toggled="{x:Bind ViewModel.ShowTitlebarToggled}" />
+        </local:SettingContainer>
 
-            <!--  Disable Animations  -->
-            <!--  NOTE: the UID is "DisablePaneAnimationsReversed" not "DisablePaneAnimations". See GH#9124 for more details.  -->
-            <local:SettingContainer x:Name="DisableAnimations"
-                                    x:Uid="Globals_DisableAnimationsReversed">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.InvertedDisableAnimations, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
+        <!--  Always show tabs  -->
+        <local:SettingContainer x:Name="AlwaysShowTabs"
+                                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>
 
-        <!--  Section: Tabs and layout  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Globals_Section_TabsLayout"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Position of new tab  -->
-            <local:SettingContainer x:Name="NewTabPosition"
-                                    x:Uid="Globals_NewTabPosition">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.NewTabPositionList, Mode=OneWay}"
-                          SelectedItem="{x:Bind ViewModel.CurrentNewTabPosition, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Show tabs in full screen  -->
+        <local:SettingContainer x:Name="ShowTabsFullscreen"
+                                x:Uid="Globals_ShowTabsFullscreen">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsFullscreen, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Always show tabs  -->
-            <local:SettingContainer x:Name="AlwaysShowTabs"
-                                    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 Acrylic in Tab Row  -->
+        <local:SettingContainer x:Name="AcrylicTabRow"
+                                x:Uid="Globals_AcrylicTabRow">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.UseAcrylicInTabRow, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Show tabs in full screen  -->
-            <local:SettingContainer x:Name="ShowTabsFullscreen"
-                                    x:Uid="Globals_ShowTabsFullscreen">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsFullscreen, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Show Title in Titlebar  -->
+        <local:SettingContainer x:Name="ShowTitleInTitlebar"
+                                x:Uid="Globals_ShowTitleInTitlebar">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTitleInTitlebar, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Tab Width Mode  -->
-            <local:SettingContainer x:Name="TabWidthMode"
-                                    x:Uid="Globals_TabWidthMode">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.TabWidthModeList, Mode=OneWay}"
-                          SelectedItem="{x:Bind ViewModel.CurrentTabWidthMode, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Always on Top  -->
+        <local:SettingContainer x:Name="AlwaysOnTop"
+                                x:Uid="Globals_AlwaysOnTop">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Show Titlebar  -->
-            <local:SettingContainer x:Name="ShowTitlebar"
-                                    x:Uid="Globals_ShowTitlebar">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsInTitlebar, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}"
-                              Toggled="{x:Bind ViewModel.ShowTitlebarToggled}" />
-            </local:SettingContainer>
-        </StackPanel>
+        <!--  Tab Width Mode  -->
+        <local:SettingContainer x:Name="TabWidthMode"
+                                x:Uid="Globals_TabWidthMode">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.TabWidthModeList, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.CurrentTabWidthMode, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-        <!--  Section: Window behavior  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Globals_Section_WindowBehavior"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Always on Top  -->
-            <local:SettingContainer x:Name="AlwaysOnTop"
-                                    x:Uid="Globals_AlwaysOnTop">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Disable Animations  -->
+        <!--  NOTE: the UID is "DisablePaneAnimationsReversed" not "DisablePaneAnimations". See GH#9124 for more details.  -->
+        <local:SettingContainer x:Name="DisableAnimations"
+                                x:Uid="Globals_DisableAnimationsReversed">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.InvertedDisableAnimations, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Automatically hide window  -->
-            <local:SettingContainer x:Name="AutoHideWindow"
-                                    x:Uid="Globals_AutoHideWindow">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.AutoHideWindow, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
+        <!--  Always Show Notification Icon  -->
+        <local:SettingContainer x:Name="AlwaysShowNotificationIcon"
+                                x:Uid="Globals_AlwaysShowNotificationIcon">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowNotificationIcon, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-        <!--  Section: Title bar & identity  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Globals_Section_TitleBarIdentity"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Show Title in Titlebar (use active terminal title as application title)  -->
-            <local:SettingContainer x:Name="ShowTitleInTitlebar"
-                                    x:Uid="Globals_ShowTitleInTitlebar">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTitleInTitlebar, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Minimize To Notification Area  -->
+        <local:SettingContainer x:Name="MinimizeToNotificationArea"
+                                x:Uid="Globals_MinimizeToNotificationArea">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.MinimizeToNotificationArea, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Show Admin Shield  -->
-            <local:SettingContainer x:Name="ShowAdminShield"
-                                    x:Uid="Globals_ShowAdminShield">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ShowAdminShield, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
+        <!--  Automatically hide window  -->
+        <local:SettingContainer x:Name="AutoHideWindow"
+                                x:Uid="Globals_AutoHideWindow">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.AutoHideWindow, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-        <!--  Section: System integration & notifications  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Globals_Section_SystemIntegration"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Always Show Notification Icon  -->
-            <local:SettingContainer x:Name="AlwaysShowNotificationIcon"
-                                    x:Uid="Globals_AlwaysShowNotificationIcon">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowNotificationIcon, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Show Admin Shield  -->
+        <local:SettingContainer x:Name="ShowAdminShield"
+                                x:Uid="Globals_ShowAdminShield">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowAdminShield, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Minimize To Notification Area  -->
-            <local:SettingContainer x:Name="MinimizeToNotificationArea"
-                                    x:Uid="Globals_MinimizeToNotificationArea">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.MinimizeToNotificationArea, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
+        <!--  Enable Unfocused Acrylic  -->
+        <local:SettingContainer x:Name="EnableUnfocusedAcrylic"
+                                x:Uid="Globals_EnableUnfocusedAcrylic">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.EnableUnfocusedAcrylic, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
     </StackPanel>
 </Page>

src/cascadia/TerminalSettingsEditor/Interaction.xaml

@@ -26,169 +26,149 @@
 
     <StackPanel>
         <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <!--  Section: Clipboard and paste behavior  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Interaction_Section_Clipboard"
-                           Margin="0,0,0,4"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Copy On Select  -->
-                <local:SettingContainer x:Name="CopyOnSelect"
-                                        x:Uid="Globals_CopyOnSelect">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Copy On Select  -->
+            <local:SettingContainer x:Name="CopyOnSelect"
+                                    x:Uid="Globals_CopyOnSelect">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Trim Paste  -->
-                <local:SettingContainer x:Name="TrimPaste"
-                                        x:Uid="Globals_TrimPaste">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Copy Format  -->
+            <local:SettingContainer x:Name="CopyFormat"
+                                    x:Uid="Globals_CopyFormat">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.CopyFormatList, Mode=OneWay}"
+                          SelectedItem="{x:Bind ViewModel.CurrentCopyFormat, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Trim Block Selection  -->
-                <local:SettingContainer x:Name="TrimBlockSelection"
-                                        x:Uid="Globals_TrimBlockSelection">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.TrimBlockSelection, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Trim Block Selection  -->
+            <local:SettingContainer x:Name="TrimBlockSelection"
+                                    x:Uid="Globals_TrimBlockSelection">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.TrimBlockSelection, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Copy Format  -->
-                <local:SettingContainer x:Name="CopyFormat"
-                                        x:Uid="Globals_CopyFormat">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.CopyFormatList, Mode=OneWay}"
-                              SelectedItem="{x:Bind ViewModel.CurrentCopyFormat, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Trim Paste  -->
+            <local:SettingContainer x:Name="TrimPaste"
+                                    x:Uid="Globals_TrimPaste">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-            <!--  Section: Text selection & editing  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Interaction_Section_TextSelection"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Word Delimiters  -->
-                <local:SettingContainer x:Name="WordDelimiters"
-                                        x:Uid="Globals_WordDelimiters">
-                    <TextBox IsSpellCheckEnabled="False"
-                Style="{StaticResource TextBoxSettingStyle}"
-                Text="{x:Bind ViewModel.WordDelimiters, Mode=TwoWay}" />
-                </local:SettingContainer>
+            <!--  Word Delimiters  -->
+            <local:SettingContainer x:Name="WordDelimiters"
+                                    x:Uid="Globals_WordDelimiters"
+                                    CurrentValue="{x:Bind ViewModel.WordDelimiters, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <TextBox IsSpellCheckEnabled="False"
+                         Style="{StaticResource TextBoxSettingStyle}"
+                         Text="{x:Bind ViewModel.WordDelimiters, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Enable Color Selection  -->
-                <local:SettingContainer x:Name="EnableColorSelection"
-                                        x:Uid="Globals_EnableColorSelection">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.EnableColorSelection, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Snap On Resize  -->
+            <local:SettingContainer x:Name="SnapToGridOnResize"
+                                    x:Uid="Globals_SnapToGridOnResize">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.SnapToGridOnResize, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-            <!--  Section: Window and layout behavior  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Interaction_Section_WindowLayout"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Snap On Resize  -->
-                <local:SettingContainer x:Name="SnapToGridOnResize"
-                                        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">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.TabSwitcherModeList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentTabSwitcherMode, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Focus Follow Mouse Mode  -->
-                <local:SettingContainer x:Name="FocusFollowMouse"
-                                        x:Uid="Globals_FocusFollowMouse">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Focus Follow Mouse Mode  -->
+            <local:SettingContainer x:Name="FocusFollowMouse"
+                                    x:Uid="Globals_FocusFollowMouse">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Tab Switcher Mode  -->
-                <local:SettingContainer x:Name="TabSwitcherMode"
-                                        x:Uid="Globals_TabSwitcherMode">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.TabSwitcherModeList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentTabSwitcherMode, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Enable Font Size Changes with Scrolling  -->
+            <local:SettingContainer x:Name="ScrollToZoom"
+                                    x:Uid="Globals_ScrollToZoom">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToZoom, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-            <!--  Section: Mouse & scrolling  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Interaction_Section_MouseScrolling"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Enable Font Size Changes with Scrolling  -->
-                <local:SettingContainer x:Name="ScrollToZoom"
-                                        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">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToChangeOpacity, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Enable Window Opacity Changes with Scrolling  -->
-                <local:SettingContainer x:Name="ScrollToChangeOpacity"
-                                        x:Uid="Globals_ScrollToChangeOpacity">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToChangeOpacity, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Detect URLs  -->
+            <local:SettingContainer x:Name="DetectURLs"
+                                    x:Uid="Globals_DetectURLs">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-            <!--  Section: URLs & external actions  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Interaction_Section_UrlsExternal"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Detect URLs  -->
-                <local:SettingContainer x:Name="DetectURLs"
-                                        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"
+                                    CurrentValue="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <TextBox IsSpellCheckEnabled="False"
+                         Style="{StaticResource TextBoxSettingStyle}"
+                         Text="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Search Web Default Query URL  -->
-                <local:SettingContainer x:Name="SearchWebDefaultQueryUrl"
-                                        x:Uid="Globals_SearchWebDefaultQueryUrl">
-                    <TextBox IsSpellCheckEnabled="False"
-                             Style="{StaticResource TextBoxSettingStyle}"
-                             Text="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=TwoWay}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Enable Color Selection  -->
+            <local:SettingContainer x:Name="EnableColorSelection"
+                                    x:Uid="Globals_EnableColorSelection">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.EnableColorSelection, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+        </StackPanel>
 
-            <!--  Section: Warnings  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Interaction_Section_Warnings"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Confirm Close On  -->
-                <local:SettingContainer x:Name="ConfirmOnClose"
-                                        x:Uid="Globals_ConfirmOnClose">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.ConfirmOnCloseList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentConfirmOnClose, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+        <StackPanel Style="{StaticResource SettingsStackStyle}">
+            <!--  Grouping: Warnings  -->
+            <TextBlock x:Uid="Globals_WarningsHeader"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
 
-                <!--  Input Service Warning  -->
-                <local:SettingContainer x:Name="InputServiceWarning"
-                                        x:Uid="Globals_InputServiceWarning">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.InputServiceWarning, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Confirm Close On  -->
+            <local:SettingContainer x:Name="ConfirmOnClose"
+                                    x:Uid="Globals_ConfirmOnClose">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.ConfirmOnCloseList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentConfirmOnClose, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Large Paste Warning  -->
-                <local:SettingContainer x:Name="WarnAboutLargePaste"
-                                        x:Uid="Globals_WarnAboutLargePaste">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.WarnAboutLargePaste, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Input Service Warning  -->
+            <local:SettingContainer x:Name="InputServiceWarning"
+                                    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">
+                <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">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind WarnAboutMultiLinePasteList}"
+                          SelectedItem="{x:Bind CurrentWarnAboutMultiLinePaste, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Multi Line Paste Warning  -->
-                <local:SettingContainer x:Name="WarnAboutMultiLinePaste"
-                                        x:Uid="Globals_WarnAboutMultiLinePaste">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind WarnAboutMultiLinePasteList}"
-                              SelectedItem="{x:Bind CurrentWarnAboutMultiLinePaste, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
         </StackPanel>
     </StackPanel>
 </Page>

src/cascadia/TerminalSettingsEditor/KeyChordVisual.cpp

@@ -1,131 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "KeyChordVisual.h"
-#include "KeyChordVisual.g.cpp"
-
-using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::Foundation;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    DependencyProperty KeyChordVisual::_KeyChordProperty{ nullptr };
-
-    KeyChordVisual::KeyChordVisual()
-    {
-        InitializeComponent();
-        _InitializeProperties();
-    }
-
-    void KeyChordVisual::_InitializeProperties()
-    {
-        if (!_KeyChordProperty)
-        {
-            _KeyChordProperty =
-                DependencyProperty::Register(
-                    L"KeyChord",
-                    xaml_typename<Control::KeyChord>(),
-                    xaml_typename<Editor::KeyChordVisual>(),
-                    PropertyMetadata{ nullptr, PropertyChangedCallback{ &KeyChordVisual::_OnKeyChordChanged } });
-        }
-    }
-
-    void KeyChordVisual::_OnKeyChordChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)
-    {
-        if (const auto control{ d.try_as<Editor::KeyChordVisual>() })
-        {
-            const auto controlImpl{ get_self<KeyChordVisual>(control) };
-            controlImpl->_UpdateKeyVisuals();
-        }
-    }
-
-    // Capitalizes the first character of the provided string.
-    // Examples: "enter" -> "Enter", "f1" -> "F1", "v" -> "V"
-    static winrt::hstring _formatMainKeyName(std::wstring_view part)
-    {
-        if (part.empty())
-        {
-            return {};
-        }
-
-        std::wstring buffer{ part };
-        buffer[0] = til::toupper_ascii(buffer[0]);
-        return winrt::hstring{ buffer };
-    }
-
-    void KeyChordVisual::_UpdateKeyVisuals()
-    {
-        auto panel{ KeysPanel() };
-        if (!panel)
-        {
-            return;
-        }
-        panel.Children().Clear();
-
-        const auto kc{ KeyChord() };
-        if (!kc)
-        {
-            return;
-        }
-
-        // Reuse the canonical serialization so the key naming stays in sync with the
-        // rest of the app. Then split on '+' (no key name in the table contains a literal
-        // '+'; VK_OEM_PLUS serializes as "plus") and render each part as its own visual.
-        const auto serialized{ Model::KeyChordSerialization::ToString(kc) };
-        if (serialized.empty())
-        {
-            return;
-        }
-
-        const std::wstring_view full{ serialized };
-        for (const auto part : til::split_iterator{ full, L'+' })
-        {
-            if (til::equals_insensitive_ascii(part, L"win"))
-            {
-                _AddGlyphKey();
-            }
-            else if (til::equals_insensitive_ascii(part, L"ctrl"))
-            {
-                _AddTextKey(L"Ctrl");
-            }
-            else if (til::equals_insensitive_ascii(part, L"alt"))
-            {
-                _AddTextKey(L"Alt");
-            }
-            else if (til::equals_insensitive_ascii(part, L"shift"))
-            {
-                _AddTextKey(L"Shift");
-            }
-            else
-            {
-                _AddTextKey(_formatMainKeyName(part));
-            }
-        }
-    }
-
-    void KeyChordVisual::_AddTextKey(const winrt::hstring& text)
-    {
-        const auto tmpl{ Resources().Lookup(box_value(L"KeyChordVisualTextKeyTemplate")).as<DataTemplate>() };
-        const auto border{ tmpl.LoadContent().as<Border>() };
-        if (const auto tb{ border.Child().try_as<TextBlock>() })
-        {
-            tb.Text(text);
-        }
-        KeysPanel().Children().Append(border);
-    }
-
-    void KeyChordVisual::_AddGlyphKey()
-    {
-        const auto tmpl{ Resources().Lookup(box_value(L"KeyChordVisualWindowsKeyTemplate")).as<DataTemplate>() };
-        const auto border{ tmpl.LoadContent().as<Border>() };
-
-        // Provide an accessible name for the glyph since it has no text fallback.
-        if (const auto path{ border.Child() })
-        {
-            Automation::AutomationProperties::SetName(path, L"Win");
-        }
-        KeysPanel().Children().Append(border);
-    }
-}

src/cascadia/TerminalSettingsEditor/KeyChordVisual.h

@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "KeyChordVisual.g.h"
-#include "Utils.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct KeyChordVisual : KeyChordVisualT<KeyChordVisual>
-    {
-    public:
-        KeyChordVisual();
-
-        DEPENDENCY_PROPERTY(Control::KeyChord, KeyChord);
-
-    private:
-        static void _InitializeProperties();
-        static void _OnKeyChordChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
-
-        void _UpdateKeyVisuals();
-        void _AddTextKey(const winrt::hstring& text);
-        void _AddGlyphKey();
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(KeyChordVisual);
-}

src/cascadia/TerminalSettingsEditor/KeyChordVisual.idl

@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    [default_interface] runtimeclass KeyChordVisual : Windows.UI.Xaml.Controls.UserControl
-    {
-        KeyChordVisual();
-
-        Microsoft.Terminal.Control.KeyChord KeyChord;
-        static Windows.UI.Xaml.DependencyProperty KeyChordProperty { get; };
-    }
-}

src/cascadia/TerminalSettingsEditor/KeyChordVisual.xaml

@@ -1,82 +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.KeyChordVisual"
-             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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             HorizontalAlignment="Right"
-             VerticalAlignment="Center"
-             IsTabStop="False"
-             mc:Ignorable="d">
-
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Default">
-                    <StaticResource x:Key="KeyChordVisualKeyBackground"
-                                    ResourceKey="AccentFillColorDefaultBrush" />
-                    <StaticResource x:Key="KeyChordVisualKeyForeground"
-                                    ResourceKey="TextOnAccentFillColorPrimaryBrush" />
-                    <StaticResource x:Key="KeyChordVisualKeyBorderBrush"
-                                    ResourceKey="AccentControlElevationBorderBrush" />
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="HighContrast">
-                    <StaticResource x:Key="KeyChordVisualKeyBackground"
-                                    ResourceKey="SystemColorButtonFaceColorBrush" />
-                    <StaticResource x:Key="KeyChordVisualKeyForeground"
-                                    ResourceKey="SystemColorButtonTextColorBrush" />
-                    <StaticResource x:Key="KeyChordVisualKeyBorderBrush"
-                                    ResourceKey="SystemColorButtonTextColorBrush" />
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-
-            <Style x:Key="KeyChordVisualKeyBorderStyle"
-                   TargetType="Border">
-                <Setter Property="MinWidth" Value="32" />
-                <Setter Property="MinHeight" Value="28" />
-                <Setter Property="Padding" Value="8,2,8,2" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="Background" Value="{ThemeResource KeyChordVisualKeyBackground}" />
-                <Setter Property="BorderBrush" Value="{ThemeResource KeyChordVisualKeyBorderBrush}" />
-                <Setter Property="BorderThickness" Value="1" />
-                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-            </Style>
-            <Style x:Key="KeyChordVisualKeyTextStyle"
-                   TargetType="TextBlock">
-                <Setter Property="FontSize" Value="13" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="TextAlignment" Value="Center" />
-                <Setter Property="Foreground" Value="{ThemeResource KeyChordVisualKeyForeground}" />
-            </Style>
-
-            <DataTemplate x:Key="KeyChordVisualTextKeyTemplate">
-                <Border Style="{StaticResource KeyChordVisualKeyBorderStyle}">
-                    <TextBlock Style="{StaticResource KeyChordVisualKeyTextStyle}" />
-                </Border>
-            </DataTemplate>
-
-            <DataTemplate x:Key="KeyChordVisualWindowsKeyTemplate">
-                <Border Style="{StaticResource KeyChordVisualKeyBorderStyle}">
-                    <Path Width="11"
-                          Height="11"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Data="M9 20H0V11H9V20ZM20 20H11V11H20V20ZM9 9H0V0H9V9ZM20 9H11V0H20V9Z"
-                          Fill="{ThemeResource KeyChordVisualKeyForeground}"
-                          Stretch="Uniform" />
-                </Border>
-            </DataTemplate>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
-    <StackPanel x:Name="KeysPanel"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                Orientation="Horizontal"
-                Spacing="2" />
-</UserControl>

src/cascadia/TerminalSettingsEditor/Launch.xaml

@@ -43,291 +43,279 @@
 
     <StackPanel>
         <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <!--  Section: Launch behavior  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Launch_Section_LaunchBehavior"
-                           Margin="0,0,0,4"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Default Profile  -->
-                <local:SettingContainer x:Name="DefaultProfile"
-                                        x:Uid="Globals_DefaultProfile">
-                    <ComboBox ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
-                              SelectedItem="{x:Bind ViewModel.CurrentDefaultProfile, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="SettingsModel:Profile">
-                                <Grid HorizontalAlignment="Stretch"
-                                      ColumnSpacing="8">
+            <!--  Default Profile  -->
+            <local:SettingContainer x:Name="DefaultProfile"
+                                    x:Uid="Globals_DefaultProfile">
+                <ComboBox ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
+                          SelectedItem="{x:Bind ViewModel.CurrentDefaultProfile, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="SettingsModel:Profile">
+                            <Grid HorizontalAlignment="Stretch"
+                                  ColumnSpacing="8">
 
-                                    <Grid.ColumnDefinitions>
-                                        <!--  icon  -->
-                                        <ColumnDefinition Width="16" />
-                                        <!--  profile name  -->
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <!--  icon  -->
+                                    <ColumnDefinition Width="16" />
+                                    <!--  profile name  -->
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
 
-                                    <IconSourceElement Grid.Column="0"
-                                                       Width="16"
-                                                       Height="16"
-                                                       IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon.Resolved), Mode=OneTime}" />
+                                <IconSourceElement Grid.Column="0"
+                                                   Width="16"
+                                                   Height="16"
+                                                   IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon.Resolved), Mode=OneTime}" />
 
-                                    <TextBlock Grid.Column="1"
-                                               Text="{x:Bind Name}" />
+                                <TextBlock Grid.Column="1"
+                                           Text="{x:Bind Name}" />
 
-                                </Grid>
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </local:SettingContainer>
+                            </Grid>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </local:SettingContainer>
 
-                <!--  First Window Behavior  -->
-                <local:SettingContainer x:Name="FirstWindowPreference"
-                                        x:Uid="Globals_FirstWindowPreference">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
+            <!--  Default Terminal  -->
+            <local:SettingContainer x:Name="DefaultTerminalDropdown"
+                                    x:Uid="Globals_DefaultTerminal"
+                                    x:Load="false">
+                <ComboBox x:Name="DefaultTerminal"
+                          ItemsSource="{x:Bind ViewModel.DefaultTerminals}"
+                          SelectedItem="{x:Bind ViewModel.CurrentDefaultTerminal, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="SettingsModel:DefaultTerminal">
+                            <Grid HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Stretch"
+                                  ColumnSpacing="8">
+
+                                <Grid.ColumnDefinitions>
+                                    <!--  icon  -->
+                                    <ColumnDefinition Width="auto" />
+                                    <!--  terminal name and author  -->
+                                    <ColumnDefinition Width="auto" />
+                                    <!--  version  -->
+                                    <ColumnDefinition Width="auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <Grid.RowDefinitions>
+                                    <!--  terminal name  -->
+                                    <RowDefinition Height="auto" />
+                                    <!--  author and version  -->
+                                    <RowDefinition Height="auto" />
+                                </Grid.RowDefinitions>
+
+                                <IconSourceElement Grid.Row="0"
+                                                   Grid.RowSpan="2"
+                                                   Grid.Column="0"
+                                                   Width="24"
+                                                   Height="24"
+                                                   VerticalAlignment="Center"
+                                                   IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon), Mode=OneTime}" />
+
+                                <TextBlock Grid.Row="0"
+                                           Grid.Column="1"
+                                           Grid.ColumnSpan="2"
+                                           VerticalAlignment="Center"
+                                           AutomationProperties.AccessibilityView="Raw"
+                                           Text="{x:Bind Name}" />
+
+                                <TextBlock Grid.Row="1"
+                                           Grid.Column="1"
+                                           AutomationProperties.AccessibilityView="Raw"
+                                           Style="{ThemeResource SecondaryTextBlockStyle}"
+                                           Text="{x:Bind Author}"
+                                           Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Author)}" />
+
+                                <TextBlock Grid.Row="1"
+                                           Grid.Column="2"
+                                           AutomationProperties.AccessibilityView="Raw"
+                                           Style="{ThemeResource SecondaryTextBlockStyle}"
+                                           Text="{x:Bind Version}"
+                                           Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Version)}" />
+
+                            </Grid>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </local:SettingContainer>
+
+            <!--  Language  -->
+            <local:SettingContainer x:Name="Language"
+                                    x:Uid="Globals_Language">
+                <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="x:String">
+                            <TextBlock Text="{x:Bind local:LaunchViewModel.LanguageDisplayConverter((x:String))}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </local:SettingContainer>
+
+            <!--  Language  -->
+            <local:SettingContainer x:Name="DefaultInputScope"
+                                    x:Uid="Globals_DefaultInputScope">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.DefaultInputScopeList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentDefaultInputScope, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
+
+            <!--  Start on User Login  -->
+            <local:SettingContainer x:Name="StartOnUserLogin"
+                                    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}"
+                              IsOn="{x:Bind ViewModel.StartOnUserLogin, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+
+            <!--  First Window Behavior  -->
+            <local:SettingContainer x:Name="FirstWindowPreference"
+                                    x:Uid="Globals_FirstWindowPreference">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.FirstWindowPreferenceList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentFirstWindowPreference, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
+
+            <!--  Windowing Behavior  -->
+            <local:SettingContainer x:Name="WindowingBehavior"
+                                    x:Uid="Globals_WindowingBehavior">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.WindowingBehaviorList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentWindowingBehavior, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
+
+            <!--  Launch Size  -->
+            <local:SettingContainer x:Name="LaunchSize"
+                                    x:Uid="Globals_LaunchSize"
+                                    CurrentValue="{x:Bind ViewModel.LaunchSizeCurrentValue, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <Grid ColumnSpacing="12"
+                      RowSpacing="8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock x:Uid="Globals_InitialCols"
+                               Grid.Row="0"
+                               Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Style="{StaticResource SettingsPageItemHeaderStyle}" />
+                    <muxc:NumberBox x:Uid="Globals_InitialColsBox"
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    VerticalAlignment="Center"
+                                    Maximum="999"
+                                    Minimum="1"
+                                    Style="{StaticResource LaunchSizeNumberBoxStyle}"
+                                    Value="{x:Bind ViewModel.InitialCols, Mode=TwoWay}" />
+                    <TextBlock x:Uid="Globals_InitialRows"
+                               Grid.Row="1"
+                               Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Style="{StaticResource SettingsPageItemHeaderStyle}" />
+                    <muxc:NumberBox x:Uid="Globals_InitialRowsBox"
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    VerticalAlignment="Center"
+                                    Maximum="999"
+                                    Minimum="1"
+                                    Style="{StaticResource LaunchSizeNumberBoxStyle}"
+                                    Value="{x:Bind ViewModel.InitialRows, Mode=TwoWay}" />
+                </Grid>
+            </local:SettingContainer>
+
+            <!--  Launch Parameters  -->
+            <local:SettingContainer x:Name="LaunchParameters"
+                                    x:Uid="Globals_LaunchParameters"
+                                    CurrentValue="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <Grid RowSpacing="8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock x:Uid="Globals_LaunchModeSetting"
+                               Grid.Row="0"
+                               Grid.Column="0"
+                               VerticalAlignment="Center" />
+                    <ComboBox x:Name="LaunchModeComboBox"
+                              Grid.Row="0"
+                              Grid.Column="1"
+                              MinWidth="240"
+                              AutomationProperties.AccessibilityView="Content"
                               ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.FirstWindowPreferenceList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentFirstWindowPreference, Mode=TwoWay}"
+                              ItemsSource="{x:Bind ViewModel.LaunchModeList}"
+                              SelectedItem="{x:Bind ViewModel.CurrentLaunchMode, Mode=TwoWay}"
                               Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-
-                <!--  Windowing Behavior  -->
-                <local:SettingContainer x:Name="WindowingBehavior"
-                                        x:Uid="Globals_WindowingBehavior">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.WindowingBehaviorList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentWindowingBehavior, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-
-                <!--  Start on User Login  -->
-                <local:SettingContainer x:Name="StartOnUserLogin"
-                                        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}"
-                                  IsOn="{x:Bind ViewModel.StartOnUserLogin, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
-
-                <!--  Launch Parameters  -->
-                <local:SettingContainer x:Name="LaunchParameters"
-                                        x:Uid="Globals_LaunchParameters"
-                                        CurrentValue="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <Grid RowSpacing="8">
+                    <TextBlock x:Uid="Globals_LaunchPosition"
+                               Grid.Row="1"
+                               Grid.Column="0"
+                               VerticalAlignment="Center" />
+                    <Grid Grid.Row="1"
+                          Grid.Column="1"
+                          ColumnSpacing="4">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
-                        <TextBlock x:Uid="Globals_LaunchModeSetting"
-                                   Grid.Row="0"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center" />
-                        <ComboBox x:Name="LaunchModeComboBox"
-                                  Grid.Row="0"
-                                  Grid.Column="1"
-                                  MinWidth="240"
-                                  AutomationProperties.AccessibilityView="Content"
-                                  ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                                  ItemsSource="{x:Bind ViewModel.LaunchModeList}"
-                                  SelectedItem="{x:Bind ViewModel.CurrentLaunchMode, Mode=TwoWay}"
-                                  Style="{StaticResource ComboBoxSettingStyle}" />
-                        <TextBlock x:Uid="Globals_LaunchPosition"
-                                   Grid.Row="1"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center" />
-                        <Grid Grid.Row="1"
-                              Grid.Column="1"
-                              ColumnSpacing="4">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <!--  Match the width of these NumberBoxes to the Width of the LaunchModeComboBox above minus the Grid's ColumnSpacing  -->
-                            <muxc:NumberBox x:Name="PosXBox"
-                                            x:Uid="Globals_InitialPosXBox"
-                                            Grid.Row="0"
-                                            Grid.Column="0"
-                                            Width="118"
-                                            IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
-                                            Style="{StaticResource LaunchPositionNumberBoxStyle}"
-                                            Value="{x:Bind ViewModel.InitialPosX, Mode=TwoWay}" />
-                            <muxc:NumberBox x:Name="PosYBox"
-                                            x:Uid="Globals_InitialPosYBox"
-                                            Grid.Row="0"
-                                            Grid.Column="1"
-                                            Width="118"
-                                            IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
-                                            Style="{StaticResource LaunchPositionNumberBoxStyle}"
-                                            Value="{x:Bind ViewModel.InitialPosY, Mode=TwoWay}" />
-                            <CheckBox x:Name="UseDefaultLaunchPositionCheckbox"
-                                      x:Uid="Globals_DefaultLaunchPositionCheckbox"
-                                      Grid.Row="1"
-                                      Grid.Column="0"
-                                      Grid.ColumnSpan="2"
-                                      IsChecked="{x:Bind ViewModel.UseDefaultLaunchPosition, Mode=TwoWay}" />
-                        </Grid>
-                        <TextBlock x:Uid="Globals_CenterOnLaunch"
-                                   Grid.Row="2"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center" />
-                        <ToggleSwitch x:Name="CenterOnLaunchToggle"
-                                      Grid.Row="2"
-                                      Grid.Column="1"
-                                      IsOn="{x:Bind ViewModel.CenterOnLaunch, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </Grid>
-                </local:SettingContainer>
-
-                <!--  Launch Size  -->
-                <local:SettingContainer x:Name="LaunchSize"
-                                        x:Uid="Globals_LaunchSize"
-                                        CurrentValue="{x:Bind ViewModel.LaunchSizeCurrentValue, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <Grid ColumnSpacing="12"
-                          RowSpacing="8">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <TextBlock x:Uid="Globals_InitialCols"
-                                   Grid.Row="0"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center"
-                                   Style="{StaticResource SettingsPageItemHeaderStyle}" />
-                        <muxc:NumberBox x:Uid="Globals_InitialColsBox"
+                        <!--  Match the width of these NumberBoxes to the Width of the LaunchModeComboBox above minus the Grid's ColumnSpacing  -->
+                        <muxc:NumberBox x:Name="PosXBox"
+                                        x:Uid="Globals_InitialPosXBox"
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        Width="118"
+                                        IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
+                                        Style="{StaticResource LaunchPositionNumberBoxStyle}"
+                                        Value="{x:Bind ViewModel.InitialPosX, Mode=TwoWay}" />
+                        <muxc:NumberBox x:Name="PosYBox"
+                                        x:Uid="Globals_InitialPosYBox"
                                         Grid.Row="0"
                                         Grid.Column="1"
-                                        VerticalAlignment="Center"
-                                        Maximum="999"
-                                        Minimum="1"
-                                        Style="{StaticResource LaunchSizeNumberBoxStyle}"
-                                        Value="{x:Bind ViewModel.InitialCols, Mode=TwoWay}" />
-                        <TextBlock x:Uid="Globals_InitialRows"
-                                   Grid.Row="1"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center"
-                                   Style="{StaticResource SettingsPageItemHeaderStyle}" />
-                        <muxc:NumberBox x:Uid="Globals_InitialRowsBox"
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        VerticalAlignment="Center"
-                                        Maximum="999"
-                                        Minimum="1"
-                                        Style="{StaticResource LaunchSizeNumberBoxStyle}"
-                                        Value="{x:Bind ViewModel.InitialRows, Mode=TwoWay}" />
+                                        Width="118"
+                                        IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
+                                        Style="{StaticResource LaunchPositionNumberBoxStyle}"
+                                        Value="{x:Bind ViewModel.InitialPosY, Mode=TwoWay}" />
+                        <CheckBox x:Name="UseDefaultLaunchPositionCheckbox"
+                                  x:Uid="Globals_DefaultLaunchPositionCheckbox"
+                                  Grid.Row="1"
+                                  Grid.Column="0"
+                                  Grid.ColumnSpan="2"
+                                  IsChecked="{x:Bind ViewModel.UseDefaultLaunchPosition, Mode=TwoWay}" />
                     </Grid>
-                </local:SettingContainer>
-            </StackPanel>
-
-            <!--  Section: System & input defaults  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Launch_Section_SystemInputDefaults"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Default Terminal  -->
-                <local:SettingContainer x:Name="DefaultTerminalDropdown"
-                                        x:Uid="Globals_DefaultTerminal"
-                                        x:Load="false">
-                    <ComboBox x:Name="DefaultTerminal"
-                              ItemsSource="{x:Bind ViewModel.DefaultTerminals}"
-                              SelectedItem="{x:Bind ViewModel.CurrentDefaultTerminal, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="SettingsModel:DefaultTerminal">
-                                <Grid HorizontalAlignment="Stretch"
-                                      VerticalAlignment="Stretch"
-                                      ColumnSpacing="8">
-
-                                    <Grid.ColumnDefinitions>
-                                        <!--  icon  -->
-                                        <ColumnDefinition Width="auto" />
-                                        <!--  terminal name and author  -->
-                                        <ColumnDefinition Width="auto" />
-                                        <!--  version  -->
-                                        <ColumnDefinition Width="auto" />
-                                    </Grid.ColumnDefinitions>
-
-                                    <Grid.RowDefinitions>
-                                        <!--  terminal name  -->
-                                        <RowDefinition Height="auto" />
-                                        <!--  author and version  -->
-                                        <RowDefinition Height="auto" />
-                                    </Grid.RowDefinitions>
-
-                                    <IconSourceElement Grid.Row="0"
-                                                       Grid.RowSpan="2"
-                                                       Grid.Column="0"
-                                                       Width="24"
-                                                       Height="24"
-                                                       VerticalAlignment="Center"
-                                                       IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon), Mode=OneTime}" />
-
-                                    <TextBlock Grid.Row="0"
-                                               Grid.Column="1"
-                                               Grid.ColumnSpan="2"
-                                               VerticalAlignment="Center"
-                                               AutomationProperties.AccessibilityView="Raw"
-                                               Text="{x:Bind Name}" />
-
-                                    <TextBlock Grid.Row="1"
-                                               Grid.Column="1"
-                                               AutomationProperties.AccessibilityView="Raw"
-                                               Style="{ThemeResource SecondaryTextBlockStyle}"
-                                               Text="{x:Bind Author}"
-                                               FontSize="12"
-                                               Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Author)}" />
-
-                                    <TextBlock Grid.Row="1"
-                                               Grid.Column="2"  FontSize="12"
-                                               AutomationProperties.AccessibilityView="Raw"
-                                               Style="{ThemeResource SecondaryTextBlockStyle}"
-                                               Text="{x:Bind Version}"
-                                               Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Version)}" />
-
-                                </Grid>
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </local:SettingContainer>
-
-                <!--  Language  -->
-                <local:SettingContainer x:Name="Language"
-                                        x:Uid="Globals_Language">
-                    <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="x:String">
-                                <TextBlock Text="{x:Bind local:LaunchViewModel.LanguageDisplayConverter((x:String))}" />
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </local:SettingContainer>
-
-                <!--  Default IME Input Mode  -->
-                <local:SettingContainer x:Name="DefaultInputScope"
-                                        x:Uid="Globals_DefaultInputScope">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.DefaultInputScopeList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentDefaultInputScope, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+                    <TextBlock x:Uid="Globals_CenterOnLaunch"
+                               Grid.Row="2"
+                               Grid.Column="0"
+                               VerticalAlignment="Center" />
+                    <ToggleSwitch x:Name="CenterOnLaunchToggle"
+                                  Grid.Row="2"
+                                  Grid.Column="1"
+                                  IsOn="{x:Bind ViewModel.CenterOnLaunch, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </Grid>
+            </local:SettingContainer>
         </StackPanel>
     </StackPanel>
 </Page>

src/cascadia/TerminalSettingsEditor/MainPage.cpp

@@ -7,6 +7,8 @@
 #include "Launch.h"
 #include "Interaction.h"
 #include "Compatibility.h"
+#include "Rendering.h"
+#include "RenderingViewModel.h"
 #include "Extensions.h"
 #include "Actions.h"
 #include "ProfileViewModel.h"
@@ -15,7 +17,6 @@
 #include "ColorSchemes.h"
 #include "EditColorScheme.h"
 #include "AddProfile.h"
-#include "Profiles.h"
 #include "InteractionViewModel.h"
 #include "LaunchViewModel.h"
 #include "NewTabMenuViewModel.h"
@@ -27,8 +28,6 @@
 #include <dwmapi.h>
 #include <fmt/compile.h>
 
-#include <winrt/Windows.UI.Xaml.Media.Animation.h>
-
 namespace winrt
 {
     namespace MUX = Microsoft::UI::Xaml;
@@ -41,7 +40,6 @@ using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::System;
 using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::UI::Xaml::Media::Animation;
 using namespace winrt::Windows::Foundation::Collections;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
@@ -104,7 +102,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     MainPage::MainPage(const CascadiaSettings& settings) :
         _settingsSource{ settings },
         _settingsClone{ settings.Copy() },
-        _profilesPageVM{ winrt::make<ProfilesPageViewModel>() }
+        _profileVMs{ single_threaded_observable_vector<Editor::ProfileViewModel>() }
     {
         InitializeComponent();
         _UpdateBackgroundForMica();
@@ -118,17 +116,14 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 {
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(currentFolder), currentFolder.Name(), BreadcrumbSubPage::NewTabMenu_Folder));
                     SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
-                    _navDirection = NavDirection::Forward;
                 }
                 else
                 {
                     // If we don't have a current folder, we're at the root of the NTM
                     _breadcrumbs.Clear();
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(newTabMenuTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None));
-                    _navDirection = NavDirection::Back;
                 }
-                const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
-                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this));
             }
         });
 
@@ -150,24 +145,19 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 {
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(currentExtensionPackage), currentExtensionPackage.DisplayName(), BreadcrumbSubPage::Extensions_Extension));
                     SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
-                    _navDirection = NavDirection::Forward;
                 }
                 else
                 {
                     // If we don't have a current extension package, we're at the root of the Extensions page
                     _breadcrumbs.Clear();
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(extensionsTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None));
-                    _navDirection = NavDirection::Back;
                 }
-                const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
-                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this));
             }
         });
 
-        _SetupProfilesPageEventHandling();
-
         // Make sure to initialize the profiles _after_ we have initialized the color schemes page VM, because we pass
-        // that VM into the appearance VMs within the profiles. The Profiles VM owns the per-profile list itself.
+        // that VM into the appearance VMs within the profiles
         _InitializeProfilesList();
 
         // Apply icons and tooltips (GH#19688, long names may be truncated) to static nav items
@@ -215,24 +205,28 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         _UpdateBackgroundForMica();
 
-        // Capture data about where we are right now, so we can re-navigate to the same
-        // place after we rebuild all the settings.
-        IInspectable destination{ nullptr };
-        auto subPage = BreadcrumbSubPage::None;
-        hstring parentNavTag{};
-        if (const auto size = _breadcrumbs.Size(); size > 0)
+        // Deduce information about the currently selected item
+        IInspectable lastBreadcrumb;
+        const auto size = _breadcrumbs.Size();
+        if (size > 0)
         {
-            const auto& crumb = _breadcrumbs.GetAt(size - 1).as<Breadcrumb>();
-            destination = crumb->Tag();
-            subPage = crumb->SubPage();
-            // If we were inside the Profiles section, remember that so we can restore
-            // the "Profiles ›" prefix on the rebuilt navigation.
-            if (_RootCrumbIsProfilesBreadcrumb())
-            {
-                parentNavTag = hstring{ profilesTag };
-            }
+            lastBreadcrumb = _breadcrumbs.GetAt(size - 1);
         }
 
+        // Collect only the first items out of the menu item source, the static
+        // ones that we don't want to regenerate.
+        //
+        // By manipulating a MenuItemsSource this way, rather than manipulating the
+        // MenuItems directly, we avoid a crash in WinUI.
+        //
+        // By making the vector only _originalNumItems big to start, GetMany
+        // will only fill that number of elements out of the current source.
+        std::vector<IInspectable> menuItemsSTL(_originalNumItems, nullptr);
+        _menuItemSource.GetMany(0, menuItemsSTL);
+        // now, just stick them back in.
+        _menuItemSource.ReplaceAll(menuItemsSTL);
+
+        // Repopulate profile-related menu items
         _InitializeProfilesList();
 
         // Update the Nav State with the new version of the settings
@@ -242,43 +236,64 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _extensionsVM.UpdateSettings(_settingsClone, _colorSchemesPageVM);
         _profileDefaultsVM = nullptr; // Lazy-loaded upon navigation
 
-        if (const auto& profileTag{ destination.try_as<Editor::ProfileViewModel>() })
+        // Now that the menuItems are repopulated,
+        // refresh the current page using the breadcrumb data we collected before the refresh
+        if (const auto& crumb{ lastBreadcrumb.try_as<Breadcrumb>() }; crumb && crumb->Tag())
         {
-            // Find the new profile VM by guid
-            if (const auto newProfileVM = _FindProfileViewModelByGuid(profileTag.OriginalProfileGuid()))
+            bool foundNavigationParams = false;
+            auto destination = crumb->Tag();
+            auto subPage = crumb->SubPage();
+            for (const auto& item : _menuItemSource)
             {
-                destination = newProfileVM;
-            }
-            else
-            {
-                // Fall back to the Profiles landing page
-                destination = box_value(profilesTag);
-                subPage = BreadcrumbSubPage::None;
-                parentNavTag = {};
-            }
-        }
-        else if (destination.try_as<Editor::FolderEntryViewModel>())
-        {
-            destination = box_value(newTabMenuTag);
-            subPage = BreadcrumbSubPage::NewTabMenu_Folder;
-        }
-        else if (destination.try_as<Editor::ExtensionPackageViewModel>())
-        {
-            destination = box_value(extensionsTag);
-            subPage = BreadcrumbSubPage::Extensions_Extension;
-        }
-        else if (!destination.try_as<hstring>())
-        {
-            // Couldn't find a meaningful previous page. Fall back to the first menu item.
-            if (_menuItemSource && _menuItemSource.Size() > 0)
-            {
-                destination = _menuItemSource.GetAt(0).as<MUX::Controls::NavigationViewItem>().Tag();
-                subPage = BreadcrumbSubPage::None;
-                parentNavTag = {};
+                const auto menuItem = item.try_as<MUX::Controls::NavigationViewItem>();
+                if (!menuItem)
+                {
+                    continue;
+                }
+
+                const auto& tag = menuItem.Tag();
+                if (const auto& stringTag{ tag.try_as<hstring>() })
+                {
+                    if (const auto& destString{ destination.try_as<hstring>() })
+                    {
+                        foundNavigationParams = (*stringTag == *destString);
+                    }
+                    else if (destination.try_as<Editor::FolderEntryViewModel>() && *stringTag == newTabMenuTag)
+                    {
+                        foundNavigationParams = true;
+                        subPage = BreadcrumbSubPage::NewTabMenu_Folder;
+                    }
+                    else if (destination.try_as<Editor::ExtensionPackageViewModel>() && *stringTag == extensionsTag)
+                    {
+                        foundNavigationParams = true;
+                        subPage = BreadcrumbSubPage::Extensions_Extension;
+                    }
+                }
+                else if (const auto& profileTag{ tag.try_as<ProfileViewModel>() })
+                {
+                    const auto destProfile = destination.try_as<ProfileViewModel>();
+                    if (destProfile && profileTag->OriginalProfileGuid() == destProfile->OriginalProfileGuid())
+                    {
+                        // Use the new profile VM from the refreshed menu items
+                        destination = tag;
+                        foundNavigationParams = true;
+                    }
+                }
+
+                if (foundNavigationParams)
+                {
+                    // found the one that was selected before the refresh
+                    _Navigate(destination, subPage);
+                    return;
+                }
             }
         }
 
-        _Navigate(destination, subPage, {}, parentNavTag);
+        // Couldn't find the selected item, fall back to first menu item
+        // This happens when the selected item was a profile which doesn't exist in the new configuration
+        // We can use menuItemsSTL here because the only things they miss are profile entries.
+        const auto& firstItem{ _menuItemSource.GetAt(0).as<MUX::Controls::NavigationViewItem>() };
+        _Navigate(firstItem.Tag(), BreadcrumbSubPage::None);
 
         _UpdateSearchIndex();
     }
@@ -310,6 +325,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     //                can be empty to indicate that we should create a fresh profile
     void MainPage::_AddProfileHandler(winrt::guid profileGuid)
     {
+        uint32_t insertIndex;
+        auto selectedItem{ SettingsNav().SelectedItem() };
+        if (_menuItemSource)
+        {
+            _menuItemSource.IndexOf(selectedItem, insertIndex);
+        }
         if (profileGuid != winrt::guid{})
         {
             // if we were given a non-empty guid, we want to duplicate the corresponding profile
@@ -317,13 +338,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             if (profile)
             {
                 const auto duplicated = _settingsClone.DuplicateProfile(profile);
-                _CreateAndNavigateToNewProfile(duplicated);
+                _CreateAndNavigateToNewProfile(insertIndex, duplicated);
             }
         }
         else
         {
             // we were given an empty guid, create a new profile
-            _CreateAndNavigateToNewProfile(nullptr);
+            _CreateAndNavigateToNewProfile(insertIndex, nullptr);
         }
     }
 
@@ -425,18 +446,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 const auto currentScheme = _colorSchemesPageVM.CurrentScheme();
                 if (_colorSchemesPageVM.CurrentPage() == ColorSchemesSubPage::EditColorScheme && currentScheme)
                 {
-                    _navDirection = NavDirection::Forward;
-                    const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
-                    contentFrame().Navigate(xaml_typename<Editor::EditColorScheme>(), winrt::make<NavigateToPageArgs>(currentScheme, *this), _MakeTransitionInfo());
+                    contentFrame().Navigate(xaml_typename<Editor::EditColorScheme>(), winrt::make<NavigateToPageArgs>(currentScheme, *this));
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(boxedTag, currentScheme.Name(), BreadcrumbSubPage::ColorSchemes_Edit));
                 }
                 else if (_colorSchemesPageVM.CurrentPage() == ColorSchemesSubPage::Base)
                 {
-                    _navDirection = NavDirection::Back;
-                    const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
-                    // Preserve the current root context so that "Profiles > Color schemes" still shows the Profiles prefix.
-                    const hstring inheritedParentNavTag = _RootCrumbIsProfilesBreadcrumb() ? hstring{ profilesTag } : hstring{};
-                    _Navigate(boxedTag, BreadcrumbSubPage::None, {}, inheritedParentNavTag);
+                    _Navigate(boxedTag, BreadcrumbSubPage::None);
                 }
             }
             else if (settingName == L"CurrentSchemeName")
@@ -456,15 +471,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 const auto boxedTag = box_value(actionsTag);
                 if (_actionsVM.CurrentPage() == ActionsSubPage::Edit)
                 {
-                    _navDirection = NavDirection::Forward;
-                    const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
-                    contentFrame().Navigate(xaml_typename<Editor::EditAction>(), winrt::make<NavigateToPageArgs>(_actionsVM.CurrentCommand(), *this), _MakeTransitionInfo());
+                    contentFrame().Navigate(xaml_typename<Editor::EditAction>(), winrt::make<NavigateToPageArgs>(_actionsVM.CurrentCommand(), *this));
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(boxedTag, RS_(L"Nav_EditAction/Content"), BreadcrumbSubPage::Actions_Edit));
                 }
                 else if (_actionsVM.CurrentPage() == ActionsSubPage::Base)
                 {
-                    _navDirection = NavDirection::Back;
-                    const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
                     _Navigate(boxedTag, BreadcrumbSubPage::None);
                 }
             }
@@ -475,21 +486,21 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         if (page == ProfileSubPage::Base)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus), _MakeTransitionInfo());
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
         }
         else if (page == ProfileSubPage::Appearance)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Appearance>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus), _MakeTransitionInfo());
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Appearance>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
             _breadcrumbs.Append(winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Appearance/Header"), BreadcrumbSubPage::Profile_Appearance));
         }
         else if (page == ProfileSubPage::Terminal)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Terminal>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus), _MakeTransitionInfo());
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Terminal>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
             _breadcrumbs.Append(winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Terminal/Header"), BreadcrumbSubPage::Profile_Terminal));
         }
         else if (page == ProfileSubPage::Advanced)
         {
-            contentFrame().Navigate(xaml_typename<Editor::Profiles_Advanced>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus), _MakeTransitionInfo());
+            contentFrame().Navigate(xaml_typename<Editor::Profiles_Advanced>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
             _breadcrumbs.Append(winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Advanced/Header"), BreadcrumbSubPage::Profile_Advanced));
         }
         SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
@@ -510,15 +521,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 if (currentPage == ProfileSubPage::Base)
                 {
                     _breadcrumbs.Clear();
-                    _AppendProfilesRootCrumb();
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(breadcrumbTag, breadcrumbText, BreadcrumbSubPage::None));
-                    _navDirection = NavDirection::Back;
                 }
-                else
-                {
-                    _navDirection = NavDirection::Forward;
-                }
-                const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
                 _NavigateToProfileSubPage(profile, currentPage, breadcrumbTag, {});
             }
         });
@@ -531,10 +535,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     //         a view model object (i.e. ProfileViewModel, ColorSchemeViewModel, etc.) for dynamic pages
     // - subPage: the sub page to navigate to, used for pages that have multiple sub pages (i.e. Profile > Appearance/Terminal/Advanced)
     // - elementToFocus: the name of the element to focus on the target page
-    // - parentNavTag: optional nav tag of the parent page when this navigation is invoked from inside another
-    //         landing page. Used by the Profiles landing page to keep itself selected and to prepend a
-    //         "Profiles" breadcrumb when entering Color schemes / a profile / Defaults / Add Profile from there.
-    void MainPage::_Navigate(const IInspectable& vm, BreadcrumbSubPage subPage, hstring elementToFocus, const hstring& parentNavTag)
+    void MainPage::_Navigate(const IInspectable& vm, BreadcrumbSubPage subPage, hstring elementToFocus)
     {
         _PreNavigateHelper();
 
@@ -545,17 +546,22 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             selectedNavTag = *clickedItemTag;
             if (*clickedItemTag == launchTag)
             {
-                contentFrame().Navigate(xaml_typename<Editor::Launch>(), winrt::make<NavigateToPageArgs>(winrt::make<LaunchViewModel>(_settingsClone), *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::Launch>(), winrt::make<NavigateToPageArgs>(winrt::make<LaunchViewModel>(_settingsClone), *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Launch/Content"), BreadcrumbSubPage::None));
             }
             else if (*clickedItemTag == interactionTag)
             {
-                contentFrame().Navigate(xaml_typename<Editor::Interaction>(), winrt::make<NavigateToPageArgs>(winrt::make<InteractionViewModel>(_settingsClone.GlobalSettings()), *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::Interaction>(), winrt::make<NavigateToPageArgs>(winrt::make<InteractionViewModel>(_settingsClone.GlobalSettings()), *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Interaction/Content"), BreadcrumbSubPage::None));
             }
+            else if (*clickedItemTag == renderingTag)
+            {
+                contentFrame().Navigate(xaml_typename<Editor::Rendering>(), winrt::make<NavigateToPageArgs>(winrt::make<RenderingViewModel>(_settingsClone), *this, elementToFocus));
+                _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Rendering/Content"), BreadcrumbSubPage::None));
+            }
             else if (*clickedItemTag == compatibilityTag)
             {
-                contentFrame().Navigate(xaml_typename<Editor::Compatibility>(), winrt::make<NavigateToPageArgs>(winrt::make<CompatibilityViewModel>(_settingsClone), *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::Compatibility>(), winrt::make<NavigateToPageArgs>(winrt::make<CompatibilityViewModel>(_settingsClone), *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Compatibility/Content"), BreadcrumbSubPage::None));
             }
             else if (*clickedItemTag == actionsTag)
@@ -569,7 +575,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     // Navigate directly to EditAction instead of relying on PropertyChanged,
                     // which won't fire if CurrentPage is already Edit
                     _actionsVM.CurrentPage(ActionsSubPage::Edit);
-                    contentFrame().Navigate(xaml_typename<Editor::EditAction>(), winrt::make<NavigateToPageArgs>(_actionsVM.CurrentCommand(), *this, elementToFocus), _MakeTransitionInfo());
+                    contentFrame().Navigate(xaml_typename<Editor::EditAction>(), winrt::make<NavigateToPageArgs>(_actionsVM.CurrentCommand(), *this, elementToFocus));
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_EditAction/Content"), BreadcrumbSubPage::Actions_Edit));
 
                     // Re-register the handler for future user-driven changes
@@ -577,7 +583,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 }
                 else
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<NavigateToPageArgs>(_actionsVM, *this, elementToFocus), _MakeTransitionInfo());
+                    contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<NavigateToPageArgs>(_actionsVM, *this, elementToFocus));
                     _actionsVM.CurrentPage(ActionsSubPage::Base);
                 }
             }
@@ -592,7 +598,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 else
                 {
                     // Navigate to the NewTabMenu page
-                    contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this, elementToFocus), _MakeTransitionInfo());
+                    contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this, elementToFocus));
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None));
                 }
             }
@@ -606,19 +612,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 }
                 else
                 {
-                    contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this, elementToFocus), _MakeTransitionInfo());
+                    contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this, elementToFocus));
                     _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None));
                 }
             }
-            else if (*clickedItemTag == profilesTag)
-            {
-                contentFrame().Navigate(xaml_typename<Editor::Profiles>(), winrt::make<NavigateToPageArgs>(_profilesPageVM, *this, elementToFocus));
-                _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Profiles/Content"), BreadcrumbSubPage::None));
-            }
             else if (*clickedItemTag == globalProfileTag)
             {
-                _AppendProfilesRootCrumb();
-
                 // lazy load profile defaults VM
                 if (!_profileDefaultsVM)
                 {
@@ -637,22 +636,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
                 // Register handler for future user-driven sub-page changes
                 _SetupProfileEventHandling(_profileDefaultsVM);
-
-                // Keep the Profiles nav item selected.
-                selectedNavTag = profilesTag;
             }
             else if (*clickedItemTag == colorSchemesTag)
             {
-                // Color Schemes page is accessible from root level and within Profiles,
-                // so we need to prepend the root crumb in the second case.
-                if (parentNavTag == profilesTag)
-                {
-                    _AppendProfilesRootCrumb();
-                    selectedNavTag = profilesTag;
-                }
-
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_ColorSchemes/Content"), BreadcrumbSubPage::None));
-                contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToPageArgs>(_colorSchemesPageVM, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToPageArgs>(_colorSchemesPageVM, *this, elementToFocus));
 
                 if (subPage == BreadcrumbSubPage::ColorSchemes_Edit)
                 {
@@ -661,72 +649,57 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             }
             else if (*clickedItemTag == globalAppearanceTag)
             {
-                contentFrame().Navigate(xaml_typename<Editor::GlobalAppearance>(), winrt::make<NavigateToPageArgs>(winrt::make<GlobalAppearanceViewModel>(_settingsClone.GlobalSettings()), *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::GlobalAppearance>(), winrt::make<NavigateToPageArgs>(winrt::make<GlobalAppearanceViewModel>(_settingsClone.GlobalSettings()), *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_Appearance/Content"), BreadcrumbSubPage::None));
             }
             else if (*clickedItemTag == addProfileTag)
             {
-                _AppendProfilesRootCrumb();
-
                 auto addProfileState{ winrt::make<AddProfilePageNavigationState>(_settingsClone) };
                 addProfileState.AddNew({ get_weak(), &MainPage::_AddProfileHandler });
-                contentFrame().Navigate(xaml_typename<Editor::AddProfile>(), winrt::make<NavigateToPageArgs>(addProfileState, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::AddProfile>(), winrt::make<NavigateToPageArgs>(addProfileState, *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, RS_(L"Nav_AddNewProfile/Content"), BreadcrumbSubPage::None));
-
-                // Keep the Profiles nav item selected.
-                selectedNavTag = profilesTag;
             }
         }
         else if (const auto& profile = vm.try_as<Editor::ProfileViewModel>())
         {
-            _AppendProfilesRootCrumb();
-            selectedNavTag = profilesTag;
-
             if (profile.Orphaned())
             {
-                contentFrame().Navigate(xaml_typename<Editor::Profiles_Base_Orphaned>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::Profiles_Base_Orphaned>(), winrt::make<NavigateToPageArgs>(profile, *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, profile.Name(), BreadcrumbSubPage::None));
                 profile.CurrentPage(ProfileSubPage::Base);
                 _SetupProfileEventHandling(profile);
+                return;
             }
-            else
+
+            // Set CurrentPage before registering the handler to avoid double-navigation
+            const ProfileSubPage profileSubPage = ProfileSubPageFromBreadcrumb(subPage);
+            profile.CurrentPage(profileSubPage);
+
+            // Navigate directly to the correct sub-page
+            _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, profile.Name(), BreadcrumbSubPage::None));
+            _NavigateToProfileSubPage(profile, profileSubPage, vm, elementToFocus);
+
+            if (const auto profileNavItem = _FindProfileNavItem(profile.OriginalProfileGuid()))
             {
-                // Set CurrentPage before registering the handler to avoid double-navigation
-                const ProfileSubPage profileSubPage = ProfileSubPageFromBreadcrumb(subPage);
-                profile.CurrentPage(profileSubPage);
-
-                // Navigate directly to the correct sub-page
-                _breadcrumbs.Append(winrt::make<Breadcrumb>(vm, profile.Name(), BreadcrumbSubPage::None));
-                _NavigateToProfileSubPage(profile, profileSubPage, vm, elementToFocus);
-
-                // Register handler for future user-driven sub-page changes
-                _SetupProfileEventHandling(profile);
+                SettingsNav().SelectedItem(profileNavItem);
             }
+
+            // Register handler for future user-driven sub-page changes
+            _SetupProfileEventHandling(profile);
         }
         else if (const auto& colorSchemeVM = vm.try_as<Editor::ColorSchemeViewModel>())
         {
+            selectedNavTag = colorSchemesTag;
             const auto boxedColorSchemesTag = box_value(colorSchemesTag);
 
             // Suppress the handler to avoid double-navigation
             _colorSchemesPageViewModelChangedRevoker.revoke();
 
-            // Color Schemes page is accessible from within Profiles and root level,
-            // so we need to prepend the root crumb in the first case.
-            if (parentNavTag == profilesTag)
-            {
-                _AppendProfilesRootCrumb();
-                selectedNavTag = profilesTag;
-            }
-            else
-            {
-                selectedNavTag = colorSchemesTag;
-            }
-
             _breadcrumbs.Append(winrt::make<Breadcrumb>(boxedColorSchemesTag, RS_(L"Nav_ColorSchemes/Content"), BreadcrumbSubPage::None));
 
             if (subPage == BreadcrumbSubPage::None)
             {
-                contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToPageArgs>(_colorSchemesPageVM, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::ColorSchemes>(), winrt::make<NavigateToPageArgs>(_colorSchemesPageVM, *this, elementToFocus));
                 _colorSchemesPageVM.CurrentScheme(nullptr);
                 _colorSchemesPageVM.CurrentPage(ColorSchemesSubPage::Base);
             }
@@ -734,7 +707,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             {
                 _colorSchemesPageVM.CurrentScheme(colorSchemeVM);
                 _colorSchemesPageVM.CurrentPage(ColorSchemesSubPage::EditColorScheme);
-                contentFrame().Navigate(xaml_typename<Editor::EditColorScheme>(), winrt::make<NavigateToPageArgs>(colorSchemeVM, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::EditColorScheme>(), winrt::make<NavigateToPageArgs>(colorSchemeVM, *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(boxedColorSchemesTag, colorSchemeVM.Name(), BreadcrumbSubPage::ColorSchemes_Edit));
             }
 
@@ -745,7 +718,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             selectedNavTag = newTabMenuTag;
 
-            contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this, elementToFocus), _MakeTransitionInfo());
+            contentFrame().Navigate(xaml_typename<Editor::NewTabMenu>(), winrt::make<NavigateToPageArgs>(_newTabMenuPageVM, *this, elementToFocus));
             _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(newTabMenuTag), RS_(L"Nav_NewTabMenu/Content"), BreadcrumbSubPage::None));
 
             if (subPage == BreadcrumbSubPage::None)
@@ -776,7 +749,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             selectedNavTag = extensionsTag;
 
-            contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this, elementToFocus), _MakeTransitionInfo());
+            contentFrame().Navigate(xaml_typename<Editor::Extensions>(), winrt::make<NavigateToPageArgs>(_extensionsVM, *this, elementToFocus));
             _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(extensionsTag), RS_(L"Nav_Extensions/Content"), BreadcrumbSubPage::None));
 
             if (subPage == BreadcrumbSubPage::None)
@@ -821,7 +794,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             if (subPage == BreadcrumbSubPage::None || !commandVM)
             {
-                contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<NavigateToPageArgs>(_actionsVM, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<NavigateToPageArgs>(_actionsVM, *this, elementToFocus));
                 _actionsVM.CurrentCommand(nullptr);
             }
             else
@@ -831,7 +804,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
                 _actionsVM.CurrentCommand(commandVM);
                 _actionsVM.CurrentPage(ActionsSubPage::Edit);
-                contentFrame().Navigate(xaml_typename<Editor::EditAction>(), winrt::make<NavigateToPageArgs>(commandVM, *this, elementToFocus), _MakeTransitionInfo());
+                contentFrame().Navigate(xaml_typename<Editor::EditAction>(), winrt::make<NavigateToPageArgs>(commandVM, *this, elementToFocus));
                 _breadcrumbs.Append(winrt::make<Breadcrumb>(boxedActionsTag, RS_(L"Nav_EditAction/Content"), BreadcrumbSubPage::Actions_Edit));
 
                 // Re-register the handler for future user-driven changes
@@ -840,9 +813,26 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
 
         // Select the appropriate nav item
+        // NOTE: profiles are special in that they have their own nav item, so those are handled in the profile branch above
         if (!selectedNavTag.empty())
         {
-            _SelectNavItemByTag(selectedNavTag);
+            for (auto&& menuItem : _menuItemSource)
+            {
+                if (const auto& navViewItem{ menuItem.try_as<MUX::Controls::NavigationViewItem>() })
+                {
+                    if (const auto& tag{ navViewItem.Tag() })
+                    {
+                        if (const auto& stringTag{ tag.try_as<hstring>() })
+                        {
+                            if (*stringTag == selectedNavTag)
+                            {
+                                SettingsNav().SelectedItem(navViewItem);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 
@@ -864,35 +854,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         if (gsl::narrow_cast<uint32_t>(args.Index()) < (_breadcrumbs.Size() - 1))
         {
-            _navDirection = NavDirection::Back;
-            const auto resetDir = wil::scope_exit([this]() noexcept { _navDirection = NavDirection::Default; });
             const auto crumb = args.Item().as<Breadcrumb>();
-            // If the breadcrumb chain is rooted at the Profiles landing page, preserve
-            // that context so navigating to sub pages (i.e. Color schemes) via a back-breadcrumb
-            // keeps the "Profiles ›" prefix.
-            const hstring parentNavTag = _RootCrumbIsProfilesBreadcrumb() ? hstring{ profilesTag } : hstring{};
-            _Navigate(crumb->Tag(), crumb->SubPage(), {}, parentNavTag);
-        }
-    }
-
-    NavigationTransitionInfo MainPage::_MakeTransitionInfo() const
-    {
-        switch (_navDirection)
-        {
-        case NavDirection::Forward:
-        {
-            SlideNavigationTransitionInfo info;
-            info.Effect(SlideNavigationTransitionEffect::FromRight);
-            return info;
-        }
-        case NavDirection::Back:
-        {
-            SlideNavigationTransitionInfo info;
-            info.Effect(SlideNavigationTransitionEffect::FromLeft);
-            return info;
-        }
-        default:
-            return EntranceNavigationTransitionInfo{};
+            _Navigate(crumb->Tag(), crumb->SubPage());
         }
     }
 
@@ -909,20 +872,35 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             _MoveXamlParsedNavItemsIntoItemSource();
         }
 
-        // Populate the per-profile view models on the Profiles VM. The Profiles landing
-        // page (and the search index) read this same list back through the VM.
-        const auto& profileVMs = _profilesPageVM.Profiles();
-        profileVMs.Clear();
+        // Manually create a NavigationViewItem and view model for each profile
+        // and keep a reference to them in a map so that we
+        // can easily modify the correct one when the associated
+        // profile changes.
+        _profileVMs.Clear();
         for (const auto& profile : _settingsClone.AllProfiles())
         {
             if (!profile.Deleted())
             {
                 auto profileVM = _viewModelForProfile(profile, _settingsClone, Dispatcher());
                 profileVM.SetupAppearances(_colorSchemesPageVM.AllColorSchemes());
-                profileVM.DeleteProfileRequested({ this, &MainPage::_DeleteProfile });
-                profileVMs.Append(profileVM);
+                auto navItem = _CreateProfileNavViewItem(profileVM);
+                _menuItemSource.Append(navItem);
             }
         }
+
+        // Top off (the end of the nav view) with the Add Profile item
+        MUX::Controls::NavigationViewItem addProfileItem;
+        const auto addProfileText = RS_(L"Nav_AddNewProfile/Content");
+        addProfileItem.Content(box_value(addProfileText));
+        addProfileItem.Tag(box_value(addProfileTag));
+        WUX::Controls::ToolTipService::SetToolTip(addProfileItem, box_value(addProfileText));
+
+        FontIcon icon;
+        // This is the "Add" symbol
+        icon.Glyph(NavTagIconMap[addProfileTag]);
+        addProfileItem.Icon(icon);
+
+        _menuItemSource.Append(addProfileItem);
     }
 
     // BODGY
@@ -958,17 +936,79 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         SettingsNav().MenuItemsSource(_menuItemSource);
     }
 
-    void MainPage::_CreateAndNavigateToNewProfile(const Model::Profile& profile)
+    void MainPage::_CreateAndNavigateToNewProfile(const uint32_t index, const Model::Profile& profile)
     {
         const auto newProfile{ profile ? profile : _settingsClone.CreateNewProfile() };
         const auto profileViewModel{ _viewModelForProfile(newProfile, _settingsClone, Dispatcher()) };
         profileViewModel.SetupAppearances(_colorSchemesPageVM.AllColorSchemes());
-        profileViewModel.DeleteProfileRequested({ this, &MainPage::_DeleteProfile });
+        const auto navItem{ _CreateProfileNavViewItem(profileViewModel) };
 
-        _profilesPageVM.Profiles().Append(profileViewModel);
+        if (_menuItemSource)
+        {
+            _menuItemSource.InsertAt(index, navItem);
+        }
 
         // Select and navigate to the new profile
-        _Navigate(profileViewModel);
+        _Navigate(profileViewModel, BreadcrumbSubPage::None);
+    }
+
+    static MUX::Controls::InfoBadge _createGlyphIconBadge(wil::zwstring_view glyph)
+    {
+        MUX::Controls::InfoBadge badge;
+        MUX::Controls::FontIconSource icon;
+        icon.FontFamily(winrt::Windows::UI::Xaml::Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
+        icon.FontSize(12);
+        icon.Glyph(glyph);
+        badge.IconSource(icon);
+        return badge;
+    }
+
+    MUX::Controls::NavigationViewItem MainPage::_CreateProfileNavViewItem(const Editor::ProfileViewModel& profile)
+    {
+        MUX::Controls::NavigationViewItem profileNavItem;
+        profileNavItem.Content(box_value(profile.Name()));
+        profileNavItem.Tag(box_value<Editor::ProfileViewModel>(profile));
+        profileNavItem.Icon(UI::IconPathConverter::IconWUX(profile.EvaluatedIcon()));
+        WUX::Controls::ToolTipService::SetToolTip(profileNavItem, box_value(profile.Name()));
+
+        if (profile.Orphaned())
+        {
+            profileNavItem.InfoBadge(_createGlyphIconBadge(L"\xE7BA") /* Warning Triangle */);
+        }
+        else if (profile.Hidden())
+        {
+            profileNavItem.InfoBadge(_createGlyphIconBadge(L"\xED1A") /* Hide */);
+        }
+
+        // Update the menu item when the icon/name changes
+        auto weakMenuItem{ make_weak(profileNavItem) };
+        profile.PropertyChanged([weakMenuItem](const auto&, const WUX::Data::PropertyChangedEventArgs& args) {
+            if (auto menuItem{ weakMenuItem.get() })
+            {
+                const auto& tag{ menuItem.Tag().as<Editor::ProfileViewModel>() };
+                if (args.PropertyName() == L"Icon")
+                {
+                    menuItem.Icon(UI::IconPathConverter::IconWUX(tag.EvaluatedIcon()));
+                }
+                else if (args.PropertyName() == L"Name")
+                {
+                    menuItem.Content(box_value(tag.Name()));
+                    WUX::Controls::ToolTipService::SetToolTip(menuItem, box_value(tag.Name()));
+                }
+                else if (args.PropertyName() == L"Hidden")
+                {
+                    menuItem.InfoBadge(tag.Hidden() ? _createGlyphIconBadge(L"\xED1A") /* Hide */ : nullptr);
+                }
+            }
+        });
+
+        // Add an event handler for when the user wants to delete a profile.
+        profile.DeleteProfileRequested({ this, &MainPage::_DeleteProfile });
+
+        // Register the VM so that it appears in the search index
+        _profileVMs.Append(profile);
+
+        return profileNavItem;
     }
 
     void MainPage::_DeleteProfile(const IInspectable /*sender*/, const Editor::DeleteProfileEventArgs& args)
@@ -985,20 +1025,33 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             }
         }
 
-        // Remove the profile VM
-        const auto& profileVMs = _profilesPageVM.Profiles();
-        for (uint32_t i = 0; i < profileVMs.Size(); ++i)
+        // remove selected item
+        uint32_t index;
+        auto selectedItem{ SettingsNav().SelectedItem() };
+        if (_menuItemSource)
         {
-            if (profileVMs.GetAt(i).OriginalProfileGuid() == guid)
-            {
-                profileVMs.RemoveAt(i);
-                break;
-            }
-        }
+            _menuItemSource.IndexOf(selectedItem, index);
+            _menuItemSource.RemoveAt(index);
 
-        // Go back to the Profiles landing page
-        _Navigate(box_value(profilesTag));
-        SettingsMainPage_ScrollViewer().ChangeView(nullptr, 0.0, nullptr);
+            // Remove it from the list of VMs
+            auto profileVM = selectedItem.as<MUX::Controls::NavigationViewItem>().Tag().as<Editor::ProfileViewModel>();
+            uint32_t vmIndex;
+            if (_menuItemSource.IndexOf(profileVM, vmIndex))
+            {
+                _profileVMs.RemoveAt(vmIndex);
+            }
+
+            // navigate to the profile next to this one
+            const auto newSelectedItem{ _menuItemSource.GetAt(index < _menuItemSource.Size() - 1 ? index : index - 1) };
+            const auto newTag = newSelectedItem.as<MUX::Controls::NavigationViewItem>().Tag();
+            if (const auto profileViewModel = newTag.try_as<ProfileViewModel>())
+            {
+                profileViewModel->FocusDeleteButton(true);
+            }
+            _Navigate(newTag, BreadcrumbSubPage::None);
+            // Since we are navigating to a new profile after deletion, scroll up to the top
+            SettingsMainPage_ScrollViewer().ChangeView(nullptr, 0.0, nullptr);
+        }
     }
 
     IObservableVector<IInspectable> MainPage::Breadcrumbs() noexcept
@@ -1008,20 +1061,29 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void MainPage::_NavigateToProfileHandler(const IInspectable& /*sender*/, winrt::guid profileGuid)
     {
-        if (const auto profileVM = _FindProfileViewModelByGuid(profileGuid))
+        if (const auto profileNavItem = _FindProfileNavItem(profileGuid))
         {
-            _Navigate(profileVM);
+            _Navigate(profileNavItem.Tag(), BreadcrumbSubPage::None);
         }
         // Silently fail if the profile wasn't found
     }
 
-    Editor::ProfileViewModel MainPage::_FindProfileViewModelByGuid(winrt::guid profileGuid) const
+    MUX::Controls::NavigationViewItem MainPage::_FindProfileNavItem(winrt::guid profileGuid) const
     {
-        for (const auto& profileVM : _profilesPageVM.Profiles())
+        for (auto&& menuItem : _menuItemSource)
         {
-            if (profileVM.OriginalProfileGuid() == profileGuid)
+            if (const auto& navViewItem{ menuItem.try_as<MUX::Controls::NavigationViewItem>() })
             {
-                return profileVM;
+                if (const auto& tag{ navViewItem.Tag() })
+                {
+                    if (const auto& profileTag{ tag.try_as<ProfileViewModel>() })
+                    {
+                        if (profileTag->OriginalProfileGuid() == profileGuid)
+                        {
+                            return navViewItem;
+                        }
+                    }
+                }
             }
         }
         return nullptr;
@@ -1032,62 +1094,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _Navigate(box_value(hstring{ colorSchemesTag }), BreadcrumbSubPage::ColorSchemes_Edit);
     }
 
-    void MainPage::_AppendProfilesRootCrumb()
-    {
-        _breadcrumbs.Append(winrt::make<Breadcrumb>(box_value(profilesTag), RS_(L"Nav_Profiles/Content"), BreadcrumbSubPage::None));
-    }
-
-    bool MainPage::_RootCrumbIsProfilesBreadcrumb() const
-    {
-        if (_breadcrumbs.Size() == 0)
-        {
-            return false;
-        }
-        const auto rootTag = _breadcrumbs.GetAt(0).as<Breadcrumb>()->Tag().try_as<hstring>();
-        return rootTag && *rootTag == profilesTag;
-    }
-
-    void MainPage::_SelectNavItemByTag(std::wstring_view tag)
-    {
-        if (!_menuItemSource)
-        {
-            return;
-        }
-        for (auto&& menuItem : _menuItemSource)
-        {
-            if (const auto& navViewItem{ menuItem.try_as<MUX::Controls::NavigationViewItem>() })
-            {
-                if (const auto& itemTag{ navViewItem.Tag() })
-                {
-                    if (const auto& stringTag{ itemTag.try_as<hstring>() })
-                    {
-                        if (*stringTag == tag)
-                        {
-                            SettingsNav().SelectedItem(navViewItem);
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    void MainPage::_SetupProfilesPageEventHandling()
-    {
-        _profilesPageVM.OpenDefaultsRequested([this](const auto&, const auto&) {
-            _Navigate(box_value(globalProfileTag));
-        });
-        _profilesPageVM.OpenColorSchemesRequested([this](const auto&, const auto&) {
-            _Navigate(box_value(colorSchemesTag), {}, {}, hstring{ profilesTag });
-        });
-        _profilesPageVM.AddProfileRequested([this](const auto&, const auto&) {
-            _Navigate(box_value(addProfileTag));
-        });
-        _profilesPageVM.OpenProfileRequested([this](const auto&, const Editor::ProfileViewModel& profile) {
-            _Navigate(profile);
-        });
-    }
-
     winrt::Windows::UI::Xaml::Media::Brush MainPage::BackgroundBrush()
     {
         return SettingsNav().Background();
@@ -1190,7 +1196,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             co_return;
         }
         _currentSearch = SearchIndex::Instance().SearchAsync(sanitizedQuery,
-                                                             _profilesPageVM.Profiles().GetView(),
+                                                             _profileVMs.GetView(),
                                                              get_self<implementation::NewTabMenuViewModel>(_newTabMenuPageVM)->FolderTreeFlatList().GetView(),
                                                              _colorSchemesPageVM.AllColorSchemes().GetView(),
                                                              _extensionsVM.ExtensionPackages().GetView(),

src/cascadia/TerminalSettingsEditor/MainPage.h

@@ -84,34 +84,21 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         std::optional<HWND> _hostingHwnd;
 
         void _InitializeProfilesList();
-        void _CreateAndNavigateToNewProfile(const Model::Profile& profile);
+        void _CreateAndNavigateToNewProfile(const uint32_t index, const Model::Profile& profile);
+        winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem _CreateProfileNavViewItem(const Editor::ProfileViewModel& profile);
         void _DeleteProfile(const Windows::Foundation::IInspectable sender, const Editor::DeleteProfileEventArgs& args);
         void _AddProfileHandler(const winrt::guid profileGuid);
 
         void _SetupProfileEventHandling(const winrt::Microsoft::Terminal::Settings::Editor::ProfileViewModel profile);
         void _SetupColorSchemesEventHandling();
         void _SetupActionsEventHandling();
-        void _SetupProfilesPageEventHandling();
         void _NavigateToProfileSubPage(const Editor::ProfileViewModel& profile, ProfileSubPage page, const IInspectable& breadcrumbTag, const hstring& elementToFocus);
 
         void _PreNavigateHelper();
-        void _Navigate(const IInspectable& vm, BreadcrumbSubPage subPage = BreadcrumbSubPage::None, hstring elementToFocus = {}, const hstring& parentNavTag = {});
-        Windows::UI::Xaml::Media::Animation::NavigationTransitionInfo _MakeTransitionInfo() const;
-
-        enum class NavDirection
-        {
-            Default,
-            Forward,
-            Back
-        };
-        NavDirection _navDirection{ NavDirection::Default };
+        void _Navigate(const IInspectable& vm, BreadcrumbSubPage subPage, hstring elementToFocus = {});
         void _NavigateToProfileHandler(const IInspectable& sender, winrt::guid profileGuid);
         void _NavigateToColorSchemeHandler(const IInspectable& sender, const IInspectable& args);
-        Editor::ProfileViewModel _FindProfileViewModelByGuid(winrt::guid profileGuid) const;
-
-        void _AppendProfilesRootCrumb();
-        bool _RootCrumbIsProfilesBreadcrumb() const;
-        void _SelectNavItemByTag(std::wstring_view tag);
+        Microsoft::UI::Xaml::Controls::NavigationViewItem _FindProfileNavItem(winrt::guid profileGuid) const;
 
         void _UpdateBackgroundForMica();
         void _MoveXamlParsedNavItemsIntoItemSource();
@@ -119,11 +106,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         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 };
-        winrt::Microsoft::Terminal::Settings::Editor::ProfilesPageViewModel _profilesPageVM{ nullptr };
 
         Windows::Foundation::IAsyncOperation<Windows::Foundation::Collections::IObservableVector<Windows::Foundation::IInspectable>> _currentSearch{ nullptr };
 

src/cascadia/TerminalSettingsEditor/MainPage.xaml

@@ -162,6 +162,15 @@
                                      x:Uid="Nav_Appearance"
                                      Tag="GlobalAppearance_Nav" />
 
+            <muxc:NavigationViewItem x:Name="ColorSchemesNavItem"
+                                     x:Uid="Nav_ColorSchemes"
+                                     Tag="ColorSchemes_Nav" />
+
+
+            <muxc:NavigationViewItem x:Name="RenderingNavItem"
+                                     x:Uid="Nav_Rendering"
+                                     Tag="Rendering_Nav" />
+
             <muxc:NavigationViewItem x:Name="CompatibilityNavItem"
                                      x:Uid="Nav_Compatibility"
                                      Tag="Compatibility_Nav" />
@@ -183,15 +192,11 @@
                                      x:Uid="Nav_Extensions"
                                      Tag="Extensions_Nav" />
 
-            <muxc:NavigationViewItemHeader Content="Profiles"/>
-            <muxc:NavigationViewItem x:Name="ProfilesNavItem"
-                                     x:Uid="Nav_Profiles"
-                                     Tag="Profiles_Nav" />
-
-            <muxc:NavigationViewItem x:Name="ColorSchemesNavItem"
-                                     x:Uid="Nav_ColorSchemes"
-                                     Tag="ColorSchemes_Nav" />
+            <muxc:NavigationViewItemHeader x:Uid="Nav_Profiles" />
 
+            <muxc:NavigationViewItem x:Name="BaseLayerMenuItem"
+                                     x:Uid="Nav_ProfileDefaults"
+                                     Tag="GlobalProfile_Nav" />
         </muxc:NavigationView.MenuItems>
 
         <muxc:NavigationView.FooterMenuItems>
@@ -210,7 +215,17 @@
                           Grid.Row="0">
                 <Frame x:Name="contentFrame"
                        Grid.Row="0"
-                       Padding="16,0,16,48" />
+                       Padding="16,0,16,48">
+                    <Frame.ContentTransitions>
+                        <TransitionCollection>
+                            <NavigationThemeTransition>
+                                <NavigationThemeTransition.DefaultNavigationTransitionInfo>
+                                    <DrillInNavigationTransitionInfo />
+                                </NavigationThemeTransition.DefaultNavigationTransitionInfo>
+                            </NavigationThemeTransition>
+                        </TransitionCollection>
+                    </Frame.ContentTransitions>
+                </Frame>
             </ScrollViewer>
             <!--  Explicitly set the background color on grid to prevent the navigation animation from overflowing it  -->
             <Grid Grid.Row="1"

src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj

@@ -86,9 +86,6 @@
     <ClInclude Include="KeyChordListener.h">
       <DependentUpon>KeyChordListener.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="KeyChordVisual.h">
-      <DependentUpon>KeyChordVisual.xaml</DependentUpon>
-    </ClInclude>
     <ClInclude Include="Launch.h">
       <DependentUpon>Launch.xaml</DependentUpon>
     </ClInclude>
@@ -122,8 +119,8 @@
       <DependentUpon>ColorSchemesPageViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
-    <ClInclude Include="Profiles.h">
-      <DependentUpon>Profiles.xaml</DependentUpon>
+    <ClInclude Include="RenderingViewModel.h">
+      <DependentUpon>RenderingViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
     <ClInclude Include="InteractionViewModel.h">
@@ -170,6 +167,9 @@
       <DependentUpon>Appearances.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
+    <ClInclude Include="Rendering.h">
+      <DependentUpon>Rendering.xaml</DependentUpon>
+    </ClInclude>
     <ClInclude Include="SettingContainer.h">
       <DependentUpon>SettingContainer.idl</DependentUpon>
     </ClInclude>
@@ -216,9 +216,6 @@
     <Page Include="KeyChordListener.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="KeyChordVisual.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Launch.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -234,9 +231,6 @@
     <Page Include="Profiles_Base.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Profiles.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Profiles_Base_Orphaned.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -252,6 +246,9 @@
     <Page Include="Appearances.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Rendering.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="SettingContainerStyle.xaml">
       <Type>DefaultStyle</Type>
     </Page>
@@ -300,9 +297,6 @@
     <ClCompile Include="KeyChordListener.cpp">
       <DependentUpon>KeyChordListener.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="KeyChordVisual.cpp">
-      <DependentUpon>KeyChordVisual.xaml</DependentUpon>
-    </ClCompile>
     <ClCompile Include="Launch.cpp">
       <DependentUpon>Launch.xaml</DependentUpon>
     </ClCompile>
@@ -337,8 +331,8 @@
       <DependentUpon>ColorSchemesPageViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="Profiles.cpp">
-      <DependentUpon>Profiles.xaml</DependentUpon>
+    <ClCompile Include="RenderingViewModel.cpp">
+      <DependentUpon>RenderingViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
     <ClCompile Include="InteractionViewModel.cpp">
@@ -385,6 +379,9 @@
       <DependentUpon>Appearances.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
+    <ClCompile Include="Rendering.cpp">
+      <DependentUpon>Rendering.xaml</DependentUpon>
+    </ClCompile>
     <ClCompile Include="SettingContainer.cpp">
       <DependentUpon>SettingContainer.idl</DependentUpon>
     </ClCompile>
@@ -430,10 +427,6 @@
       <DependentUpon>KeyChordListener.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="KeyChordVisual.idl">
-      <DependentUpon>KeyChordVisual.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Midl>
     <Midl Include="Launch.idl">
       <DependentUpon>Launch.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -450,6 +443,10 @@
       <DependentUpon>Compatibility.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
+    <Midl Include="Rendering.idl">
+      <DependentUpon>Rendering.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Midl>
     <Midl Include="SearchIndex.idl" />
     <Midl Include="MainPage.idl">
       <DependentUpon>MainPage.xaml</DependentUpon>
@@ -459,10 +456,7 @@
     <Midl Include="TerminalColorConverters.idl" />
     <Midl Include="ColorSchemeViewModel.idl" />
     <Midl Include="ColorSchemesPageViewModel.idl" />
-    <Midl Include="Profiles.idl">
-      <DependentUpon>Profiles.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Midl>
+    <Midl Include="RenderingViewModel.idl" />
     <Midl Include="InteractionViewModel.idl" />
     <Midl Include="GlobalAppearanceViewModel.idl" />
     <Midl Include="LaunchViewModel.idl" />

src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters

@@ -24,6 +24,7 @@
     <Midl Include="ActionsViewModel.idl" />
     <Midl Include="ColorSchemeViewModel.idl" />
     <Midl Include="ColorSchemesPageViewModel.idl" />
+    <Midl Include="RenderingViewModel.idl" />
     <Midl Include="InteractionViewModel.idl" />
     <Midl Include="GlobalAppearanceViewModel.idl" />
     <Midl Include="LaunchViewModel.idl" />
@@ -47,15 +48,14 @@
     <Page Include="Profiles_Advanced.xaml" />
     <Page Include="Profiles_Appearance.xaml" />
     <Page Include="Appearances.xaml" />
+    <Page Include="Rendering.xaml" />
     <Page Include="Actions.xaml" />
     <Page Include="EditAction.xaml" />
     <Page Include="SettingContainerStyle.xaml" />
     <Page Include="AddProfile.xaml" />
     <Page Include="KeyChordListener.xaml" />
-    <Page Include="KeyChordVisual.xaml" />
     <Page Include="NullableColorPicker.xaml" />
     <Page Include="IconPicker.xaml" />
     <Page Include="NewTabMenu.xaml" />
-    <Page Include="Profiles.xaml" />
   </ItemGroup>
 </Project>

src/cascadia/TerminalSettingsEditor/NavConstants.h

@@ -12,11 +12,11 @@ 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 profilesTag{ L"Profiles_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" };
@@ -28,11 +28,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         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{ profilesTag, L"\xE7EE" }, /* Other User */
         std::pair{ globalProfileTag, L"\xE81E" }, /* Map Layers */
         std::pair{ addProfileTag, L"\xE710" }, /* Add */
         std::pair{ openJsonTag, L"\xE713" }, /* Settings */

src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml

@@ -121,7 +121,7 @@
                                 Style="{StaticResource NewTabMenuEntryControlsWrapper}">
                     <TextBlock x:Uid="NewTabMenuEntry_Separator"
                                VerticalAlignment="Center"
-                               Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                               FontStyle="Italic" />
                 </ContentControl>
             </DataTemplate>
 
@@ -201,7 +201,7 @@
                                 DataContext="{Binding Mode=OneWay}"
                                 Style="{StaticResource NewTabMenuEntryControlsWrapper}">
                     <TextBlock VerticalAlignment="Center"
-                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                               FontStyle="Italic"
                                Text="{x:Bind DisplayText, Mode=OneWay}" />
                 </ContentControl>
             </DataTemplate>
@@ -213,7 +213,7 @@
                                 Style="{StaticResource NewTabMenuEntryControlsWrapper}">
                     <TextBlock x:Uid="NewTabMenuEntry_RemainingProfiles"
                                VerticalAlignment="Center"
-                               Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                               FontStyle="Italic" />
                 </ContentControl>
             </DataTemplate>
 
@@ -227,27 +227,11 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <Grid x:Name="RootGrid"
-          MaxWidth="{StaticResource StandardControlMaxWidth}"
-          ColumnSpacing="16"
-          RowSpacing="12">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition x:Name="ControlsColumn"
-                              Width="*" />
-            <ColumnDefinition x:Name="PreviewColumn"
-                              Width="*" />
-        </Grid.ColumnDefinitions>
+    <Grid RowSpacing="12">
         <Grid.RowDefinitions>
-            <!--
-                In the wide/medium (2-column) states, both PreviewArea and ControlsArea span
-                both rows so the row sizing here doesn't matter.
-                In the narrow (stacked) state, PreviewArea moves to row 0 and ControlsArea
-                moves to row 1, and the rows are resized via the visual state setters.
-            -->
-            <RowDefinition x:Name="PreviewRow"
-                           Height="0" />
-            <RowDefinition x:Name="ControlsRow"
-                           Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
         <!--  Folder Picker Dialog: used to select a folder to move entries to  -->
@@ -283,390 +267,253 @@
             </muxc:TreeView>
         </ContentDialog>
 
-        <Grid x:Name="PreviewArea"
-              Grid.Row="0"
-              Grid.RowSpan="2"
-              Grid.Column="1"
-              Grid.ColumnSpan="1">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <!--
-                Invisible header placeholder so the preview's top edge aligns with the first
-                SettingContainer in the controls column
-            -->
-            <TextBlock x:Name="PreviewHeaderPlaceholder"
-                       Grid.Row="0"
-                       Margin="0,4,0,4"
-                       AutomationProperties.AccessibilityView="Raw"
-                       IsHitTestVisible="False"
-                       Opacity="0"
-                       Style="{StaticResource TextBlockSubHeaderStyle}"
-                       Text="Preview" />
-
-            <!--  Preview Border: contains the ListView and the multi-select footer.  -->
-            <Border Grid.Row="1"
-                    MinHeight="300"
-                    Margin="0,4,0,0"
-                    VerticalAlignment="Stretch"
+        <!--  New Tab Menu Content  -->
+        <StackPanel Grid.Row="0"
+                    MaxWidth="{StaticResource StandardControlMaxWidth}"
+                    Spacing="8">
+            <Border Height="300"
+                    MaxWidth="{StaticResource StandardControlMaxWidth}"
+                    Margin="0,12,0,0"
                     BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
                     BorderThickness="1"
                     CornerRadius="{ThemeResource ControlCornerRadius}">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-
-                    <ListView x:Name="NewTabMenuListView"
-                              Grid.Row="0"
-                              AllowDrop="True"
-                              CanDragItems="True"
-                              CanReorderItems="True"
-                              ItemTemplateSelector="{StaticResource NewTabMenuEntryTemplateSelector}"
-                              ItemsSource="{x:Bind ViewModel.CurrentView, Mode=OneWay}"
-                              SelectionMode="Multiple" />
-
-                    <!--  Preview Controls  -->
-                    <Border Grid.Row="1"
-                            Padding="8"
-                            BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
-                            BorderThickness="0,1,0,0">
-                        <Grid ColumnSpacing="8">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Button x:Name="MoveToFolderButton"
-                                    Grid.Column="0"
-                                    HorizontalAlignment="Stretch"
-                                    HorizontalContentAlignment="Stretch"
-                                    Click="MoveMultiple_Click"
-                                    IsEnabled="False">
-                                <Grid ColumnSpacing="8">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <FontIcon Grid.Column="0"
-                                              VerticalAlignment="Center"
-                                              FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE8DE;" />
-                                    <TextBlock x:Uid="NewTabMenu_MoveToFolderTextBlock"
-                                               Grid.Column="1"
-                                               VerticalAlignment="Center"
-                                               TextWrapping="WrapWholeWords" />
-                                </Grid>
-                            </Button>
-                            <Button x:Name="DeleteMultipleButton"
-                                    Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch"
-                                    HorizontalContentAlignment="Stretch"
-                                    Click="DeleteMultiple_Click"
-                                    IsEnabled="False"
-                                    Style="{StaticResource DeleteButtonStyle}">
-                                <Grid ColumnSpacing="8">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <FontIcon Grid.Column="0"
-                                              VerticalAlignment="Center"
-                                              FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE74D;" />
-                                    <TextBlock x:Uid="NewTabMenu_DeleteMultipleTextBlock"
-                                               Grid.Column="1"
-                                               VerticalAlignment="Center"
-                                               TextWrapping="WrapWholeWords" />
-                                </Grid>
-                            </Button>
-                        </Grid>
-                    </Border>
-                </Grid>
+                <ListView x:Name="NewTabMenuListView"
+                          AllowDrop="True"
+                          CanDragItems="True"
+                          CanReorderItems="True"
+                          ItemTemplateSelector="{StaticResource NewTabMenuEntryTemplateSelector}"
+                          ItemsSource="{x:Bind ViewModel.CurrentView, Mode=OneWay}"
+                          SelectionMode="Multiple" />
             </Border>
-        </Grid>
 
-        <ScrollViewer x:Name="ControlsArea"
-                      Grid.Row="0"
-                      Grid.RowSpan="2"
-                      Grid.Column="0"
-                      Grid.ColumnSpan="1"
-                      HorizontalScrollMode="Disabled"
-                      VerticalScrollBarVisibility="Auto">
-            <StackPanel>
-                <!--  Folder View Controls  -->
-                <StackPanel Margin="0,0,0,24"
-                            Visibility="{x:Bind ViewModel.IsFolderView, Mode=OneWay}">
-                    <TextBlock x:Uid="NewTabMenu_CurrentFolderTextBlock"
-                               Margin="0,4,0,4"
-                               Style="{StaticResource TextBlockSubHeaderStyle}" />
-                    <!--  Name  -->
-                    <local:SettingContainer x:Name="CurrentFolderName"
-                                            x:Uid="NewTabMenu_CurrentFolderName"
-                                            CurrentValue="{x:Bind ViewModel.CurrentFolderName, Mode=OneWay}"
-                                            Style="{StaticResource ExpanderSettingContainerStyle}">
-                        <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind ViewModel.CurrentFolderName, Mode=TwoWay}" />
-                    </local:SettingContainer>
-
-                    <!--  Icon  -->
-                    <local:SettingContainer x:Name="CurrentFolderIcon"
-                                            x:Uid="NewTabMenu_CurrentFolderIcon"
-                                            CurrentValueAccessibleName="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}"
-                                            Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                        <local:SettingContainer.CurrentValue>
-                            <Grid>
-                                <ContentControl Width="16"
-                                                Height="16"
-                                                Content="{x:Bind ViewModel.CurrentFolderIconPreview, Mode=OneWay}"
-                                                IsTabStop="False"
-                                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.CurrentFolderUsingNoIcon), Mode=OneWay}" />
-                                <TextBlock Margin="0,0,0,0"
-                                           HorizontalAlignment="Right"
-                                           VerticalAlignment="Center"
-                                           FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
-                                           Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                           Text="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}"
-                                           Visibility="{x:Bind ViewModel.CurrentFolderUsingNoIcon, Mode=OneWay}" />
-                            </Grid>
-                        </local:SettingContainer.CurrentValue>
-                        <local:SettingContainer.Content>
-                            <local:IconPicker CurrentIconPath="{x:Bind ViewModel.CurrentFolderIconPath, Mode=TwoWay}"
-                                              WindowRoot="{x:Bind WindowRoot, Mode=OneWay}" />
-                        </local:SettingContainer.Content>
-                    </local:SettingContainer>
-
-                    <!--  Inlining  -->
-                    <local:SettingContainer x:Name="CurrentFolderInlining"
-                                            x:Uid="NewTabMenu_CurrentFolderInlining">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderInlining, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </local:SettingContainer>
-
-                    <!--  Allow Empty  -->
-                    <local:SettingContainer x:Name="CurrentFolderAllowEmpty"
-                                            x:Uid="NewTabMenu_CurrentFolderAllowEmpty">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderAllowEmpty, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </local:SettingContainer>
-                </StackPanel>
-
-                <!--  Add Entries  -->
-                <StackPanel>
-                    <TextBlock x:Uid="NewTabMenu_AddEntriesTextBlock"
-                               Margin="0,4,0,4"
-                               Style="{StaticResource TextBlockSubHeaderStyle}" />
-
-                    <!--  Add Profile  -->
-                    <local:SettingContainer x:Name="AddProfile"
-                                            x:Uid="NewTabMenu_AddProfile"
-                                            FontIconGlyph="&#xE756;"
-                                            Style="{StaticResource SettingContainerWithIcon}">
-
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="4">
-                            <!--  Select profile to add  -->
-                            <ComboBox x:Name="AddProfileComboBox"
-                                      MinWidth="{StaticResource StandardBoxMinWidth}"
-                                      ItemsSource="{x:Bind ViewModel.AvailableProfiles, Mode=OneWay}"
-                                      SelectedItem="{x:Bind ViewModel.SelectedProfile, Mode=TwoWay}">
-                                <ComboBox.ItemTemplate>
-                                    <DataTemplate x:DataType="model:Profile">
-                                        <Grid HorizontalAlignment="Stretch"
-                                              ColumnSpacing="8">
-
-                                            <Grid.ColumnDefinitions>
-                                                <!--  icon  -->
-                                                <ColumnDefinition Width="16" />
-                                                <!--  profile name  -->
-                                                <ColumnDefinition Width="Auto" />
-                                            </Grid.ColumnDefinitions>
-
-                                            <IconSourceElement Grid.Column="0"
-                                                               Width="16"
-                                                               Height="16"
-                                                               IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon.Resolved), Mode=OneTime}" />
-
-                                            <TextBlock Grid.Column="1"
-                                                       Text="{x:Bind Name}" />
-                                        </Grid>
-                                    </DataTemplate>
-                                </ComboBox.ItemTemplate>
-                            </ComboBox>
-
-                            <Button x:Name="AddProfileButton"
-                                    x:Uid="NewTabMenu_AddProfileButton"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch"
-                                    Click="AddProfileButton_Clicked">
-                                <Button.Content>
-                                    <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE710;" />
-                                </Button.Content>
-                            </Button>
-                        </StackPanel>
-                    </local:SettingContainer>
-
-                    <!--  Add Separator  -->
-                    <local:SettingContainer x:Name="AddSeparator"
-                                            x:Uid="NewTabMenu_AddSeparator"
-                                            FontIconGlyph="&#xE76f;"
-                                            Style="{StaticResource SettingContainerWithIcon}">
-                        <Button x:Name="AddSeparatorButton"
-                                x:Uid="NewTabMenu_AddSeparatorButton"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Click="AddSeparatorButton_Clicked">
-                            <Button.Content>
-                                <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                          Glyph="&#xE710;" />
-                            </Button.Content>
-                        </Button>
-                    </local:SettingContainer>
-
-                    <!--  Add Folder  -->
-                    <local:SettingContainer x:Name="AddFolder"
-                                            x:Uid="NewTabMenu_AddFolder"
-                                            FontIconGlyph="&#xF12B;"
-                                            Style="{StaticResource SettingContainerWithIcon}">
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="5">
-                            <TextBox x:Name="FolderNameTextBox"
-                                     x:Uid="NewTabMenu_AddFolder_FolderName"
-                                     MinWidth="{StaticResource StandardBoxMinWidth}"
-                                     KeyDown="AddFolderNameTextBox_KeyDown"
-                                     Text="{x:Bind ViewModel.AddFolderName, Mode=TwoWay}"
-                                     TextChanged="AddFolderNameTextBox_TextChanged" />
-                            <Button x:Name="AddFolderButton"
-                                    x:Uid="NewTabMenu_AddFolderButton"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch"
-                                    Click="AddFolderButton_Clicked"
-                                    IsEnabled="False">
-                                <Button.Content>
-                                    <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE710;" />
-                                </Button.Content>
-                            </Button>
-                        </StackPanel>
-                    </local:SettingContainer>
-
-                    <!--  Add Match Profiles  -->
-                    <local:SettingContainer x:Name="AddMatchProfiles"
-                                            x:Uid="NewTabMenu_AddMatchProfiles"
-                                            FontIconGlyph="&#xE748;"
-                                            Style="{StaticResource ExpanderSettingContainerStyleWithIcon}">
-                        <StackPanel Spacing="8">
-                            <HyperlinkButton x:Uid="NewTabMenu_AddMatchProfiles_Help"
-                                             NavigateUri="https://learn.microsoft.com/en-us/dotnet/standard/base-types/regular-expression-language-quick-reference" />
-                            <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Name"
-                                     Text="{x:Bind ViewModel.ProfileMatcherName, Mode=TwoWay}" />
-                            <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Source"
-                                     Text="{x:Bind ViewModel.ProfileMatcherSource, Mode=TwoWay}" />
-                            <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Commandline"
-                                     Text="{x:Bind ViewModel.ProfileMatcherCommandline, Mode=TwoWay}" />
-                            <Button x:Name="AddMatchProfilesButton"
-                                    Click="AddMatchProfilesButton_Clicked">
-                                <Button.Content>
-                                    <StackPanel Orientation="Horizontal">
-                                        <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                                  Glyph="&#xE710;" />
-                                        <TextBlock x:Uid="NewTabMenu_AddMatchProfilesTextBlock"
-                                                   Style="{StaticResource IconButtonTextBlockStyle}" />
-                                    </StackPanel>
-                                </Button.Content>
-                            </Button>
-                        </StackPanel>
-                    </local:SettingContainer>
-
-                    <!--  Add Remaining Profiles  -->
-                    <local:SettingContainer x:Name="AddRemainingProfiles"
-                                            x:Uid="NewTabMenu_AddRemainingProfiles"
-                                            FontIconGlyph="&#xE902;"
-                                            Style="{StaticResource SettingContainerWithIcon}">
-                        <Button x:Name="AddRemainingProfilesButton"
-                                x:Uid="NewTabMenu_AddRemainingProfilesButton"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Click="AddRemainingProfilesButton_Clicked"
-                                IsEnabled="{x:Bind ViewModel.IsRemainingProfilesEntryMissing, Mode=OneWay}">
-                            <Button.Content>
-                                <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                          Glyph="&#xE710;" />
-                            </Button.Content>
-                        </Button>
-                    </local:SettingContainer>
-                </StackPanel>
+            <!--  General Controls  -->
+            <StackPanel Orientation="Horizontal"
+                        Spacing="10">
+                <Button x:Name="MoveToFolderButton"
+                        Click="MoveMultiple_Click"
+                        IsEnabled="False">
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE8DE;" />
+                        <TextBlock x:Uid="NewTabMenu_MoveToFolderTextBlock"
+                                   Margin="8,0,0,0" />
+                    </StackPanel>
+                </Button>
+                <Button x:Name="DeleteMultipleButton"
+                        Click="DeleteMultiple_Click"
+                        IsEnabled="False"
+                        Style="{StaticResource DeleteButtonStyle}">
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE74D;" />
+                        <TextBlock x:Uid="NewTabMenu_DeleteMultipleTextBlock"
+                                   Margin="8,0,0,0" />
+                    </StackPanel>
+                </Button>
             </StackPanel>
-        </ScrollViewer>
+        </StackPanel>
 
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup>
-                <!--  Wide: 2 columns, controls on left with leading icons, preview on right.  -->
-                <VisualState x:Name="Wide">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="1200" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="AddProfile.Style" Value="{StaticResource SettingContainerWithIcon}" />
-                        <Setter Target="AddSeparator.Style" Value="{StaticResource SettingContainerWithIcon}" />
-                        <Setter Target="AddFolder.Style" Value="{StaticResource SettingContainerWithIcon}" />
-                        <Setter Target="AddMatchProfiles.Style" Value="{StaticResource ExpanderSettingContainerStyleWithIcon}" />
-                        <Setter Target="AddRemainingProfiles.Style" Value="{StaticResource SettingContainerWithIcon}" />
-                    </VisualState.Setters>
-                </VisualState>
+        <!--  Folder View Controls  -->
+        <StackPanel Grid.Row="1"
+                    MaxWidth="{StaticResource StandardControlMaxWidth}"
+                    Visibility="{x:Bind ViewModel.IsFolderView, Mode=OneWay}">
+            <TextBlock x:Uid="NewTabMenu_CurrentFolderTextBlock"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Name  -->
+            <local:SettingContainer x:Name="CurrentFolderName"
+                                    x:Uid="NewTabMenu_CurrentFolderName"
+                                    CurrentValue="{x:Bind ViewModel.CurrentFolderName, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                         Text="{x:Bind ViewModel.CurrentFolderName, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Medium: 2 columns, controls on left WITHOUT leading icons, preview on right.  -->
-                <VisualState x:Name="Medium">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="900" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="AddProfile.Style" Value="{StaticResource DefaultSettingContainer}" />
-                        <Setter Target="AddSeparator.Style" Value="{StaticResource DefaultSettingContainer}" />
-                        <Setter Target="AddFolder.Style" Value="{StaticResource DefaultSettingContainer}" />
-                        <Setter Target="AddMatchProfiles.Style" Value="{StaticResource ExpanderSettingContainerStyle}" />
-                        <Setter Target="AddRemainingProfiles.Style" Value="{StaticResource DefaultSettingContainer}" />
-                    </VisualState.Setters>
-                </VisualState>
+            <!--  Icon  -->
+            <local:SettingContainer x:Name="CurrentFolderIcon"
+                                    x:Uid="NewTabMenu_CurrentFolderIcon"
+                                    CurrentValueAccessibleName="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                <local:SettingContainer.CurrentValue>
+                    <Grid>
+                        <ContentControl Width="16"
+                                        Height="16"
+                                        Content="{x:Bind ViewModel.CurrentFolderIconPreview, Mode=OneWay}"
+                                        IsTabStop="False"
+                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.CurrentFolderUsingNoIcon), Mode=OneWay}" />
+                        <TextBlock Margin="0,0,0,0"
+                                   HorizontalAlignment="Right"
+                                   VerticalAlignment="Center"
+                                   FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
+                                   Style="{StaticResource SettingsPageItemDescriptionStyle}"
+                                   Text="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}"
+                                   Visibility="{x:Bind ViewModel.CurrentFolderUsingNoIcon, Mode=OneWay}" />
+                    </Grid>
+                </local:SettingContainer.CurrentValue>
+                <local:SettingContainer.Content>
+                    <local:IconPicker CurrentIconPath="{x:Bind ViewModel.CurrentFolderIconPath, Mode=TwoWay}"
+                                      WindowRoot="{x:Bind WindowRoot, Mode=OneWay}" />
+                </local:SettingContainer.Content>
+            </local:SettingContainer>
 
-                <!--  Narrow: single column, preview stacked on top, controls below, no icons.  -->
-                <VisualState x:Name="Narrow">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="0" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <!--  Collapse the preview column and give the preview row real height so the rows are used instead of the columns.  -->
-                        <Setter Target="PreviewColumn.Width" Value="0" />
-                        <Setter Target="PreviewRow.Height" Value="Auto" />
+            <!--  Inlining  -->
+            <local:SettingContainer x:Name="CurrentFolderInlining"
+                                    x:Uid="NewTabMenu_CurrentFolderInlining">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderInlining, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                        <!--  Move PreviewArea to row 0, spanning both columns.  -->
-                        <Setter Target="PreviewArea.(Grid.Row)" Value="0" />
-                        <Setter Target="PreviewArea.(Grid.RowSpan)" Value="1" />
-                        <Setter Target="PreviewArea.(Grid.Column)" Value="0" />
-                        <Setter Target="PreviewArea.(Grid.ColumnSpan)" Value="2" />
+            <!--  Allow Empty  -->
+            <local:SettingContainer x:Name="CurrentFolderAllowEmpty"
+                                    x:Uid="NewTabMenu_CurrentFolderAllowEmpty">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderAllowEmpty, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+        </StackPanel>
 
-                        <!--  Move ControlsArea to row 1, spanning both columns.  -->
-                        <Setter Target="ControlsArea.(Grid.Row)" Value="1" />
-                        <Setter Target="ControlsArea.(Grid.RowSpan)" Value="1" />
-                        <Setter Target="ControlsArea.(Grid.Column)" Value="0" />
-                        <Setter Target="ControlsArea.(Grid.ColumnSpan)" Value="2" />
+        <!--  Add Entries  -->
+        <StackPanel Grid.Row="2">
+            <TextBlock x:Uid="NewTabMenu_AddEntriesTextBlock"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
 
-                        <!--  No icons in the narrow state either (progressive simplification).  -->
-                        <Setter Target="AddProfile.Style" Value="{StaticResource DefaultSettingContainer}" />
-                        <Setter Target="AddSeparator.Style" Value="{StaticResource DefaultSettingContainer}" />
-                        <Setter Target="AddFolder.Style" Value="{StaticResource DefaultSettingContainer}" />
-                        <Setter Target="AddMatchProfiles.Style" Value="{StaticResource ExpanderSettingContainerStyle}" />
-                        <Setter Target="AddRemainingProfiles.Style" Value="{StaticResource DefaultSettingContainer}" />
+            <!--  Add Profile  -->
+            <local:SettingContainer x:Name="AddProfile"
+                                    x:Uid="NewTabMenu_AddProfile"
+                                    FontIconGlyph="&#xE756;"
+                                    Style="{StaticResource SettingContainerWithIcon}">
 
-                        <!--  Hide the preview header placeholder in stacked mode (no controls beside the preview to align with).  -->
-                        <Setter Target="PreviewHeaderPlaceholder.Visibility" Value="Collapsed" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
+                <StackPanel Orientation="Horizontal"
+                            Spacing="4">
+                    <!--  Select profile to add  -->
+                    <ComboBox x:Name="AddProfileComboBox"
+                              MinWidth="{StaticResource StandardBoxMinWidth}"
+                              ItemsSource="{x:Bind ViewModel.AvailableProfiles, Mode=OneWay}"
+                              SelectedItem="{x:Bind ViewModel.SelectedProfile, Mode=TwoWay}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="model:Profile">
+                                <Grid HorizontalAlignment="Stretch"
+                                      ColumnSpacing="8">
+
+                                    <Grid.ColumnDefinitions>
+                                        <!--  icon  -->
+                                        <ColumnDefinition Width="16" />
+                                        <!--  profile name  -->
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+
+                                    <IconSourceElement Grid.Column="0"
+                                                       Width="16"
+                                                       Height="16"
+                                                       IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon.Resolved), Mode=OneTime}" />
+
+                                    <TextBlock Grid.Column="1"
+                                               Text="{x:Bind Name}" />
+                                </Grid>
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+
+                    <Button x:Name="AddProfileButton"
+                            x:Uid="NewTabMenu_AddProfileButton"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Click="AddProfileButton_Clicked">
+                        <Button.Content>
+                            <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                      Glyph="&#xE710;" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+            </local:SettingContainer>
+
+            <!--  Add Separator  -->
+            <local:SettingContainer x:Name="AddSeparator"
+                                    x:Uid="NewTabMenu_AddSeparator"
+                                    FontIconGlyph="&#xE76f;"
+                                    Style="{StaticResource SettingContainerWithIcon}">
+                <Button x:Name="AddSeparatorButton"
+                        x:Uid="NewTabMenu_AddSeparatorButton"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Click="AddSeparatorButton_Clicked">
+                    <Button.Content>
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE710;" />
+                    </Button.Content>
+                </Button>
+            </local:SettingContainer>
+
+            <!--  Add Folder  -->
+            <local:SettingContainer x:Name="AddFolder"
+                                    x:Uid="NewTabMenu_AddFolder"
+                                    FontIconGlyph="&#xF12B;"
+                                    Style="{StaticResource SettingContainerWithIcon}">
+                <StackPanel Orientation="Horizontal"
+                            Spacing="5">
+                    <TextBox x:Name="FolderNameTextBox"
+                             x:Uid="NewTabMenu_AddFolder_FolderName"
+                             MinWidth="{StaticResource StandardBoxMinWidth}"
+                             KeyDown="AddFolderNameTextBox_KeyDown"
+                             Text="{x:Bind ViewModel.AddFolderName, Mode=TwoWay}"
+                             TextChanged="AddFolderNameTextBox_TextChanged" />
+                    <Button x:Name="AddFolderButton"
+                            x:Uid="NewTabMenu_AddFolderButton"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Click="AddFolderButton_Clicked"
+                            IsEnabled="False">
+                        <Button.Content>
+                            <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                      Glyph="&#xE710;" />
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+            </local:SettingContainer>
+
+            <!--  Add Match Profiles  -->
+            <local:SettingContainer x:Name="AddMatchProfiles"
+                                    x:Uid="NewTabMenu_AddMatchProfiles"
+                                    FontIconGlyph="&#xE748;"
+                                    Style="{StaticResource ExpanderSettingContainerStyleWithIcon}">
+                <StackPanel Spacing="8">
+                    <HyperlinkButton x:Uid="NewTabMenu_AddMatchProfiles_Help"
+                                     NavigateUri="https://learn.microsoft.com/en-us/dotnet/standard/base-types/regular-expression-language-quick-reference" />
+                    <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Name"
+                             Text="{x:Bind ViewModel.ProfileMatcherName, Mode=TwoWay}" />
+                    <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Source"
+                             Text="{x:Bind ViewModel.ProfileMatcherSource, Mode=TwoWay}" />
+                    <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Commandline"
+                             Text="{x:Bind ViewModel.ProfileMatcherCommandline, Mode=TwoWay}" />
+                    <Button x:Name="AddMatchProfilesButton"
+                            Click="AddMatchProfilesButton_Clicked">
+                        <Button.Content>
+                            <StackPanel Orientation="Horizontal">
+                                <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                          Glyph="&#xE710;" />
+                                <TextBlock x:Uid="NewTabMenu_AddMatchProfilesTextBlock"
+                                           Style="{StaticResource IconButtonTextBlockStyle}" />
+                            </StackPanel>
+                        </Button.Content>
+                    </Button>
+                </StackPanel>
+            </local:SettingContainer>
+
+            <!--  Add Remaining Profiles  -->
+            <local:SettingContainer x:Name="AddRemainingProfiles"
+                                    x:Uid="NewTabMenu_AddRemainingProfiles"
+                                    FontIconGlyph="&#xE902;"
+                                    Style="{StaticResource SettingContainerWithIcon}">
+                <Button x:Name="AddRemainingProfilesButton"
+                        x:Uid="NewTabMenu_AddRemainingProfilesButton"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Click="AddRemainingProfilesButton_Clicked"
+                        IsEnabled="{x:Bind ViewModel.IsRemainingProfilesEntryMissing, Mode=OneWay}">
+                    <Button.Content>
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE710;" />
+                    </Button.Content>
+                </Button>
+            </local:SettingContainer>
+        </StackPanel>
     </Grid>
 </Page>

src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp

@@ -127,10 +127,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             {
                 _NotifyChanges(L"TabColorPreview");
             }
-            else if (viewModelProperty == L"Name" || viewModelProperty == L"IsBaseLayer")
-            {
-                _NotifyChanges(L"SectionHeaderText");
-            }
         });
 
         _defaultAppearanceViewModel.PropertyChanged([this](auto&&, const PropertyChangedEventArgs& args) {
@@ -361,15 +357,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return RS_(L"Profile_TabTitleNone");
     }
 
-    hstring ProfileViewModel::SectionHeaderText() const
-    {
-        if (IsBaseLayer())
-        {
-            return RS_(L"Profile_DefaultsSectionHeader");
-        }
-        return hstring{ RS_fmt(L"Profile_NameSectionHeaderFormat", Name()) };
-    }
-
     hstring ProfileViewModel::AnswerbackMessagePreview() const
     {
         if (const auto answerbackMessage{ AnswerbackMessage() }; !answerbackMessage.empty())

src/cascadia/TerminalSettingsEditor/ProfileViewModel.h

@@ -100,7 +100,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool AutoMarkPromptsAvailable() const noexcept;
         bool RepositionCursorWithMouseAvailable() const noexcept;
 
-        hstring SectionHeaderText() const;
         bool Orphaned() const;
         hstring TabTitlePreview() const;
         hstring AnswerbackMessagePreview() const;

src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl

@@ -105,7 +105,6 @@ namespace Microsoft.Terminal.Settings.Editor
         void CreateUnfocusedAppearance();
         void DeleteUnfocusedAppearance();
 
-        String SectionHeaderText { get; };
         Boolean Orphaned { get; };
         OBSERVABLE_PROJECTED_PROFILE_SETTING(String, Name);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Guid, Guid);

src/cascadia/TerminalSettingsEditor/Profiles.cpp

@@ -1,94 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "Profiles.h"
-#include "Profiles.g.cpp"
-#include "ProfilesPageViewModel.g.cpp"
-#include "ProfileViewModel.h"
-
-using namespace winrt::Windows::Foundation;
-using namespace winrt::Windows::Foundation::Collections;
-using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::UI::Xaml::Navigation;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    Profiles::Profiles()
-    {
-        InitializeComponent();
-
-        Automation::AutomationProperties::SetName(DefaultsNavigator(), RS_(L"Profiles_DefaultsNavigator_Title/Text"));
-        Automation::AutomationProperties::SetName(ColorSchemesNavigator(), RS_(L"Profiles_ColorSchemesNavigator_Title/Text"));
-        Automation::AutomationProperties::SetName(AddProfileButton(), RS_(L"Profiles_AddProfileButton/Text"));
-    }
-
-    void Profiles::OnNavigatedTo(const NavigationEventArgs& e)
-    {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ProfilesPageViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
-
-        TraceLoggingWrite(
-            g_hTerminalSettingsEditorProvider,
-            "NavigatedToPage",
-            TraceLoggingDescription("Event emitted when the user navigates to a page in the settings UI"),
-            TraceLoggingValue("profilesLanding", "PageId", "The identifier of the page that was navigated to"),
-            TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-            TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
-    }
-
-    void Profiles::Defaults_Click(const IInspectable& /*sender*/, const RoutedEventArgs& /*args*/)
-    {
-        _ViewModel.RequestOpenDefaults();
-    }
-
-    void Profiles::ColorSchemes_Click(const IInspectable& /*sender*/, const RoutedEventArgs& /*args*/)
-    {
-        _ViewModel.RequestOpenColorSchemes();
-    }
-
-    void Profiles::AddProfile_Click(const IInspectable& /*sender*/, const RoutedEventArgs& /*args*/)
-    {
-        _ViewModel.RequestAddProfile();
-    }
-
-    void Profiles::Profile_Click(const IInspectable& sender, const RoutedEventArgs& /*args*/)
-    {
-        // Profile navigators are buttons whose DataContext is the bound ProfileViewModel.
-        if (const auto element = sender.try_as<FrameworkElement>())
-        {
-            if (const auto profile = element.DataContext().try_as<Editor::ProfileViewModel>())
-            {
-                _ViewModel.RequestOpenProfile(profile);
-            }
-        }
-    }
-
-    ProfilesPageViewModel::ProfilesPageViewModel()
-    {
-        _setProfiles(single_threaded_observable_vector<Editor::ProfileViewModel>());
-    }
-
-    void ProfilesPageViewModel::RequestOpenDefaults()
-    {
-        OpenDefaultsRequested.raise(*this, nullptr);
-    }
-
-    void ProfilesPageViewModel::RequestOpenColorSchemes()
-    {
-        OpenColorSchemesRequested.raise(*this, nullptr);
-    }
-
-    void ProfilesPageViewModel::RequestAddProfile()
-    {
-        AddProfileRequested.raise(*this, nullptr);
-    }
-
-    void ProfilesPageViewModel::RequestOpenProfile(const Editor::ProfileViewModel& profile)
-    {
-        OpenProfileRequested.raise(*this, profile);
-    }
-
-}

src/cascadia/TerminalSettingsEditor/Profiles.h

@@ -1,67 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- Profiles.h
-
-Abstract:
-- The Profiles landing page in the Settings UI. The page hosts entry points to
-  the list of individual profiles among other profile-related settings.
-
---*/
-
-#pragma once
-
-#include "Profiles.g.h"
-#include "ProfilesPageViewModel.g.h"
-#include "ProfileViewModel.h"
-#include "Utils.h"
-#include "ViewModelHelpers.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct ProfilesPageViewModel : ProfilesPageViewModelT<ProfilesPageViewModel>, ViewModelHelper<ProfilesPageViewModel>
-    {
-    public:
-        ProfilesPageViewModel();
-
-        void RequestOpenDefaults();
-        void RequestOpenColorSchemes();
-        void RequestAddProfile();
-        void RequestOpenProfile(const Editor::ProfileViewModel& profile);
-
-        // DON'T YOU DARE ADD A `WINRT_CALLBACK(PropertyChanged` TO A CLASS DERIVED FROM ViewModelHelper. Do this instead:
-        using ViewModelHelper<ProfilesPageViewModel>::PropertyChanged;
-
-        WINRT_OBSERVABLE_PROPERTY(Windows::Foundation::Collections::IObservableVector<Editor::ProfileViewModel>, Profiles, _propertyChangedHandlers, nullptr);
-
-    public:
-        til::typed_event<Windows::Foundation::IInspectable, Windows::Foundation::IInspectable> OpenDefaultsRequested;
-        til::typed_event<Windows::Foundation::IInspectable, Windows::Foundation::IInspectable> OpenColorSchemesRequested;
-        til::typed_event<Windows::Foundation::IInspectable, Windows::Foundation::IInspectable> AddProfileRequested;
-        til::typed_event<Windows::Foundation::IInspectable, Editor::ProfileViewModel> OpenProfileRequested;
-    };
-
-    struct Profiles : public HasScrollViewer<Profiles>, ProfilesT<Profiles>
-    {
-    public:
-        Profiles();
-
-        void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
-
-        void Defaults_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
-        void ColorSchemes_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
-        void AddProfile_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
-        void Profile_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
-
-        til::property_changed_event PropertyChanged;
-        WINRT_PROPERTY(Editor::ProfilesPageViewModel, ViewModel, nullptr);
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(Profiles);
-    BASIC_FACTORY(ProfilesPageViewModel);
-}

src/cascadia/TerminalSettingsEditor/Profiles.idl

@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import "ProfileViewModel.idl";
-import "ColorSchemeViewModel.idl";
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    runtimeclass ProfilesPageViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
-    {
-        ProfilesPageViewModel();
-
-        Windows.Foundation.Collections.IObservableVector<ProfileViewModel> Profiles { get; };
-
-        void RequestOpenDefaults();
-        void RequestOpenColorSchemes();
-        void RequestAddProfile();
-        void RequestOpenProfile(ProfileViewModel profile);
-
-        event Windows.Foundation.TypedEventHandler<Object, IInspectable> OpenDefaultsRequested;
-        event Windows.Foundation.TypedEventHandler<Object, IInspectable> OpenColorSchemesRequested;
-        event Windows.Foundation.TypedEventHandler<Object, IInspectable> AddProfileRequested;
-        event Windows.Foundation.TypedEventHandler<Object, ProfileViewModel> OpenProfileRequested;
-    }
-
-    [default_interface] runtimeclass Profiles : Windows.UI.Xaml.Controls.Page
-    {
-        Profiles();
-        ProfilesPageViewModel ViewModel { get; };
-    }
-}

src/cascadia/TerminalSettingsEditor/Profiles.xaml

@@ -1,136 +0,0 @@
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-    the MIT License. See LICENSE in the project root for license information.
--->
-<Page x:Class="Microsoft.Terminal.Settings.Editor.Profiles"
-      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">
-
-    <Page.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="CommonResources.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-
-            <DataTemplate x:Key="ProfileNavigatorTemplate"
-                          x:DataType="local:ProfileViewModel">
-                <Button HorizontalAlignment="Stretch"
-                        AutomationProperties.Name="{x:Bind Name, Mode=OneWay}"
-                        Click="Profile_Click"
-                        Style="{StaticResource NavigatorButtonStyle}">
-                    <Grid ColumnSpacing="12">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="16" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <ContentControl Grid.Column="0"
-                                        Width="16"
-                                        Height="16"
-                                        VerticalAlignment="Center"
-                                        Content="{x:Bind IconPreview, Mode=OneWay}"
-                                        IsTabStop="False" />
-                        <TextBlock Grid.Column="1"
-                                   VerticalAlignment="Center"
-                                   Style="{StaticResource BodyStrongTextBlockStyle}"
-                                   Text="{x:Bind Name, Mode=OneWay}"
-                                   TextTrimming="CharacterEllipsis" />
-                        <muxc:InfoBadge Grid.Column="2"
-                                        Margin="0,0,8,0"
-                                        VerticalAlignment="Center"
-                                        Visibility="{x:Bind Hidden, Mode=OneWay}">
-                            <muxc:InfoBadge.IconSource>
-                                <muxc:FontIconSource FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
-                                                     FontSize="12"
-                                                     Glyph="&#xED1A;" />
-                            </muxc:InfoBadge.IconSource>
-                        </muxc:InfoBadge>
-                        <muxc:InfoBadge Grid.Column="2"
-                                        Margin="0,0,8,0"
-                                        VerticalAlignment="Center"
-                                        Visibility="{x:Bind Orphaned, Mode=OneWay}">
-                            <muxc:InfoBadge.IconSource>
-                                <muxc:FontIconSource FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
-                                                     FontSize="12"
-                                                     Glyph="&#xE7BA;" />
-                            </muxc:InfoBadge.IconSource>
-                        </muxc:InfoBadge>
-                    </Grid>
-                </Button>
-            </DataTemplate>
-        </ResourceDictionary>
-    </Page.Resources>
-
-    <StackPanel Style="{StaticResource SettingsStackStyle}">
-
-        <!--  General Profile Settings  -->
-        <TextBlock x:Uid="Profiles_GeneralSettingsHeader"
-                   Margin="0,0,0,4"
-                   Style="{StaticResource TextBlockSubHeaderStyle}" />
-
-        <!--  Defaults navigator  -->
-        <Button x:Name="DefaultsNavigator"
-                Click="Defaults_Click"
-                Style="{StaticResource NavigatorButtonStyle}">
-            <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Profiles_DefaultsNavigator_Title"
-                           Style="{StaticResource BodyStrongTextBlockStyle}" />
-                <TextBlock x:Uid="Profiles_DefaultsNavigator_Description"
-                           Margin="0,2,0,0"
-                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                           Style="{StaticResource CaptionTextBlockStyle}"
-                           TextWrapping="Wrap" />
-            </StackPanel>
-        </Button>
-
-        <!--  Color schemes navigator  -->
-        <Button x:Name="ColorSchemesNavigator"
-                Click="ColorSchemes_Click"
-                Style="{StaticResource NavigatorButtonStyle}">
-            <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Profiles_ColorSchemesNavigator_Title"
-                           Style="{StaticResource BodyStrongTextBlockStyle}" />
-                <TextBlock x:Uid="Profiles_ColorSchemesNavigator_Description"
-                           Margin="0,2,0,0"
-                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                           Style="{StaticResource CaptionTextBlockStyle}"
-                           TextWrapping="Wrap" />
-            </StackPanel>
-        </Button>
-
-        <!--  Terminal profiles section  -->
-        <TextBlock x:Uid="Profiles_TerminalProfilesHeader"
-                   Style="{StaticResource TextBlockSubHeaderStyle}" />
-
-        <!--  Add Profile accent button  -->
-        <Button x:Name="AddProfileButton"
-                Margin="0,4,0,0"
-                Click="AddProfile_Click"
-                Style="{StaticResource AccentButtonStyle}">
-            <StackPanel Orientation="Horizontal">
-                <FontIcon FontSize="{StaticResource StandardIconSize}"
-                          Glyph="&#xE710;" />
-                <TextBlock x:Uid="Profiles_AddProfileButton"
-                           Style="{StaticResource IconButtonTextBlockStyle}" />
-            </StackPanel>
-        </Button>
-
-        <!--  List of profiles. Each is a NavigatorButtonStyle button rendered by ProfileNavigatorTemplate.  -->
-        <ItemsControl Margin="0,0,0,16"
-                      ItemTemplate="{StaticResource ProfileNavigatorTemplate}"
-                      ItemsSource="{x:Bind ViewModel.Profiles, Mode=OneWay}">
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel Orientation="Vertical" />
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-    </StackPanel>
-</Page>

src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml

@@ -80,10 +80,11 @@
                                SourceProfile="{x:Bind Profile, Mode=OneWay}"
                                WindowRoot="{x:Bind WindowRoot, Mode=OneTime}" />
 
-            <!--  Section: Window settings  -->
+            <!--  Grouping: Transparency  -->
             <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Profile_Section_Window"
+                <TextBlock x:Uid="Profile_TransparencyHeader"
                            Style="{StaticResource TextBlockSubHeaderStyle}" />
+
                 <!--  Opacity  -->
                 <local:SettingContainer x:Name="Opacity"
                                         x:Uid="Profile_Opacity"
@@ -116,6 +117,13 @@
                                   Style="{StaticResource ToggleSwitchInExpanderStyle}" />
                 </local:SettingContainer>
 
+            </StackPanel>
+
+            <!--  Grouping: Window  -->
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Profile_WindowHeader"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+
                 <!--  Padding  -->
                 <local:SettingContainer x:Name="Padding"
                                         x:Uid="Profile_Padding"

src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp

@@ -23,9 +23,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         Automation::AutomationProperties::SetName(DeleteButton(), RS_(L"Profile_DeleteButton/Text"));
         AppearanceNavigator().Content(box_value(RS_(L"Profile_Appearance/Header")));
-        AppearanceNavigator().Tag(box_value(RS_(L"Profile_AppearanceNavigator/HelpText")));
         TerminalNavigator().Content(box_value(RS_(L"Profile_Terminal/Header")));
-        TerminalNavigator().Tag(box_value(RS_(L"Profile_TerminalNavigator/HelpText")));
         AdvancedNavigator().Content(box_value(RS_(L"Profile_Advanced/Header")));
     }
 

src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml

@@ -34,157 +34,146 @@
         <StackPanel Grid.Row="1"
                     Style="{StaticResource SettingsStackStyle}">
 
-            <!--  Section: {Profile.Name} profile (or "Profile defaults")  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock Margin="0,0,0,4"
-                           Style="{StaticResource TextBlockSubHeaderStyle}"
-                           Text="{x:Bind Profile.SectionHeaderText, Mode=OneWay}" />
-                <!--  Name  -->
-                <!--
-                    NOTE: Has/Clear is not bound because we don't want the reset button & override text to appear.
-                    Additionally, the JSON stubs generated by auto-generated profiles come with a name,
-                    so the name will always be overridden.
-                -->
-                <local:SettingContainer x:Name="Name"
-                                        x:Uid="Profile_Name"
-                                        CurrentValue="{x:Bind Profile.Name, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}"
-                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
-                    <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                             Text="{x:Bind Profile.Name, Mode=TwoWay}" />
-                </local:SettingContainer>
+            <!--  Name  -->
+            <!--
+                NOTE: Has/Clear is not bound because we don't want the reset button & override text to appear.
+                Additionally, the JSON stubs generated by auto-generated profiles come with a name,
+                so the name will always be overridden.
+            -->
+            <local:SettingContainer x:Name="Name"
+                                    x:Uid="Profile_Name"
+                                    CurrentValue="{x:Bind Profile.Name, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}"
+                                    Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                         Text="{x:Bind Profile.Name, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Commandline  -->
-                <local:SettingContainer x:Name="Commandline"
-                                        x:Uid="Profile_Commandline"
-                                        ClearSettingValue="{x:Bind Profile.ClearCommandline}"
-                                        CurrentValue="{x:Bind Profile.Commandline, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Profile.HasCommandline, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.CommandlineOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}"
-                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
-                    <StackPanel>
-                        <TextBox x:Uid="Profile_CommandlineBox"
-                                 IsSpellCheckEnabled="False"
-                                 Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind Profile.Commandline, Mode=TwoWay}" />
-                        <Button x:Uid="Profile_CommandlineBrowse"
-                                Margin="0,8,0,0"
-                                Click="Commandline_Click"
+            <!--  Commandline  -->
+            <local:SettingContainer x:Name="Commandline"
+                                    x:Uid="Profile_Commandline"
+                                    ClearSettingValue="{x:Bind Profile.ClearCommandline}"
+                                    CurrentValue="{x:Bind Profile.Commandline, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasCommandline, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.CommandlineOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}"
+                                    Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                <StackPanel>
+                    <TextBox x:Uid="Profile_CommandlineBox"
+                             IsSpellCheckEnabled="False"
+                             Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind Profile.Commandline, Mode=TwoWay}" />
+                    <Button x:Uid="Profile_CommandlineBrowse"
+                            Margin="0,8,0,0"
+                            Click="Commandline_Click"
+                            Style="{StaticResource BrowseButtonStyle}" />
+                </StackPanel>
+            </local:SettingContainer>
+
+            <!--  Starting Directory  -->
+            <local:SettingContainer x:Name="StartingDirectory"
+                                    x:Uid="Profile_StartingDirectory"
+                                    ClearSettingValue="{x:Bind Profile.ClearStartingDirectory}"
+                                    CurrentValue="{x:Bind Profile.CurrentStartingDirectoryPreview, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasStartingDirectory, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <StackPanel Orientation="Vertical">
+                    <TextBox x:Uid="Profile_StartingDirectoryBox"
+                             IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Profile.UseParentProcessDirectory), Mode=OneWay}"
+                             IsSpellCheckEnabled="False"
+                             Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind Profile.StartingDirectory, Mode=TwoWay}" />
+                    <StackPanel Orientation="Horizontal">
+                        <Button x:Name="StartingDirectoryBrowse"
+                                x:Uid="Profile_StartingDirectoryBrowse"
+                                Margin="0,12,12,0"
+                                Click="StartingDirectory_Click"
+                                IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Profile.UseParentProcessDirectory), Mode=OneWay}"
                                 Style="{StaticResource BrowseButtonStyle}" />
+                        <CheckBox x:Name="StartingDirectoryUseParentCheckbox"
+                                  x:Uid="Profile_StartingDirectoryUseParentCheckbox"
+                                  Margin="0,4,0,0"
+                                  IsChecked="{x:Bind Profile.UseParentProcessDirectory, Mode=TwoWay}" />
                     </StackPanel>
-                </local:SettingContainer>
+                </StackPanel>
+            </local:SettingContainer>
 
-                <!--  Starting Directory  -->
-                <local:SettingContainer x:Name="StartingDirectory"
-                                        x:Uid="Profile_StartingDirectory"
-                                        ClearSettingValue="{x:Bind Profile.ClearStartingDirectory}"
-                                        CurrentValue="{x:Bind Profile.CurrentStartingDirectoryPreview, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Profile.HasStartingDirectory, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <StackPanel Orientation="Vertical">
-                        <TextBox x:Uid="Profile_StartingDirectoryBox"
-                                 IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Profile.UseParentProcessDirectory), Mode=OneWay}"
-                                 IsSpellCheckEnabled="False"
-                                 Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind Profile.StartingDirectory, Mode=TwoWay}" />
-                        <StackPanel Orientation="Horizontal">
-                            <Button x:Name="StartingDirectoryBrowse"
-                                    x:Uid="Profile_StartingDirectoryBrowse"
-                                    Margin="0,12,12,0"
-                                    Click="StartingDirectory_Click"
-                                    IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Profile.UseParentProcessDirectory), Mode=OneWay}"
-                                    Style="{StaticResource BrowseButtonStyle}" />
-                            <CheckBox x:Name="StartingDirectoryUseParentCheckbox"
-                                      x:Uid="Profile_StartingDirectoryUseParentCheckbox"
-                                      Margin="0,4,0,0"
-                                      IsChecked="{x:Bind Profile.UseParentProcessDirectory, Mode=TwoWay}" />
-                        </StackPanel>
-                    </StackPanel>
-                </local:SettingContainer>
+            <!--  Icon  -->
+            <local:SettingContainer x:Name="Icon"
+                                    x:Uid="Profile_Icon"
+                                    ClearSettingValue="{x:Bind Profile.ClearIcon}"
+                                    CurrentValueAccessibleName="{x:Bind Profile.LocalizedIcon, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasIcon, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.IconOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                <local:SettingContainer.CurrentValue>
+                    <Grid>
+                        <ContentControl Width="16"
+                                        Height="16"
+                                        Content="{x:Bind Profile.IconPreview, Mode=OneWay}"
+                                        IsTabStop="False"
+                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.UsingNoIcon), Mode=OneWay}" />
+                        <TextBlock Margin="0,0,0,0"
+                                   HorizontalAlignment="Right"
+                                   VerticalAlignment="Center"
+                                   FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
+                                   Style="{StaticResource SettingsPageItemDescriptionStyle}"
+                                   Text="{x:Bind Profile.LocalizedIcon, Mode=OneWay}"
+                                   Visibility="{x:Bind Profile.UsingNoIcon, Mode=OneWay}" />
+                    </Grid>
+                </local:SettingContainer.CurrentValue>
+                <local:SettingContainer.Content>
+                    <local:IconPicker CurrentIconPath="{x:Bind Profile.IconPath, Mode=TwoWay}"
+                                      WindowRoot="{x:Bind WindowRoot, Mode=OneWay}" />
+                </local:SettingContainer.Content>
+            </local:SettingContainer>
 
-                <!--  Elevate  -->
-                <local:SettingContainer x:Name="Elevate"
-                                        x:Uid="Profile_Elevate"
-                                        ClearSettingValue="{x:Bind Profile.ClearElevate}"
-                                        HasSettingValue="{x:Bind Profile.HasElevate, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.ElevateOverrideSource, Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Profile.Elevate, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Tab Title  -->
+            <local:SettingContainer x:Name="TabTitle"
+                                    x:Uid="Profile_TabTitle"
+                                    ClearSettingValue="{x:Bind Profile.ClearTabTitle}"
+                                    CurrentValue="{x:Bind Profile.TabTitlePreview, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasTabTitle, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.TabTitleOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                         Text="{x:Bind Profile.TabTitle, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-            <!--  Section: Visual/UI Affordance  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Profile_Section_VisualUI"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-                <!--  Tab Title  -->
-                <local:SettingContainer x:Name="TabTitle"
-                                        x:Uid="Profile_TabTitle"
-                                        ClearSettingValue="{x:Bind Profile.ClearTabTitle}"
-                                        CurrentValue="{x:Bind Profile.TabTitlePreview, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Profile.HasTabTitle, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.TabTitleOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                             Text="{x:Bind Profile.TabTitle, Mode=TwoWay}" />
-                </local:SettingContainer>
+            <!--  Tab Color  -->
+            <local:SettingContainer x:Name="TabColor"
+                                    x:Uid="Profile_TabColor"
+                                    ClearSettingValue="{x:Bind Profile.ClearTabColor}"
+                                    CurrentValue="{x:Bind Profile.TabColorPreview, Mode=OneWay}"
+                                    CurrentValueAccessibleName="{x:Bind Profile.TabColorPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
+                                    CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
+                                    HasSettingValue="{x:Bind Profile.HasTabColor, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.TabColorOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                <local:NullableColorPicker x:Uid="Profile_TabColor_NullableColorPicker"
+                                           ColorSchemeVM="{x:Bind Profile.DefaultAppearance.CurrentColorScheme, Mode=OneWay}"
+                                           CurrentColor="{x:Bind Profile.TabColor, Mode=TwoWay}"
+                                           NullColorPreview="{x:Bind Profile.TabThemeColorPreview, Mode=OneWay}" />
+            </local:SettingContainer>
 
-                <!--  Tab Color  -->
-                <local:SettingContainer x:Name="TabColor"
-                                        x:Uid="Profile_TabColor"
-                                        ClearSettingValue="{x:Bind Profile.ClearTabColor}"
-                                        CurrentValue="{x:Bind Profile.TabColorPreview, Mode=OneWay}"
-                                        CurrentValueAccessibleName="{x:Bind Profile.TabColorPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
-                                        CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
-                                        HasSettingValue="{x:Bind Profile.HasTabColor, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.TabColorOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                    <local:NullableColorPicker x:Uid="Profile_TabColor_NullableColorPicker"
-                                               ColorSchemeVM="{x:Bind Profile.DefaultAppearance.CurrentColorScheme, Mode=OneWay}"
-                                               CurrentColor="{x:Bind Profile.TabColor, Mode=TwoWay}"
-                                               NullColorPreview="{x:Bind Profile.TabThemeColorPreview, Mode=OneWay}" />
-                </local:SettingContainer>
+            <!--  Elevate  -->
+            <local:SettingContainer x:Name="Elevate"
+                                    x:Uid="Profile_Elevate"
+                                    ClearSettingValue="{x:Bind Profile.ClearElevate}"
+                                    HasSettingValue="{x:Bind Profile.HasElevate, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.ElevateOverrideSource, Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Profile.Elevate, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Icon  -->
-                <local:SettingContainer x:Name="Icon"
-                                        x:Uid="Profile_Icon"
-                                        ClearSettingValue="{x:Bind Profile.ClearIcon}"
-                                        CurrentValueAccessibleName="{x:Bind Profile.LocalizedIcon, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Profile.HasIcon, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.IconOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                    <local:SettingContainer.CurrentValue>
-                        <Grid>
-                            <ContentControl Width="16"
-                                            Height="16"
-                                            Content="{x:Bind Profile.IconPreview, Mode=OneWay}"
-                                            IsTabStop="False"
-                                            Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.UsingNoIcon), Mode=OneWay}" />
-                            <TextBlock Margin="0,0,0,0"
-                                       HorizontalAlignment="Right"
-                                       VerticalAlignment="Center"
-                                       FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
-                                       Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                       Text="{x:Bind Profile.LocalizedIcon, Mode=OneWay}"
-                                       Visibility="{x:Bind Profile.UsingNoIcon, Mode=OneWay}" />
-                        </Grid>
-                    </local:SettingContainer.CurrentValue>
-                    <local:SettingContainer.Content>
-                        <local:IconPicker CurrentIconPath="{x:Bind Profile.IconPath, Mode=TwoWay}"
-                                          WindowRoot="{x:Bind WindowRoot, Mode=OneWay}" />
-                    </local:SettingContainer.Content>
-                </local:SettingContainer>
-
-                <!--  Hidden  -->
-                <local:SettingContainer x:Name="Hidden"
-                                        x:Uid="Profile_Hidden"
-                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Profile.Hidden, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
+            <!--  Hidden  -->
+            <local:SettingContainer x:Name="Hidden"
+                                    x:Uid="Profile_Hidden"
+                                    Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Profile.Hidden, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
             <TextBlock x:Uid="Profile_AdditionalSettingsHeader"
                        Margin="0,32,0,4"

src/cascadia/TerminalSettingsEditor/Rendering.cpp

@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "Rendering.h"
+#include "Rendering.g.cpp"
+
+using namespace winrt::Windows::UI::Xaml::Navigation;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    Rendering::Rendering()
+    {
+        InitializeComponent();
+    }
+
+    void Rendering::OnNavigatedTo(const NavigationEventArgs& e)
+    {
+        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
+        _ViewModel = args.ViewModel().as<Editor::RenderingViewModel>();
+        BringIntoViewWhenLoaded(args.ElementToFocus());
+
+        TraceLoggingWrite(
+            g_hTerminalSettingsEditorProvider,
+            "NavigatedToPage",
+            TraceLoggingDescription("Event emitted when the user navigates to a page in the settings UI"),
+            TraceLoggingValue("rendering", "PageId", "The identifier of the page that was navigated to"),
+            TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
+            TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
+    }
+}

src/cascadia/TerminalSettingsEditor/Rendering.h

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "Rendering.g.h"
+#include "Utils.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct Rendering : public HasScrollViewer<Rendering>, RenderingT<Rendering>
+    {
+        Rendering();
+
+        void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
+
+        til::property_changed_event PropertyChanged;
+        WINRT_OBSERVABLE_PROPERTY(Editor::RenderingViewModel, ViewModel, PropertyChanged.raise, nullptr);
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
+{
+    BASIC_FACTORY(Rendering);
+}

src/cascadia/TerminalSettingsEditor/Rendering.idl

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import "RenderingViewModel.idl";
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    [default_interface] runtimeclass Rendering : Windows.UI.Xaml.Controls.Page
+    {
+        Rendering();
+        RenderingViewModel ViewModel { get; };
+    }
+}

src/cascadia/TerminalSettingsEditor/Rendering.xaml

@@ -0,0 +1,48 @@
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
+    the MIT License. See LICENSE in the project root for license information.
+-->
+<Page x:Class="Microsoft.Terminal.Settings.Editor.Rendering"
+      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"
+      mc:Ignorable="d">
+
+    <Page.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="CommonResources.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+
+            <DataTemplate x:Key="EnumComboBoxTemplate"
+                          x:DataType="local:EnumEntry">
+                <TextBlock Text="{x:Bind EnumName}" />
+            </DataTemplate>
+        </ResourceDictionary>
+    </Page.Resources>
+
+    <StackPanel Style="{StaticResource SettingsStackStyle}">
+        <local:SettingContainer x:Name="GraphicsAPI"
+                                x:Uid="Globals_GraphicsAPI">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.GraphicsAPIList}"
+                      SelectedItem="{x:Bind ViewModel.CurrentGraphicsAPI, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
+
+        <local:SettingContainer x:Name="DisablePartialInvalidation"
+                                x:Uid="Globals_DisablePartialInvalidation">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.DisablePartialInvalidation, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
+
+        <local:SettingContainer x:Name="SoftwareRendering"
+                                x:Uid="Globals_SoftwareRendering">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.SoftwareRendering, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
+    </StackPanel>
+</Page>

src/cascadia/TerminalSettingsEditor/RenderingViewModel.cpp

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "RenderingViewModel.h"
+
+#include "EnumEntry.h"
+
+#include "RenderingViewModel.g.cpp"
+
+using namespace winrt::Windows::Foundation;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    RenderingViewModel::RenderingViewModel(CascadiaSettings settings) noexcept :
+        _settings{ std::move(settings) }
+    {
+        INITIALIZE_BINDABLE_ENUM_SETTING(GraphicsAPI, GraphicsAPI, winrt::Microsoft::Terminal::Control::GraphicsAPI, L"Globals_GraphicsAPI_", L"Text");
+    }
+}

src/cascadia/TerminalSettingsEditor/RenderingViewModel.h

@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "RenderingViewModel.g.h"
+#include "Utils.h"
+#include "ViewModelHelpers.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct RenderingViewModel : RenderingViewModelT<RenderingViewModel>, ViewModelHelper<RenderingViewModel>
+    {
+        explicit RenderingViewModel(Model::CascadiaSettings settings) noexcept;
+
+        GETSET_BINDABLE_ENUM_SETTING(GraphicsAPI, winrt::Microsoft::Terminal::Control::GraphicsAPI, _settings.GlobalSettings().GraphicsAPI);
+        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), DisablePartialInvalidation);
+        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), SoftwareRendering);
+
+    private:
+        Model::CascadiaSettings _settings{ nullptr };
+    };
+};
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
+{
+    BASIC_FACTORY(RenderingViewModel);
+}

src/cascadia/TerminalSettingsEditor/RenderingViewModel.idl

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import "EnumEntry.idl";
+
+#include "ViewModelHelpers.idl.h"
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    runtimeclass RenderingViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
+    {
+        RenderingViewModel(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);
+
+        IInspectable CurrentGraphicsAPI;
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> GraphicsAPIList { get; };
+        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, DisablePartialInvalidation);
+        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, SoftwareRendering);
+    }
+}

src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw

@@ -289,8 +289,8 @@
     <comment>Header for a control to toggle whether the terminal should automatically detect URLs and make them clickable, or not.</comment>
   </data>
   <data name="Globals_SearchWebDefaultQueryUrl.Header" xml:space="preserve">
-    <value>Default URL to use for the "Search web" shortcut</value>
-    <comment>Header for a control to set the query URL when using the "search web" shortcut.</comment>
+    <value>Default URL to use for the "Search web" action</value>
+    <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
   <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
     <value>The placeholder "%s" will be replaced with the search query.</value>
@@ -590,7 +590,7 @@
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
   <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
-    <value>This allows shortcuts such as Global Summon and Quake Mode shortcuts to work even when no windows are open.</value>
+    <value>This allows actions such as Global Summon and Quake Mode actions to work even when no windows are open.</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
   <data name="Globals_TabWidthMode.Header" xml:space="preserve">
@@ -650,8 +650,8 @@
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
   <data name="Nav_Appearance.Content" xml:space="preserve">
-    <value>Personalization</value>
-    <comment>Header for the "personalization" menu item. This navigates to a page that lets you see and modify settings related to the app's appearance.</comment>
+    <value>Appearance</value>
+    <comment>Header for the "appearance" menu item. This navigates to a page that lets you see and modify settings related to the app's appearance.</comment>
   </data>
   <data name="Nav_ColorSchemes.Content" xml:space="preserve">
     <value>Color schemes</value>
@@ -677,13 +677,17 @@
     <value>Defaults</value>
     <comment>Header for the "defaults" menu item. This navigates to a page that lets you see and modify settings that affect profiles. This is the lowest layer of profile settings that all other profile settings are based on. If a profile doesn't define a setting, this page is responsible for figuring out what that setting is supposed to be.</comment>
   </data>
+  <data name="Nav_Rendering.Content" xml:space="preserve">
+    <value>Rendering</value>
+    <comment>Header for the "rendering" menu item. This navigates to a page that lets you see and modify settings related to the app's rendering of text in the terminal.</comment>
+  </data>
   <data name="Nav_Actions.Content" xml:space="preserve">
-    <value>Shortcuts</value>
-    <comment>Header for the "shortcuts" menu item. This navigates to a page that lets you see the available keyboard shortcuts in the app. (Resource key kept as "Nav_Actions" for stability.)</comment>
+    <value>Actions</value>
+    <comment>Header for the "actions" menu item. This navigates to a page that lets you see the available commands in the app.</comment>
   </data>
   <data name="Nav_EditAction.Content" xml:space="preserve">
-    <value>Edit Shortcut...</value>
-    <comment>Header for the "edit shortcut" page. This is the page that lets you modify a specific command and its key bindings. (Resource key kept as "Nav_EditAction" for stability.)</comment>
+    <value>Edit Action...</value>
+    <comment>Header for the "edit action" page. This is the page that lets you modify a specific command and its key bindings.</comment>
   </data>
   <data name="Nav_Extensions.Content" xml:space="preserve">
     <value>Extensions</value>
@@ -1287,39 +1291,7 @@
   </data>
   <data name="Nav_Profiles.Content" xml:space="preserve">
     <value>Profiles</value>
-    <comment>Header for the "profiles" menu item. Navigates to a landing page that lists profile-related settings (defaults, color schemes, the list of terminal profiles, and the add-profile button).</comment>
-  </data>
-  <data name="Nav_Profiles.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Profiles</value>
-    <comment>Tooltip for the "profiles" menu item. Navigates to a landing page that lists profile-related settings.</comment>
-  </data>
-  <data name="Profiles_GeneralSettingsHeader.Text" xml:space="preserve">
-    <value>General Profile Settings</value>
-    <comment>Section header on the Profiles landing page. Introduces general-purpose profile settings such as the defaults shared by all profiles and the color schemes that profiles can use.</comment>
-  </data>
-  <data name="Profiles_TerminalProfilesHeader.Text" xml:space="preserve">
-    <value>Terminal profiles</value>
-    <comment>Section header on the Profiles landing page. Introduces the list of individual terminal profiles configured by the user.</comment>
-  </data>
-  <data name="Profiles_DefaultsNavigator_Title.Text" xml:space="preserve">
-    <value>Defaults</value>
-    <comment>Title for the "Defaults" navigator on the Profiles landing page. Clicking this opens the page where defaults shared by all profiles can be edited.</comment>
-  </data>
-  <data name="Profiles_DefaultsNavigator_Description.Text" xml:space="preserve">
-    <value>Changes made here apply to all profiles unless overridden by a specific profile. These settings do not affect the Windows Terminal appearance.</value>
-    <comment>Help text describing the "Defaults" navigator on the Profiles landing page. Clarifies that the defaults apply to every profile but are not the same as the global Windows Terminal appearance settings.</comment>
-  </data>
-  <data name="Profiles_ColorSchemesNavigator_Title.Text" xml:space="preserve">
-    <value>Color schemes</value>
-    <comment>Title for the "Color schemes" navigator on the Profiles landing page. Clicking this opens the same page reachable from the top-level Color schemes nav item.</comment>
-  </data>
-  <data name="Profiles_ColorSchemesNavigator_Description.Text" xml:space="preserve">
-    <value>Add, edit, or remove the color schemes that your profiles can use.</value>
-    <comment>Help text describing the "Color schemes" navigator on the Profiles landing page.</comment>
-  </data>
-  <data name="Profiles_AddProfileButton.Text" xml:space="preserve">
-    <value>Add a new profile</value>
-    <comment>Text on the accent-colored button on the Profiles landing page. Clicking this opens the page where users can add a new profile.</comment>
+    <comment>Header for the "profiles" menu items. This acts as a divider to introduce profile-related menu items.</comment>
   </data>
   <data name="Globals_LaunchModeFocus.Content" xml:space="preserve">
     <value>Focus</value>
@@ -1617,6 +1589,10 @@
     <value>Name</value>
     <comment>Header for a control to determine the name of the profile. This is a text box.</comment>
   </data>
+  <data name="Profile_TransparencyHeader.Text" xml:space="preserve">
+    <value>Transparency</value>
+    <comment>Header for a group of settings related to transparency, including the acrylic material background of the app.</comment>
+  </data>
   <data name="Profile_BackgroundHeader.Text" xml:space="preserve">
     <value>Background image</value>
     <comment>Header for a group of settings that control the image presented on the background of the app. Presented near "Profile_BackgroundImage" and other keys starting with "Profile_BackgroundImage".</comment>
@@ -1637,6 +1613,10 @@
     <value>Warnings</value>
     <comment>Header for a group of settings that control the warnings in the app.</comment>
   </data>
+  <data name="Profile_WindowHeader.Text" xml:space="preserve">
+    <value>Window</value>
+    <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
+  </data>
   <data name="Nav_OpenJSON.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Open your settings.json file. Alt+Click to open your defaults.json file.</value>
     <comment>{Locked="settings.json"}, {Locked="defaults.json"}</comment>
@@ -1786,28 +1766,28 @@
     <comment>A description for what the delete unfocused appearance button does.</comment>
   </data>
   <data name="Actions_Disclaimer.Content" xml:space="preserve">
-    <value>Learn more about shortcuts</value>
-    <comment>Disclaimer presented at the top of the shortcuts page to redirect the user to documentation regarding keyboard shortcuts.</comment>
+    <value>Learn more about actions</value>
+    <comment>Disclaimer presented at the top of the actions page to redirect the user to documentation regarding actions.</comment>
   </data>
   <data name="Actions_DeleteButton2.Text" xml:space="preserve">
-    <value>Delete shortcut</value>
-    <comment>Button label that deletes the selected shortcut.</comment>
+    <value>Delete action</value>
+    <comment>Button label that deletes the selected action.</comment>
   </data>
   <data name="Actions_Name.Text" xml:space="preserve">
-    <value>Shortcut name</value>
-    <comment>Label for the text box that edits the shortcut name.</comment>
+    <value>Action name</value>
+    <comment>Label for the text box that edits the action name.</comment>
   </data>
   <data name="Actions_NameEntryBox.PlaceholderText" xml:space="preserve">
-    <value>Shortcut name</value>
-    <comment>Placeholder text for the text box where the user can edit the shortcut name.</comment>
+    <value>Action name</value>
+    <comment>Placeholder text for the text box where the user can edit the action name.</comment>
   </data>
   <data name="Actions_ShortcutAction.Text" xml:space="preserve">
-    <value>Shortcut type</value>
-    <comment>Label for the combo box that edits the shortcut type (which action runs when this shortcut is invoked).</comment>
+    <value>Action type</value>
+    <comment>Label for the combo box that edits the action type.</comment>
   </data>
   <data name="Actions_KeyBindingsListView.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Shortcuts</value>
-    <comment>Name for a control which contains the list of keyboard shortcuts for the current command.</comment>
+    <value>Keybindings</value>
+    <comment>Name for a control which contains the list of keybindings for the current command.</comment>
   </data>
   <data name="Actions_CommandDetails.Text" xml:space="preserve">
     <value>Command details</value>
@@ -1818,44 +1798,44 @@
     <comment>Label for the list of editable arguments for the currently selected action.</comment>
   </data>
   <data name="Actions_Keybindings.Text" xml:space="preserve">
-    <value>Shortcuts</value>
-    <comment>Label for the list of editable keyboard shortcuts for the current command.</comment>
+    <value>Keybindings</value>
+    <comment>Label for the list of editable keybindings for the current command.</comment>
   </data>
   <data name="Actions_AddKeyChord.Text" xml:space="preserve">
-    <value>Add shortcut</value>
-    <comment>Button label that adds a keyboard shortcut to the current action.</comment>
+    <value>Add keybinding</value>
+    <comment>Button label that adds a keybinding to the current action.</comment>
   </data>
   <data name="Actions_AdditionalKeyChords" xml:space="preserve">
     <value>and {} more</value>
     <comment>Text that will be read out by a screen reader indicating that additional keybindings exist for this command. {} will be replaced by the number of additional keybindings.</comment>
   </data>
   <data name="Actions_DeleteConfirmationButton.Content" xml:space="preserve">
-    <value>Yes, delete shortcut</value>
-    <comment>Button label that confirms deletion of a keyboard shortcut entry.</comment>
+    <value>Yes, delete key binding</value>
+    <comment>Button label that confirms deletion of a key binding entry.</comment>
   </data>
   <data name="Actions_DeleteConfirmationMessage.Text" xml:space="preserve">
-    <value>Are you sure you want to delete this shortcut?</value>
-    <comment>Confirmation message displayed when the user attempts to delete a keyboard shortcut entry.</comment>
+    <value>Are you sure you want to delete this key binding?</value>
+    <comment>Confirmation message displayed when the user attempts to delete a key binding entry.</comment>
   </data>
   <data name="Actions_CommandDeleteConfirmationButton.Content" xml:space="preserve">
-    <value>Yes, delete shortcut</value>
-    <comment>Button label that confirms deletion of a shortcut entry.</comment>
+    <value>Yes, delete action</value>
+    <comment>Button label that confirms deletion of an action.</comment>
   </data>
   <data name="Actions_CommandDeleteConfirmationMessage.Text" xml:space="preserve">
-    <value>Are you sure you want to delete this shortcut?</value>
-    <comment>Confirmation message displayed when the user attempts to delete a shortcut entry.</comment>
+    <value>Are you sure you want to delete this action?</value>
+    <comment>Confirmation message displayed when the user attempts to delete an action.</comment>
   </data>
   <data name="Actions_InvalidKeyChordMessage" xml:space="preserve">
-    <value>Invalid shortcut. Please enter a valid keyboard shortcut.</value>
-    <comment>Error message displayed when an invalid keyboard shortcut is input by the user.</comment>
+    <value>Invalid key chord. Please enter a valid key chord.</value>
+    <comment>Error message displayed when an invalid key chord is input by the user.</comment>
   </data>
   <data name="Actions_RenameConflictConfirmationAcceptButton" xml:space="preserve">
     <value>Yes</value>
     <comment>Button label that confirms the deletion of a conflicting key binding to allow the current key binding to be registered.</comment>
   </data>
   <data name="Actions_RenameConflictConfirmationMessage" xml:space="preserve">
-    <value>The provided shortcut is already being used by the following action:</value>
-    <comment>Error message displayed when a keyboard shortcut that is already in use is input by the user. The name of the conflicting shortcut is displayed after this message.</comment>
+    <value>The provided key chord is already being used by the following action:</value>
+    <comment>Error message displayed when a key chord that is already in use is input by the user. The name of the conflicting key chord is displayed after this message.</comment>
   </data>
   <data name="Actions_RenameConflictConfirmationQuestion" xml:space="preserve">
     <value>Would you like to overwrite it?</value>
@@ -1882,60 +1862,12 @@
     <comment>Text label for a button that can be used to begin making changes to a key binding entry.</comment>
   </data>
   <data name="Actions_AddNewTextBlock.Text" xml:space="preserve">
-    <value>Add new shortcut</value>
-    <comment>Button label that creates a new keyboard shortcut on the shortcuts page.</comment>
+    <value>Add new</value>
+    <comment>Button label that creates a new action on the actions page.</comment>
   </data>
-  <data name="Actions_ViewAllKeyChordsButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>View all shortcuts</value>
-    <comment>Tooltip for a button on each row of the Shortcuts page that opens a flyout listing every keyboard shortcut registered for that action.</comment>
-  </data>
-  <data name="Actions_NoKeyBindings.Text" xml:space="preserve">
-    <value>No shortcuts</value>
-    <comment>Empty-state message shown inside the "view all shortcuts" flyout (opened from each row's "..." button on the Shortcuts page) when the action has no keyboard shortcuts registered.</comment>
-  </data>
-  <data name="EditAction_ActionType.Header" xml:space="preserve">
-    <value>Shortcut type</value>
-    <comment>Header for the shortcut-type setting on the Edit Shortcut page (lets the user pick which action runs when this shortcut is invoked).</comment>
-  </data>
-  <data name="EditAction_ActionName.Header" xml:space="preserve">
-    <value>Shortcut name</value>
-    <comment>Header for the shortcut-name setting on the Edit Shortcut page (lets the user provide a friendly name for this shortcut).</comment>
-  </data>
-  <data name="EditAction_KeyBindings.Header" xml:space="preserve">
-    <value>Shortcuts</value>
-    <comment>Header for the shortcuts expander on the Edit Shortcut page.</comment>
-  </data>
-  <data name="EditAction_KeyBindings.HelpText" xml:space="preserve">
-    <value>Customize keyboard shortcuts to speed up common actions and workflows.</value>
-    <comment>Help text shown under the "Shortcuts" header on the Edit Shortcut page.</comment>
-  </data>
-  <data name="EditAction_NewKeyBinding.Header" xml:space="preserve">
-    <value>New shortcut</value>
-    <comment>Header for the "add a new shortcut" row on the Edit Shortcut page.</comment>
-  </data>
-  <data name="EditAction_AddKeyBinding.Content" xml:space="preserve">
-    <value>Add shortcut</value>
-    <comment>Label for the accent button that appends a new keyboard shortcut to the current action.</comment>
-  </data>
-  <data name="EditAction_AdditionalCustomizations.Header" xml:space="preserve">
-    <value>Additional customizations</value>
-    <comment>Header for the additional customizations expander on the Edit Action page (contains action name and per-action argument settings).</comment>
-  </data>
-  <data name="EditAction_AdditionalCustomizations.HelpText" xml:space="preserve">
-    <value>Fine tune how shortcuts behave.</value>
-    <comment>Help text shown under the "Additional customizations" header on the Edit Shortcut page.</comment>
-  </data>
-  <data name="EditAction_KeyBindingNumberFormat" xml:space="preserve">
-    <value>Shortcut #{}</value>
-    <comment>{Locked="#{}"} Header label for an individual keyboard shortcut inside the "Shortcuts" expander on the Edit Shortcut page. {} is replaced with the 1-based index of the shortcut (e.g. "Shortcut #1").</comment>
-  </data>
-  <data name="EditAction_DeleteCommand.Header" xml:space="preserve">
-    <value>Delete this shortcut</value>
-    <comment>Header for the setting container that holds the "Delete shortcut" button at the bottom of the Edit Shortcut page.</comment>
-  </data>
-  <data name="EditAction_DeleteCommand.HelpText" xml:space="preserve">
-    <value>This shortcut will be removed and any shortcuts associated with it will no longer work.</value>
-    <comment>Help text shown under the "Delete this shortcut" setting container on the Edit Shortcut page.</comment>
+  <data name="Actions_ActionComboBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Action</value>
+    <comment>Label for a control that sets the action of a key binding.</comment>
   </data>
   <data name="Actions_NullEnumValue" xml:space="preserve">
     <value>Use global setting</value>
@@ -2466,8 +2398,8 @@
     <comment>Accessible name for a control allowing the user to select the icon from a list of built in icons.</comment>
   </data>
   <data name="Nav_NewTabMenu.Content" xml:space="preserve">
-    <value>Dropdown Menu</value>
-    <comment>Header for the "dropdown menu" menu item (formerly "new tab menu"). This navigates to a page that lets you see and modify settings related to the app's dropdown menu (i.e. profile ordering, nested folders, dividers, etc.)</comment>
+    <value>New Tab Menu</value>
+    <comment>Header for the "new tab menu" menu item. This navigates to a page that lets you see and modify settings related to the app's new tab menu (i.e. profile ordering, nested folders, dividers, etc.)</comment>
   </data>
   <data name="NewTabMenuEntry_Separator.Text" xml:space="preserve">
     <value>&lt;Separator&gt;</value>
@@ -2848,100 +2780,4 @@
     <value>This text will be inserted between the paths of multiple files dropped into the terminal.</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
-  <data name="Launch_Section_LaunchBehavior.Text" xml:space="preserve">
-    <value>Launch behavior</value>
-    <comment>Title of a section that groups settings that control how the terminal opens and behaves when launched.</comment>
-  </data>
-  <data name="Launch_Section_SystemInputDefaults.Text" xml:space="preserve">
-    <value>System &amp; input defaults</value>
-    <comment>Title of a section that groups settings for default system and input behaviors.</comment>
-  </data>
-  <data name="Interaction_Section_Clipboard.Text" xml:space="preserve">
-    <value>Clipboard and paste behavior</value>
-    <comment>Title of a section that groups settings related to selection, copying, and pasting.</comment>
-  </data>
-  <data name="Interaction_Section_TextSelection.Text" xml:space="preserve">
-    <value>Text selection &amp; editing</value>
-    <comment>Title of a section that groups settings related to text selection and editing.</comment>
-  </data>
-  <data name="Interaction_Section_WindowLayout.Text" xml:space="preserve">
-    <value>Window and layout behavior</value>
-    <comment>Title of a section that groups settings related to window sizing, arrangement, and grouping.</comment>
-  </data>
-  <data name="Interaction_Section_MouseScrolling.Text" xml:space="preserve">
-    <value>Mouse &amp; scrolling</value>
-    <comment>Title of a section that groups settings related to mouse and scroll wheel input.</comment>
-  </data>
-  <data name="Interaction_Section_UrlsExternal.Text" xml:space="preserve">
-    <value>URLs &amp; external actions</value>
-    <comment>Title of a section that groups settings related to URLs and external app actions.</comment>
-  </data>
-  <data name="Interaction_Section_Warnings.Text" xml:space="preserve">
-    <value>Warnings</value>
-    <comment>Title of a section that groups warning-related settings.</comment>
-  </data>
-  <data name="Globals_Section_VisualStyle.Text" xml:space="preserve">
-    <value>Visual style</value>
-    <comment>Title of a section that groups settings related to the terminal's visual appearance.</comment>
-  </data>
-  <data name="Globals_Section_TabsLayout.Text" xml:space="preserve">
-    <value>Tabs and layout</value>
-    <comment>Title of a section that groups settings related to tabs and pane layout.</comment>
-  </data>
-  <data name="Globals_Section_WindowBehavior.Text" xml:space="preserve">
-    <value>Window behavior</value>
-    <comment>Title of a section that groups settings related to terminal window behavior.</comment>
-  </data>
-  <data name="Globals_Section_TitleBarIdentity.Text" xml:space="preserve">
-    <value>Title bar &amp; identity</value>
-    <comment>Title of a section that groups settings related to title bar identity and indicators.</comment>
-  </data>
-  <data name="Globals_Section_SystemIntegration.Text" xml:space="preserve">
-    <value>System integration &amp; notifications</value>
-    <comment>Title of a section that groups settings related to system integration and notifications.</comment>
-  </data>
-  <data name="Compatibility_Section_Compatibility.Text" xml:space="preserve">
-    <value>Compatibility</value>
-    <comment>Title of a section that groups compatibility-related settings.</comment>
-  </data>
-  <data name="Compatibility_Section_Rendering.Text" xml:space="preserve">
-    <value>Rendering</value>
-    <comment>Title of a section that groups rendering-related settings.</comment>
-  </data>
-  <data name="Profile_Section_VisualUI.Text" xml:space="preserve">
-    <value>Visual/UI Affordance</value>
-    <comment>Title of a section in a profile page that groups visual and UI settings (tab title, icon, tab color, etc.).</comment>
-  </data>
-  <data name="Profile_Section_Window.Text" xml:space="preserve">
-    <value>Window settings</value>
-    <comment>Title of a section expander on the Profile Appearance page that groups window-level appearance settings (background opacity, acrylic, padding, scrollbar visibility).</comment>
-  </data>
-  <data name="Profile_NameSectionHeaderFormat" xml:space="preserve">
-    <value>{0} profile</value>
-    <comment>Localizable format string used as the section header for a profile (e.g. "PowerShell profile"). {0} is replaced by the profile's name. Reorder the placeholder if your language requires a different word order.</comment>
-  </data>
-  <data name="Profile_DefaultsSectionHeader" xml:space="preserve">
-    <value>Profile defaults</value>
-    <comment>Header used in place of the "{name} profile" header when the page is showing the profile-defaults layer (which has no profile name).</comment>
-  </data>
-  <data name="Appearance_Section_Typography.Text" xml:space="preserve">
-    <value>Typography settings</value>
-    <comment>Title of a section that groups settings controlling how text looks in a profile.</comment>
-  </data>
-  <data name="Appearance_Section_Cursor.Text" xml:space="preserve">
-    <value>Cursor settings</value>
-    <comment>Title of a section that groups settings controlling the cursor.</comment>
-  </data>
-  <data name="Appearance_Section_BackgroundImage.Text" xml:space="preserve">
-    <value>Background image</value>
-    <comment>Title of a section that groups settings controlling the background image.</comment>
-  </data>
-  <data name="Profile_AppearanceNavigator.HelpText" xml:space="preserve">
-    <value>Customize the visual appearance of the profile, including colors, fonts, and text styling.</value>
-    <comment>Help text shown below the "Appearance" navigator button on the profile page.</comment>
-  </data>
-  <data name="Profile_TerminalNavigator.HelpText" xml:space="preserve">
-    <value>Terminal emulation is how a terminal app interprets text and control sequences to behave like a traditional command-line terminal.</value>
-    <comment>Help text shown below the "Terminal" navigator button on the profile page.</comment>
-  </data>
-</root>
+</root>

src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw

@@ -2201,26 +2201,10 @@
     <value>关闭多个选项卡时发出警告</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.Header" xml:space="preserve">
-    <value>关闭时发出警告</value>
-    <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
-  </data>
   <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
     <value>控制在关闭选项卡或窗口之前何时显示确认对话框。“始终”在关闭任何窗格时显示对话框。</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
-  <data name="Globals_ConfirmOnCloseNever.Content" xml:space="preserve">
-    <value>从不</value>
-    <comment>Option associated with Globals_ConfirmOnClose. "Never" means that the system will never display a warning when closing.</comment>
-  </data>
-  <data name="Globals_ConfirmOnCloseAlways.Content" xml:space="preserve">
-    <value>始终</value>
-    <comment>Option associated with Globals_ConfirmOnClose. "Always" means that the system will always display a warning when closing.</comment>
-  </data>
-  <data name="Globals_ConfirmOnCloseAutomatic.Content" xml:space="preserve">
-    <value>多个选项卡或窗格</value>
-    <comment>Option associated with Globals_ConfirmOnClose. The system will display a warning when multiple tabs or panes are present.</comment>
-  </data>
   <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
     <value>禁用“触摸键盘和手写面板服务”时发出警告</value>
   </data>

src/cascadia/TerminalSettingsEditor/SearchIndex.cpp

@@ -66,8 +66,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         hstring runtimeObjContext{};
         if (const auto profileVM = runtimeObj.try_as<Editor::ProfileViewModel>())
         {
+            // No runtimeObjContext: profile name and icon should be enough
             runtimeObjLabel = profileVM.Name();
-            runtimeObjContext = RS_(L"Nav_Profiles/Content");
         }
         else if (const auto colorSchemeVM = runtimeObj.try_as<Editor::ColorSchemeViewModel>())
         {
@@ -258,10 +258,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 {
                     localizedEntry.DisplayTextNeutral = EnglishOnlyResourceLoader().GetLocalizedString(entry.ResourceName);
                 }
-                if (!entry.SecondaryLabelResourceName.empty())
-                {
-                    localizedEntry.SecondaryLabelLocalized = GetLibraryResourceString(entry.SecondaryLabelResourceName);
-                }
                 localizedIndex.emplace_back(std::move(localizedEntry));
             }
             return localizedIndex;
@@ -346,7 +342,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             if (bestScore >= MinimumMatchScore)
             {
-                scoredResults.emplace_back(bestScore, winrt::make<FilteredSearchResult>(index, &entry, nullptr, std::nullopt, entry.SecondaryLabelLocalized));
+                scoredResults.emplace_back(bestScore, winrt::make<FilteredSearchResult>(index, &entry));
             }
         }
 

src/cascadia/TerminalSettingsEditor/SearchIndex.h

@@ -20,10 +20,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         winrt::hstring DisplayTextLocalized;
         std::optional<winrt::hstring> DisplayTextNeutral = std::nullopt;
-        // No "Neutral" copy of SecondaryLabelLocalized: unlike DisplayText, the secondary
-        // label is display-only (rendered in the search result row's caption). It is never
-        // passed to the fuzzy matcher, so a single localized string is sufficient.
-        winrt::hstring SecondaryLabelLocalized;
         const IndexEntry* Entry = nullptr;
 
         std::array<std::pair<std::optional<winrt::hstring>, int>, 2> GetSearchableFields() const;

src/cascadia/TerminalSettingsEditor/SettingContainer.cpp

@@ -159,7 +159,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             // apply header and current value as name (automation property)
             Automation::AutomationProperties::SetName(obj, _GenerateAccessibleName());
 
-            // apply help text as full description (automation property)
+            // apply help text as tooltip and full description (automation property)
             if (const auto& helpText{ HelpText() }; !helpText.empty())
             {
                 Automation::AutomationProperties::SetFullDescription(obj, helpText);

src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml

@@ -121,11 +121,6 @@
     <Thickness x:Key="SettingContainerIconMargin">0,4,8,4</Thickness>
     <x:Double x:Key="SettingContainerIconFontSize">16</x:Double>
 
-    <!--  Shared sizing for SettingContainer-style "card" rows (used by SettingsCardStyle and Actions page rows).  -->
-    <Thickness x:Key="SettingsCardPadding">16,8,8,8</Thickness>
-    <x:Double x:Key="SettingsCardMinHeight">64</x:Double>
-    <Thickness x:Key="SettingsCardItemMargin">0,4,0,0</Thickness>
-
     <Style x:Key="StackPanelInExpanderStyle"
            TargetType="StackPanel">
         <Setter Property="VerticalAlignment" Value="Center" />
@@ -162,21 +157,6 @@
         <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
     </Style>
 
-    <!--
-        Similar to a local:SettingContainer without actually being one.
-        Used by data-templated rows (i.e. Actions page).
-    -->
-    <Style x:Key="SettingsCardStyle"
-           TargetType="Grid">
-        <Setter Property="MinHeight" Value="{StaticResource SettingsCardMinHeight}" />
-        <Setter Property="Padding" Value="{StaticResource SettingsCardPadding}" />
-        <Setter Property="Background" Value="{ThemeResource ExpanderHeaderBackground}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource ExpanderHeaderBorderThickness}" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-    </Style>
-
     <Style x:Key="SettingsPageItemHeaderStyle"
            BasedOn="{StaticResource BodyTextBlockStyle}"
            TargetType="TextBlock">
@@ -210,8 +190,7 @@
     </DataTemplate>
 
     <!--  A setting container for a setting that has no additional options  -->
-    <Style x:Key="DefaultSettingContainer"
-           TargetType="local:SettingContainer">
+    <Style TargetType="local:SettingContainer">
         <Setter Property="Margin" Value="0,4,0,0" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="MaxWidth" Value="1000" />
@@ -249,10 +228,6 @@
         </Setter>
     </Style>
 
-    <!--  Implicit default style for SettingContainer; just an alias of DefaultSettingContainer so the named style can be referenced from VisualState setters.  -->
-    <Style BasedOn="{StaticResource DefaultSettingContainer}"
-           TargetType="local:SettingContainer" />
-
     <!--  A basic setting container displaying immutable text as content  -->
     <Style x:Key="SettingContainerWithTextContent"
            TargetType="local:SettingContainer">

src/cascadia/TerminalSettingsEditor/Utils.h

@@ -133,38 +133,11 @@ struct HasScrollViewer
             {
                 if (const auto& controlToFocus{ page->FindName(elementName).try_as<winrt::Windows::UI::Xaml::Controls::Control>() })
                 {
-                    // Walk up the visual tree from the deep-link target and
-                    // expand any ancestor expanders so the target is actually
-                    // visible. This handles both:
-                    // - Plain muxc:Expander instances used as section groupings
-                    // - SettingContainer instances using an expander style
-                    //   (i.e. ExpanderSettingContainerStyleWithComplexPreview).
-                    winrt::Windows::UI::Xaml::DependencyObject ancestor{ controlToFocus };
-                    while (ancestor)
-                    {
-                        if (const auto& expander{ ancestor.try_as<winrt::Microsoft::UI::Xaml::Controls::Expander>() })
-                        {
-                            expander.IsExpanded(true);
-                        }
-                        else if (const auto& settingContainer{ ancestor.try_as<winrt::Microsoft::Terminal::Settings::Editor::SettingContainer>() })
-                        {
-                            settingContainer.SetExpanded(true);
-                        }
-                        ancestor = winrt::Windows::UI::Xaml::Media::VisualTreeHelper::GetParent(ancestor);
-                    }
-
-                    // Expanding ancestor expanders triggers asynchronous
-                    // layout updates. Defer the bring-into-view + focus to
-                    // the next dispatcher tick so the target's final layout
-                    // position is known before we scroll/focus.
-                    page->Dispatcher().RunAsync(winrt::Windows::UI::Core::CoreDispatcherPriority::Normal, [weakControl{ winrt::weak_ref{ controlToFocus } }]() {
-                        if (const auto control = weakControl.get())
-                        {
-                            control.UpdateLayout();
-                            control.StartBringIntoView();
-                            control.Focus(winrt::Windows::UI::Xaml::FocusState::Programmatic);
-                        }
-                    });
+                    // We need to wait for the page to be loaded
+                    // or else the call to StartBringIntoView()
+                    // will end up doing nothing
+                    controlToFocus.StartBringIntoView();
+                    controlToFocus.Focus(winrt::Windows::UI::Xaml::FocusState::Programmatic);
                 }
                 page->_loadedRevoker.revoke();
             }

src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp

@@ -102,14 +102,6 @@ winrt::com_ptr<GlobalAppSettings> GlobalAppSettings::Copy() const
             globals->_DisabledProfileSources->Append(src);
         }
     }
-    if (_SafeUriSchemes)
-    {
-        globals->_SafeUriSchemes = winrt::single_threaded_vector<hstring>();
-        for (const auto& src : *_SafeUriSchemes)
-        {
-            globals->_SafeUriSchemes->Append(src);
-        }
-    }
 
     for (const auto& parent : _parents)
     {

src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl

@@ -114,7 +114,6 @@ namespace Microsoft.Terminal.Settings.Model
         INHERITABLE_SETTING(Boolean, EnableUnfocusedAcrylic);
         INHERITABLE_SETTING(Boolean, AllowHeadless);
         INHERITABLE_SETTING(String, SearchWebDefaultQueryUrl);
-        INHERITABLE_SETTING(IVector<String>, SafeUriSchemes);
 
         Windows.Foundation.Collections.IMapView<String, ColorScheme> ColorSchemes();
         void AddColorScheme(ColorScheme scheme);

src/cascadia/TerminalSettingsModel/MTSMSettings.h

@@ -63,7 +63,6 @@ Author(s):
     X(bool, MinimizeToNotificationArea, "minimizeToNotificationArea", false)                                                                                                                          \
     X(bool, AlwaysShowNotificationIcon, "alwaysShowNotificationIcon", false)                                                                                                                          \
     X(winrt::Windows::Foundation::Collections::IVector<winrt::hstring>, DisabledProfileSources, "disabledProfileSources", nullptr)                                                                    \
-    X(winrt::Windows::Foundation::Collections::IVector<winrt::hstring>, SafeUriSchemes, "safeUriSchemes", nullptr)                                                                                    \
     X(bool, ShowAdminShield, "showAdminShield", true)                                                                                                                                                 \
     X(bool, TrimPaste, "trimPaste", true)                                                                                                                                                             \
     X(bool, EnableColorSelection, "experimental.enableColorSelection", false)                                                                                                                         \

src/cascadia/UIHelpers/Converters.cpp

@@ -4,7 +4,6 @@
 #include <til/winrt.h>
 
 #include "Converters.g.cpp"
-#include "StringNotEmptyToVisibilityConverter.g.cpp"
 
 #pragma warning(disable : 26497) // We will make these functions constexpr, as they are part of an ABI boundary.
 #pragma warning(disable : 26440) // The function ... can be declared as noexcept.
@@ -81,22 +80,4 @@ namespace winrt::Microsoft::Terminal::UI::implementation
     {
         return fontWeight.Weight;
     }
-
-    winrt::Windows::Foundation::IInspectable StringNotEmptyToVisibilityConverter::Convert(winrt::Windows::Foundation::IInspectable const& value, winrt::Windows::UI::Xaml::Interop::TypeName const& /*targetType*/, winrt::Windows::Foundation::IInspectable const& /*parameter*/, winrt::hstring const& /*language*/)
-    {
-        winrt::hstring text;
-        if (value)
-        {
-            if (const auto& str{ value.try_as<winrt::hstring>() })
-            {
-                text = *str;
-            }
-        }
-        return winrt::box_value(Converters::StringNotEmptyToVisibility(text));
-    }
-
-    winrt::Windows::Foundation::IInspectable StringNotEmptyToVisibilityConverter::ConvertBack(winrt::Windows::Foundation::IInspectable const& /*value*/, winrt::Windows::UI::Xaml::Interop::TypeName const& /*targetType*/, winrt::Windows::Foundation::IInspectable const& /*parameter*/, winrt::hstring const& /*language*/)
-    {
-        throw winrt::hresult_not_implemented();
-    }
 }

src/cascadia/UIHelpers/Converters.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include "Converters.g.h"
-#include "StringNotEmptyToVisibilityConverter.g.h"
 
 namespace winrt::Microsoft::Terminal::UI::implementation
 {
@@ -30,18 +29,11 @@ namespace winrt::Microsoft::Terminal::UI::implementation
         static winrt::Windows::UI::Xaml::Media::SolidColorBrush ColorToBrush(winrt::Windows::UI::Color color);
         static double FontWeightToDouble(winrt::Windows::UI::Text::FontWeight fontWeight);
     };
-
-    struct StringNotEmptyToVisibilityConverter : StringNotEmptyToVisibilityConverterT<StringNotEmptyToVisibilityConverter>
-    {
-        StringNotEmptyToVisibilityConverter() = default;
-
-        winrt::Windows::Foundation::IInspectable Convert(winrt::Windows::Foundation::IInspectable const& value, winrt::Windows::UI::Xaml::Interop::TypeName const& targetType, winrt::Windows::Foundation::IInspectable const& parameter, winrt::hstring const& language);
-        winrt::Windows::Foundation::IInspectable ConvertBack(winrt::Windows::Foundation::IInspectable const& value, winrt::Windows::UI::Xaml::Interop::TypeName const& targetType, winrt::Windows::Foundation::IInspectable const& parameter, winrt::hstring const& language);
-    };
 }
 
 namespace winrt::Microsoft::Terminal::UI::factory_implementation
 {
-    BASIC_FACTORY(Converters);
-    BASIC_FACTORY(StringNotEmptyToVisibilityConverter);
+    struct Converters : ConvertersT<Converters, implementation::Converters>
+    {
+    };
 }

src/cascadia/UIHelpers/Converters.idl

@@ -27,12 +27,4 @@ namespace Microsoft.Terminal.UI
         static Windows.UI.Xaml.Media.SolidColorBrush ColorToBrush(Windows.UI.Color color);
         static Double FontWeightToDouble(Windows.UI.Text.FontWeight fontWeight);
     }
-
-    // IValueConverter wrapper around Converters.StringNotEmptyToVisibility, for use
-    // in classic {Binding} scenarios (e.g. ControlTemplates) where x:Bind function
-    // syntax against the static Converters helpers isn't available.
-    runtimeclass StringNotEmptyToVisibilityConverter : [default] Windows.UI.Xaml.Data.IValueConverter
-    {
-        StringNotEmptyToVisibilityConverter();
-    }
 }

src/cascadia/UIHelpers/pch.h

@@ -32,7 +32,6 @@
 #include <Windows.Graphics.Imaging.Interop.h>
 
 #include <winrt/Windows.UI.Xaml.Controls.h>
-#include <winrt/Windows.UI.Xaml.Data.h>
 #include <winrt/Windows.UI.Xaml.Markup.h>
 #include <winrt/Windows.UI.Xaml.Input.h>
 #include <winrt/Windows.UI.Xaml.Media.Imaging.h>

src/cascadia/UnitTests_SettingsModel/SerializationTests.cpp

@@ -467,7 +467,6 @@ namespace SettingsModelUnitTests
             "$schema" : "https://aka.ms/terminal-profiles-schema",
             "defaultProfile": "{61c54bbd-1111-5271-96e7-009a87ff44bf}",
             "disabledProfileSources": [ "Windows.Terminal.Wsl" ],
-            "safeUriSchemes": [ "vscode" ],
             "newTabMenu":
             [
                 {

src/host/ut_host/ScreenBufferTests.cpp

@@ -123,7 +123,6 @@ class ScreenBufferTests
     TEST_METHOD(VtResizePreservingAttributes);
 
     TEST_METHOD(VtSoftResetCursorPosition);
-    TEST_METHOD(VtSoftResetAltBufferCursorState);
 
     TEST_METHOD(VtScrollMarginsNewlineColor);
 
@@ -1511,30 +1510,6 @@ void ScreenBufferTests::VtSoftResetCursorPosition()
     VERIFY_ARE_EQUAL(til::point(1, 1), cursor.GetPosition());
 }
 
-void ScreenBufferTests::VtSoftResetAltBufferCursorState()
-{
-    auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-    gci.LockConsole(); // Lock must be taken to manipulate buffer.
-    auto unlock = wil::scope_exit([&] { gci.UnlockConsole(); });
-
-    auto& si = gci.GetActiveOutputBuffer();
-    auto& stateMachine = si.GetStateMachine();
-
-    Log::Comment(L"Move cursor on the main buffer.");
-    stateMachine.ProcessString(L"\x1b[4;7H");
-    VERIFY_ARE_EQUAL(til::point(6, 3), si.GetTextBuffer().GetCursor().GetPosition());
-
-    Log::Comment(L"Enter alt buffer, soft reset, and return to main buffer.");
-    stateMachine.ProcessString(L"\x1b[?1049h");
-    VERIFY_IS_TRUE(gci.GetActiveOutputBuffer()._IsAltBuffer());
-    stateMachine.ProcessString(L"\x1b[!p");
-    stateMachine.ProcessString(L"\x1b[?1049l");
-    VERIFY_IS_FALSE(gci.GetActiveOutputBuffer()._IsAltBuffer());
-
-    Log::Comment(L"Returning from alt buffer should restore the main cursor position.");
-    VERIFY_ARE_EQUAL(til::point(6, 3), gci.GetActiveOutputBuffer().GetTextBuffer().GetCursor().GetPosition());
-}
-
 void ScreenBufferTests::VtScrollMarginsNewlineColor()
 {
     auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();

src/terminal/adapter/SixelParser.cpp

@@ -90,15 +90,7 @@ std::function<bool(wchar_t)> SixelParser::DefineImage(const VTInt macroParameter
         _state = States::Normal;
         _parameters.clear();
         return [&](const auto ch) {
-            try
-            {
-                _parseCommandChar(ch);
-            }
-            catch (...)
-            {
-                // Ignore all further content.
-                return false;
-            }
+            _parseCommandChar(ch);
             return true;
         };
     }
@@ -242,18 +234,10 @@ void SixelParser::_executeNextLine()
     _executeCarriageReturn();
     _imageLineCount++;
     _maybeFlushImageBuffer();
-    // If we don't have any available pixel height, that means the image has
-    // extended beyond the bottom of the display and we haven't triggered a
-    // a scroll (because sixel display mode is enabled). In this state, there
-    // is no point in extending the image any further, because the additional
-    // content will never be seen, so we'll just be wasting memory.
-    if (_availablePixelHeight > 0)
-    {
-        _imageCursor.y += _sixelHeight;
-        _availablePixelHeight -= _sixelHeight;
-        _resizeImageBuffer(_sixelHeight);
-        _fillImageBackgroundWhenScrolled();
-    }
+    _imageCursor.y += _sixelHeight;
+    _availablePixelHeight -= _sixelHeight;
+    _resizeImageBuffer(_sixelHeight);
+    _fillImageBackgroundWhenScrolled();
 }
 
 void SixelParser::_executeMoveToHome()

src/terminal/adapter/adaptDispatch.cpp

@@ -3002,15 +3002,17 @@ void AdaptDispatch::SoftReset()
     SetGraphicsRendition({}); // Normal rendition.
     SetCharacterProtectionAttribute({}); // Default (unprotected)
 
-    // Reset only the active saved cursor state.
-    // This matches xterm behavior when DECSTR is processed while using
-    // the alternate screen buffer (GH#19918).
-    _savedCursorState.at(_usingAltBuffer ? 1 : 0) = {};
+    // Reset the saved cursor state.
+    // Note that XTerm only resets the main buffer state, but that
+    // seems likely to be a bug. Most other terminals reset both.
+    _savedCursorState.at(0) = {}; // Main buffer
+    _savedCursorState.at(1) = {}; // Alt buffer
 
-    // The TerminalOutput state in this buffer must be reset to
+    // The TerminalOutput state in these buffers must be reset to
     // the same state as the _termOutput instance, which is not
     // necessarily equivalent to a full reset.
-    _savedCursorState.at(_usingAltBuffer ? 1 : 0).TermOutput = _termOutput;
+    _savedCursorState.at(0).TermOutput = _termOutput;
+    _savedCursorState.at(1).TermOutput = _termOutput;
 
     // Soft reset the Sixel parser if in use.
     if (_sixelParser)

src/tools/wtr/.cargo/config.toml

@@ -0,0 +1,12 @@
+# Cargo source replacement: route crates-io fetches through an Azure Artifact
+# Cargo feed (1ES compliance — disallow direct public crates.io access).
+#
+# Reusing the sudo team's `sudo_public_cargo` feed in microsoft/Dart for now.
+# TODO(wtr): replace with our own `microsoft/Dart` Cargo feed once provisioned.
+
+[registries]
+WindowsTerminalCargo = { index = "sparse+https://pkgs.dev.azure.com/microsoft/Dart/_packaging/sudo_public_cargo/Cargo/index/" }
+
+[source.crates-io]
+replace-with = "WindowsTerminalCargo"
+

src/tools/wtr/.gitignore

@@ -0,0 +1 @@
+/target/

src/tools/wtr/Cargo.toml

@@ -0,0 +1,32 @@
+[package]
+name = "wtr"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "wtr"
+path = "src/main.rs"
+
+[dependencies]
+tokio = { version = "1", features = ["full"] }
+tokio-util = { version = "0.7", features = ["compat"] }
+async-trait = "0.1"
+anyhow = "1"
+serde_json = "1"
+clap = { version = "4", features = ["derive"] }
+ratatui = "0.30"
+crossterm = { version = "0.29", features = ["event-stream"] }
+futures = "0.3"
+unicode-width = "0.2"
+textwrap = "0.16"
+base64 = "0.22"
+serde = { version = "1", features = ["derive"] }
+windows-sys = { version = "0.61", features = [
+    "Win32_Foundation",
+    "Win32_System_Environment",
+    "Win32_System_Registry",
+    "Win32_System_Threading",
+] }
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
+tracing-appender = "0.2"

src/tools/wtr/rust-toolchain.toml

@@ -0,0 +1,4 @@
+# Pin the Rust toolchain channel for both local dev and 1ES CI.
+# Use the MSRustup `ms-prod-X.YY` channel for compliance.
+[toolchain]
+channel = "ms-prod-1.93"

src/tools/wtr/src/main.rs

@@ -0,0 +1 @@
+fn main() {}

tools/GenerateSettingsIndex.ps1

@@ -56,6 +56,11 @@ $ClassMap = @{
         NavigationParam = "ColorSchemes_Nav"
         SubPage         = "BreadcrumbSubPage::None"
     }
+    "Microsoft::Terminal::Settings::Editor::Rendering" = @{
+        ResourceName    = "Nav_Rendering/Content"
+        NavigationParam = "Rendering_Nav"
+        SubPage         = "BreadcrumbSubPage::None"
+    }
     "Microsoft::Terminal::Settings::Editor::Compatibility" = @{
         ResourceName    = "Nav_Compatibility/Content"
         NavigationParam = "Compatibility_Nav"
@@ -80,7 +85,6 @@ $ClassMap = @{
         ResourceName    = "Nav_ProfileDefaults/Content"
         NavigationParam = "GlobalProfile_Nav"
         SubPage         = "BreadcrumbSubPage::None"
-        SecondaryLabel  = "Nav_Profiles/Content"
     }
     "Microsoft::Terminal::Settings::Editor::Profiles_Appearance" = @{
         ResourceName    = "Nav_ProfileDefaults/Content"
@@ -101,12 +105,6 @@ $ClassMap = @{
         ResourceName    = "Nav_AddNewProfile/Content"
         NavigationParam = "AddProfile"
         SubPage         = "BreadcrumbSubPage::None"
-        SecondaryLabel  = "Nav_Profiles/Content"
-    }
-    "Microsoft::Terminal::Settings::Editor::Profiles" = @{
-        ResourceName    = "Nav_Profiles/Content"
-        NavigationParam = "Profiles_Nav"
-        SubPage         = "BreadcrumbSubPage::None"
     }
 }
 
@@ -158,7 +156,6 @@ foreach ($xamlFile in Get-ChildItem -Path $SourceDir -Filter *.xaml)
             NavigationParam = $ClassMap[$pageClass].NavigationParam
             SubPage         = $ClassMap[$pageClass].SubPage
             ElementName     = $null # No specific element to navigate to, for the page itself
-            SecondaryLabel  = $ClassMap[$pageClass].SecondaryLabel # Resource name for the result's sub-text (i.e. parent page name); $null if none
             File            = $filename
         }
     }
@@ -192,7 +189,6 @@ foreach ($xamlFile in Get-ChildItem -Path $SourceDir -Filter *.xaml)
             NavigationParam = $ClassMap[$pageClass].NavigationParam
             SubPage         = $ClassMap[$pageClass].SubPage
             ElementName     = "AddNewButton"
-            SecondaryLabel  = $ClassMap[$pageClass].SecondaryLabel
             File            = $filename
         }
     }
@@ -289,9 +285,8 @@ function FormatEntry($e)
     $formattedResourceName = 'USES_RESOURCE(L"{0}")' -f $e.ResourceName
     $formattedNavigationParam = 'L"{0}"' -f $e.NavigationParam # null Navigation param resolves to empty string
     $formattedElementName = 'L"{0}"' -f $e.ElementName
-    $formattedSecondaryLabel = [string]::IsNullOrEmpty($e.SecondaryLabel) ? 'L""' : ('USES_RESOURCE(L"{0}")' -f $e.SecondaryLabel)
 
-    return "            IndexEntry{{ {0}, {1}, {2}, {3}, {4} }}, // {5}" -f ($formattedResourceName, $formattedNavigationParam, $e.SubPage, $formattedElementName, $formattedSecondaryLabel, $e.File)
+    return "            IndexEntry{{ {0}, {1}, {2}, {3} }}, // {4}" -f ($formattedResourceName, $formattedNavigationParam, $e.SubPage, $formattedElementName, $e.File)
 }
 
 function FormatEntries($es) {
@@ -299,7 +294,7 @@ function FormatEntries($es) {
 }
 
 # Sort and remove duplicates
-$entries = $entries | Sort-Object ResourceName, ParentPage, NavigationParam, SubPage, ElementName, SecondaryLabel, File -Unique
+$entries = $entries | Sort-Object ResourceName, ParentPage, NavigationParam, SubPage, ElementName, File -Unique
 
 $buildTimeEntries = @()
 $profileEntries = @()
@@ -355,11 +350,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         
         // x:Name of the SettingContainer to navigate to on the page (i.e. "DefaultProfile")
         wil::zwstring_view ElementName;
-
-        // Resource name of the search result's secondary label (i.e. parent page name like "Nav_Profiles/Content").
-        // Empty if the entry has no secondary label.
-        // NOTE: wrapped in USES_RESOURCE() like ResourceName when non-empty.
-        wil::zwstring_view SecondaryLabelResourceName;
     };
 
     const std::array<IndexEntry, $($buildTimeEntries.Count)>& LoadBuildTimeIndex();