From e8a5c32612a38974143d5417a277ca3424812fa7 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Thu, 7 May 2026 18:23:44 -0700
Subject: [PATCH] [SUI] Add expander groups to settings

---
 .../TerminalSettingsEditor/Appearances.xaml   |  98 +--
 .../CommonResources.xaml                      |  44 +-
 .../TerminalSettingsEditor/Compatibility.cpp  |   1 +
 .../TerminalSettingsEditor/Compatibility.h    |   5 +
 .../TerminalSettingsEditor/Compatibility.idl  |   5 +
 .../TerminalSettingsEditor/Compatibility.xaml | 198 ++++---
 .../GlobalAppearance.xaml                     | 290 +++++----
 .../TerminalSettingsEditor/Interaction.xaml   | 338 +++++++----
 .../TerminalSettingsEditor/Launch.xaml        | 559 +++++++++---------
 .../TerminalSettingsEditor/MainPage.cpp       |   7 -
 .../TerminalSettingsEditor/MainPage.xaml      |   4 -
 ...Microsoft.Terminal.Settings.Editor.vcxproj |  22 -
 ...t.Terminal.Settings.Editor.vcxproj.filters |   2 -
 .../TerminalSettingsEditor/NavConstants.h     |   2 -
 .../ProfileViewModel.cpp                      |  13 +
 .../TerminalSettingsEditor/ProfileViewModel.h |   1 +
 .../ProfileViewModel.idl                      |   1 +
 .../TerminalSettingsEditor/Profiles_Base.cpp  |   2 +
 .../TerminalSettingsEditor/Profiles_Base.xaml | 294 ++++-----
 .../TerminalSettingsEditor/Rendering.cpp      |  31 -
 .../TerminalSettingsEditor/Rendering.h        |  25 -
 .../TerminalSettingsEditor/Rendering.idl      |  13 -
 .../TerminalSettingsEditor/Rendering.xaml     |  48 --
 .../RenderingViewModel.cpp                    |  21 -
 .../RenderingViewModel.h                      |  28 -
 .../RenderingViewModel.idl                    |  19 -
 .../Resources/en-US/Resources.resw            | 173 +++++-
 .../TerminalColorConverters.cpp               |  19 +
 .../TerminalColorConverters.h                 |  10 +
 .../TerminalColorConverters.idl               |   5 +
 src/cascadia/TerminalSettingsEditor/Utils.h   |  37 +-
 tools/GenerateSettingsIndex.ps1               |   5 -
 32 files changed, 1334 insertions(+), 986 deletions(-)
 delete mode 100644 src/cascadia/TerminalSettingsEditor/Rendering.cpp
 delete mode 100644 src/cascadia/TerminalSettingsEditor/Rendering.h
 delete mode 100644 src/cascadia/TerminalSettingsEditor/Rendering.idl
 delete mode 100644 src/cascadia/TerminalSettingsEditor/Rendering.xaml
 delete mode 100644 src/cascadia/TerminalSettingsEditor/RenderingViewModel.cpp
 delete mode 100644 src/cascadia/TerminalSettingsEditor/RenderingViewModel.h
 delete mode 100644 src/cascadia/TerminalSettingsEditor/RenderingViewModel.idl

diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
index 931727c0e4..a6cf8fa7c9 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -68,13 +68,22 @@
     </UserControl.Resources>
 
     <StackPanel>
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <!--  Grouping: Text  -->
-            <TextBlock x:Uid="Profile_TextHeader"
-                       Margin="0,0,0,4"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-            <!--  Color Scheme  -->
-            <!--  This currently only display the Dark color scheme, even if the user has a pair of schemes set.  -->
+        <!--  Section: Typography settings  -->
+        <muxc:Expander IsExpanded="True"
+                       AutomationProperties.Name="{Binding Text, ElementName=Appearance_Section_Typography_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+            <muxc:Expander.Header>
+                <StackPanel>
+                    <TextBlock x:Name="Appearance_Section_Typography_Title_AccTitle"
+                                   x:Uid="Appearance_Section_Typography_Title"
+                               Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                    <TextBlock x:Uid="Appearance_Section_Typography_Help"
+                               Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                </StackPanel>
+            </muxc:Expander.Header>
+            <StackPanel>
+                <!--  Color Scheme  -->
+                <!--  This currently only display the Dark color scheme, even if the user has a pair of schemes set.  -->
             <local:SettingContainer x:Name="ColorScheme"
                                     x:Uid="Profile_ColorScheme"
                                     ClearSettingValue="{x:Bind Appearance.ClearColorScheme}"
@@ -484,12 +493,35 @@
                           SelectedItem="{x:Bind CurrentAdjustIndistinguishableColors, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}" />
             </local:SettingContainer>
-        </StackPanel>
 
-        <!--  Grouping: Cursor  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Profile_CursorHeader"
-                       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>
+        </muxc:Expander>
+
+        <!--  Section: Cursor settings  -->
+        <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Appearance_Section_Cursor_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+            <muxc:Expander.Header>
+                <StackPanel>
+                    <TextBlock x:Name="Appearance_Section_Cursor_Title_AccTitle"
+                                   x:Uid="Appearance_Section_Cursor_Title"
+                               Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                    <TextBlock x:Uid="Appearance_Section_Cursor_Help"
+                               Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                </StackPanel>
+            </muxc:Expander.Header>
+            <StackPanel>
 
             <!--  Cursor Shape  -->
             <local:SettingContainer x:Name="CursorShape"
@@ -542,12 +574,22 @@
                                            CurrentColor="{x:Bind Appearance.CursorColor, Mode=TwoWay}"
                                            NullColorPreview="{x:Bind Appearance.CurrentColorScheme.CursorColor.Color, Mode=OneWay}" />
             </local:SettingContainer>
-        </StackPanel>
+            </StackPanel>
+        </muxc:Expander>
 
-        <!--  Grouping: Background  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Profile_BackgroundHeader"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+        <!--  Section: Background image  -->
+        <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Appearance_Section_BackgroundImage_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+            <muxc:Expander.Header>
+                <StackPanel>
+                    <TextBlock x:Name="Appearance_Section_BackgroundImage_Title_AccTitle"
+                                   x:Uid="Appearance_Section_BackgroundImage_Title"
+                               Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                    <TextBlock x:Uid="Appearance_Section_BackgroundImage_Help"
+                               Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                </StackPanel>
+            </muxc:Expander.Header>
+            <StackPanel>
 
             <!--  Background Image  -->
             <local:SettingContainer x:Name="BackgroundImageContainer"
@@ -800,26 +842,8 @@
                                Text="{x:Bind mtu:Converters.PercentageToPercentageString(Appearance.BackgroundImageOpacity), Mode=OneWay}" />
                 </Grid>
             </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>
+        </muxc:Expander>
 
     </StackPanel>
 </UserControl>
diff --git a/src/cascadia/TerminalSettingsEditor/CommonResources.xaml b/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
index b18ebd4015..97b0f8b6d0 100644
--- a/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
+++ b/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
@@ -64,6 +64,7 @@
 
     <local:ColorToBrushConverter x:Key="ColorToBrushConverter" />
     <local:ColorToStringConverter x:Key="ColorToStringConverter" />
+    <local:EmptyStringToVisibilityConverter x:Key="EmptyStringToVisibilityConverter" />
 
     <Color x:Key="DeleteButtonColor">Firebrick</Color>
 
@@ -167,6 +168,29 @@
         <Setter Property="Margin" Value="0,32,0,4" />
     </Style>
 
+    <Style x:Key="SectionExpanderStyle"
+           TargetType="muxc:Expander">
+        <Setter Property="MaxWidth" Value="{StaticResource StandardControlMaxWidth}" />
+        <Setter Property="Margin" Value="0,12,0,0" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    </Style>
+
+    <Style x:Key="SectionExpanderHeaderTextStyle"
+           BasedOn="{StaticResource BodyStrongTextBlockStyle}"
+           TargetType="TextBlock">
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+
+    <Style x:Key="SectionExpanderHelpTextStyle"
+           BasedOn="{StaticResource CaptionTextBlockStyle}"
+           TargetType="TextBlock">
+        <Setter Property="LineHeight" Value="16" />
+        <Setter Property="Margin" Value="0,2,0,0" />
+        <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
+        <Setter Property="TextWrapping" Value="WrapWholeWords" />
+    </Style>
+
     <!--  Used for disclaimers  -->
     <Style x:Key="DisclaimerStyle"
            TargetType="TextBlock">
@@ -1228,13 +1252,19 @@
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <ContentPresenter x:Name="ContentPresenter"
-                                          Grid.Column="0"
-                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          Content="{TemplateBinding Content}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          ContentTransitions="{TemplateBinding ContentTransitions}" />
+                        <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 EmptyStringToVisibilityConverter}}" />
+                        </StackPanel>
                         <FontIcon Grid.Column="1"
                                   Margin="20,0,8,0"
                                   HorizontalAlignment="Right"
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.cpp b/src/cascadia/TerminalSettingsEditor/Compatibility.cpp
index 82e39190c5..dd2bfca8b3 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.cpp
@@ -17,6 +17,7 @@ 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
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.h b/src/cascadia/TerminalSettingsEditor/Compatibility.h
index 2fd057758e..fcf655881e 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.h
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.h
@@ -28,6 +28,11 @@ 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);
 
+        // Settings merged in from the former RenderingViewModel.
+        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;
     };
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.idl b/src/cascadia/TerminalSettingsEditor/Compatibility.idl
index 7f94b780fd..c30ff5c634 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.idl
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.idl
@@ -23,6 +23,11 @@ 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
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
index 2180322638..159f74a1e4 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
@@ -25,83 +25,137 @@
     </Page.Resources>
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
-        <!--  Allow Headless  -->
-        <local:SettingContainer x:Name="AllowHeadless"
-                                x:Uid="Globals_AllowHeadless">
-            <ToggleSwitch IsOn="{x:Bind ViewModel.AllowHeadless, Mode=TwoWay}"
-                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        <!--  Section: Compatibility  -->
+        <muxc:Expander IsExpanded="True"
+                       AutomationProperties.Name="{Binding Text, ElementName=Compatibility_Section_Compatibility_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+            <muxc:Expander.Header>
+                <StackPanel>
+                    <TextBlock x:Name="Compatibility_Section_Compatibility_Title_AccTitle"
+                                   x:Uid="Compatibility_Section_Compatibility_Title"
+                               Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                    <TextBlock x:Uid="Compatibility_Section_Compatibility_Help"
+                               Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                </StackPanel>
+            </muxc:Expander.Header>
+            <StackPanel>
+                <!--  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>
+                <!--  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>
+        </muxc:Expander>
 
+        <!--  Section: Rendering  -->
+        <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Compatibility_Section_Rendering_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+            <muxc:Expander.Header>
+                <StackPanel>
+                    <TextBlock x:Name="Compatibility_Section_Rendering_Title_AccTitle"
+                                   x:Uid="Compatibility_Section_Rendering_Title"
+                               Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                    <TextBlock x:Uid="Compatibility_Section_Rendering_Help"
+                               Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                </StackPanel>
+            </muxc:Expander.Header>
+            <StackPanel>
+                <!--  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>
+        </muxc:Expander>
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
index 70fc972a53..7f291d3d8d 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
@@ -27,126 +27,202 @@
     </Page.Resources>
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
-        <!--  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>
+        <!--  Section: Visual style  -->
+        <muxc:Expander IsExpanded="True"
+                       AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_VisualStyle_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+            <muxc:Expander.Header>
+                <StackPanel>
+                    <TextBlock x:Name="Globals_Section_VisualStyle_Title_AccTitle"
+                                   x:Uid="Globals_Section_VisualStyle_Title"
+                               Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                    <TextBlock x:Uid="Globals_Section_VisualStyle_Help"
+                               Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                </StackPanel>
+            </muxc:Expander.Header>
+            <StackPanel>
+                <!--  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>
 
-        <!--  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 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 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>
+                <!--  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>
 
-        <!--  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>
+                <!--  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>
+        </muxc:Expander>
 
-        <!--  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>
+        <!--  Section: Tabs and layout  -->
+        <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_TabsLayout_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+            <muxc:Expander.Header>
+                <StackPanel>
+                    <TextBlock x:Name="Globals_Section_TabsLayout_Title_AccTitle"
+                                   x:Uid="Globals_Section_TabsLayout_Title"
+                               Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                    <TextBlock x:Uid="Globals_Section_TabsLayout_Help"
+                               Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                </StackPanel>
+            </muxc:Expander.Header>
+            <StackPanel>
+                <!--  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 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>
+                <!--  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 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>
+                <!--  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 on Top  -->
-        <local:SettingContainer x:Name="AlwaysOnTop"
-                                x:Uid="Globals_AlwaysOnTop">
-            <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
-                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+                <!--  Tab Width Mode  -->
+                <local:SettingContainer x:Name="TabWidthMode"
+                                        x:Uid="Globals_TabWidthMode">
+                    <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>
 
-        <!--  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>
+                <!--  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>
+        </muxc:Expander>
 
-        <!--  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>
+        <!--  Section: Window behavior  -->
+        <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_WindowBehavior_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+            <muxc:Expander.Header>
+                <StackPanel>
+                    <TextBlock x:Name="Globals_Section_WindowBehavior_Title_AccTitle"
+                                   x:Uid="Globals_Section_WindowBehavior_Title"
+                               Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                    <TextBlock x:Uid="Globals_Section_WindowBehavior_Help"
+                               Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                </StackPanel>
+            </muxc:Expander.Header>
+            <StackPanel>
+                <!--  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>
 
-        <!--  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>
+                <!--  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>
+        </muxc:Expander>
 
-        <!--  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>
+        <!--  Section: Title bar & identity  -->
+        <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_TitleBarIdentity_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+            <muxc:Expander.Header>
+                <StackPanel>
+                    <TextBlock x:Name="Globals_Section_TitleBarIdentity_Title_AccTitle"
+                                   x:Uid="Globals_Section_TitleBarIdentity_Title"
+                               Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                    <TextBlock x:Uid="Globals_Section_TitleBarIdentity_Help"
+                               Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                </StackPanel>
+            </muxc:Expander.Header>
+            <StackPanel>
+                <!--  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>
 
-        <!--  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>
+                <!--  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>
+        </muxc:Expander>
 
-        <!--  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>
+        <!--  Section: System integration & notifications  -->
+        <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_SystemIntegration_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+            <muxc:Expander.Header>
+                <StackPanel>
+                    <TextBlock x:Name="Globals_Section_SystemIntegration_Title_AccTitle"
+                                   x:Uid="Globals_Section_SystemIntegration_Title"
+                               Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                    <TextBlock x:Uid="Globals_Section_SystemIntegration_Help"
+                               Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                </StackPanel>
+            </muxc:Expander.Header>
+            <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>
 
-        <!--  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>
+                <!--  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>
+        </muxc:Expander>
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
index f3a24a36a7..03add079d7 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -26,149 +26,233 @@
 
     <StackPanel>
         <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <!--  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>
+            <!--  Section: Clipboard and paste behavior  -->
+            <muxc:Expander IsExpanded="True"
+                           AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_Clipboard_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+                <muxc:Expander.Header>
+                    <StackPanel>
+                        <TextBlock x:Name="Interaction_Section_Clipboard_Title_AccTitle"
+                                   x:Uid="Interaction_Section_Clipboard_Title"
+                                   Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                        <TextBlock x:Uid="Interaction_Section_Clipboard_Help"
+                                   Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                    </StackPanel>
+                </muxc:Expander.Header>
+                <StackPanel>
+                    <!--  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 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 Paste  -->
+                    <local:SettingContainer x:Name="TrimPaste"
+                                            x:Uid="Globals_TrimPaste">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, 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>
+                    <!--  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 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>
+                </StackPanel>
+            </muxc:Expander>
 
-            <!--  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>
+            <!--  Section: Text selection & editing  -->
+            <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_TextSelection_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+                <muxc:Expander.Header>
+                    <StackPanel>
+                        <TextBlock x:Name="Interaction_Section_TextSelection_Title_AccTitle"
+                                   x:Uid="Interaction_Section_TextSelection_Title"
+                                   Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                        <TextBlock x:Uid="Interaction_Section_TextSelection_Help"
+                                   Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                    </StackPanel>
+                </muxc:Expander.Header>
+                <StackPanel>
+                    <!--  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>
 
-            <!--  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>
+                    <!--  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>
+            </muxc:Expander>
 
-            <!--  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>
+            <!--  Section: Window and layout behavior  -->
+            <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_WindowLayout_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+                <muxc:Expander.Header>
+                    <StackPanel>
+                        <TextBlock x:Name="Interaction_Section_WindowLayout_Title_AccTitle"
+                                   x:Uid="Interaction_Section_WindowLayout_Title"
+                                   Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                        <TextBlock x:Uid="Interaction_Section_WindowLayout_Help"
+                                   Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                    </StackPanel>
+                </muxc:Expander.Header>
+                <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>
 
-            <!--  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>
 
-            <!--  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>
+                    <!--  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>
+            </muxc:Expander>
 
-            <!--  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>
+            <!--  Section: Mouse & scrolling  -->
+            <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_MouseScrolling_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+                <muxc:Expander.Header>
+                    <StackPanel>
+                        <TextBlock x:Name="Interaction_Section_MouseScrolling_Title_AccTitle"
+                                   x:Uid="Interaction_Section_MouseScrolling_Title"
+                                   Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                        <TextBlock x:Uid="Interaction_Section_MouseScrolling_Help"
+                                   Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                    </StackPanel>
+                </muxc:Expander.Header>
+                <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>
 
-            <!--  Detect URLs  -->
-            <local:SettingContainer x:Name="DetectURLs"
-                                    x:Uid="Globals_DetectURLs">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, 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>
+            </muxc:Expander>
 
-            <!--  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>
+            <!--  Section: URLs & external actions  -->
+            <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_UrlsExternal_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+                <muxc:Expander.Header>
+                    <StackPanel>
+                        <TextBlock x:Name="Interaction_Section_UrlsExternal_Title_AccTitle"
+                                   x:Uid="Interaction_Section_UrlsExternal_Title"
+                                   Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                        <TextBlock x:Uid="Interaction_Section_UrlsExternal_Help"
+                                   Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                    </StackPanel>
+                </muxc:Expander.Header>
+                <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>
 
-            <!--  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>
+                    <!--  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>
+                </StackPanel>
+            </muxc:Expander>
 
-        <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <!--  Grouping: Warnings  -->
-            <TextBlock x:Uid="Globals_WarningsHeader"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Section: Warnings  -->
+            <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_Warnings_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+                <muxc:Expander.Header>
+                    <StackPanel>
+                        <TextBlock x:Name="Interaction_Section_Warnings_Title_AccTitle"
+                                   x:Uid="Interaction_Section_Warnings_Title"
+                                   Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                        <TextBlock x:Uid="Interaction_Section_Warnings_Help"
+                                   Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                    </StackPanel>
+                </muxc:Expander.Header>
+                <StackPanel>
+                    <!--  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>
 
-            <!--  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>
+                    <!--  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>
 
-            <!--  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>
+                    <!--  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>
+                </StackPanel>
+            </muxc:Expander>
         </StackPanel>
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.xaml b/src/cascadia/TerminalSettingsEditor/Launch.xaml
index e202feef33..a9150c94e4 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Launch.xaml
@@ -43,279 +43,310 @@
 
     <StackPanel>
         <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <!--  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">
+            <!--  Section: Launch behavior  -->
+            <muxc:Expander IsExpanded="True"
+                           AutomationProperties.Name="{Binding Text, ElementName=Launch_Section_LaunchBehavior_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+                <muxc:Expander.Header>
+                    <StackPanel>
+                        <TextBlock x:Name="Launch_Section_LaunchBehavior_Title_AccTitle"
+                                   x:Uid="Launch_Section_LaunchBehavior_Title"
+                                   Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                        <TextBlock x:Uid="Launch_Section_LaunchBehavior_Help"
+                                   Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                    </StackPanel>
+                </muxc:Expander.Header>
+                <StackPanel>
+                    <!--  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>
 
-            <!--  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">
+                    <!--  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>
 
-                                <Grid.ColumnDefinitions>
-                                    <!--  icon  -->
-                                    <ColumnDefinition Width="auto" />
-                                    <!--  terminal name and author  -->
-                                    <ColumnDefinition Width="auto" />
-                                    <!--  version  -->
-                                    <ColumnDefinition Width="auto" />
-                                </Grid.ColumnDefinitions>
+                    <!--  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>
 
-                                <Grid.RowDefinitions>
-                                    <!--  terminal name  -->
-                                    <RowDefinition Height="auto" />
-                                    <!--  author and version  -->
-                                    <RowDefinition Height="auto" />
-                                </Grid.RowDefinitions>
+                    <!--  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>
 
-                                <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.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"
+                    <!--  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.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"
-                                  IsOn="{x:Bind ViewModel.CenterOnLaunch, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </Grid>
-            </local:SettingContainer>
+                                  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"
+                                            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>
+                </StackPanel>
+            </muxc:Expander>
+
+            <!--  Section: System & input defaults  -->
+            <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Launch_Section_SystemInputDefaults_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+                <muxc:Expander.Header>
+                    <StackPanel>
+                        <TextBlock x:Name="Launch_Section_SystemInputDefaults_Title_AccTitle"
+                                   x:Uid="Launch_Section_SystemInputDefaults_Title"
+                                   Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                        <TextBlock x:Uid="Launch_Section_SystemInputDefaults_Help"
+                                   Style="{StaticResource SectionExpanderHelpTextStyle}" />
+                    </StackPanel>
+                </muxc:Expander.Header>
+                <StackPanel>
+                    <!--  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>
+
+                    <!--  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>
+            </muxc:Expander>
         </StackPanel>
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 7b082ea53c..365acf94b9 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -7,8 +7,6 @@
 #include "Launch.h"
 #include "Interaction.h"
 #include "Compatibility.h"
-#include "Rendering.h"
-#include "RenderingViewModel.h"
 #include "Extensions.h"
 #include "Actions.h"
 #include "ProfileViewModel.h"
@@ -554,11 +552,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 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));
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index 27ef0043fb..4f8de14d69 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -167,10 +167,6 @@
                                      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" />
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
index 611e0885eb..9c14dffc3b 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
@@ -119,10 +119,6 @@
       <DependentUpon>ColorSchemesPageViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
-    <ClInclude Include="RenderingViewModel.h">
-      <DependentUpon>RenderingViewModel.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
     <ClInclude Include="InteractionViewModel.h">
       <DependentUpon>InteractionViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
@@ -167,9 +163,6 @@
       <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>
@@ -246,9 +239,6 @@
     <Page Include="Appearances.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Rendering.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="SettingContainerStyle.xaml">
       <Type>DefaultStyle</Type>
     </Page>
@@ -331,10 +321,6 @@
       <DependentUpon>ColorSchemesPageViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="RenderingViewModel.cpp">
-      <DependentUpon>RenderingViewModel.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
     <ClCompile Include="InteractionViewModel.cpp">
       <DependentUpon>InteractionViewModel.idl</DependentUpon>
       <SubType>Code</SubType>
@@ -379,9 +365,6 @@
       <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>
@@ -443,10 +426,6 @@
       <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>
@@ -456,7 +435,6 @@
     <Midl Include="TerminalColorConverters.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" />
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
index deb05f2450..ca9a61dfd4 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
@@ -24,7 +24,6 @@
     <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" />
@@ -48,7 +47,6 @@
     <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" />
diff --git a/src/cascadia/TerminalSettingsEditor/NavConstants.h b/src/cascadia/TerminalSettingsEditor/NavConstants.h
index f83097b80d..75fdad0ffa 100644
--- a/src/cascadia/TerminalSettingsEditor/NavConstants.h
+++ b/src/cascadia/TerminalSettingsEditor/NavConstants.h
@@ -12,7 +12,6 @@ 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" };
@@ -28,7 +27,6 @@ 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 */
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
index d7e1df4a83..2d0e00816e 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
@@ -127,6 +127,10 @@ 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) {
@@ -357,6 +361,15 @@ 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{ fmt::format(fmt::runtime(std::wstring_view{ RS_(L"Profile_NameSectionHeaderFormat") }), Name()) };
+    }
+
     hstring ProfileViewModel::AnswerbackMessagePreview() const
     {
         if (const auto answerbackMessage{ AnswerbackMessage() }; !answerbackMessage.empty())
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
index fa403952e5..9ade1774e2 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
@@ -100,6 +100,7 @@ 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;
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
index c2d99246d0..a36dd9cb3d 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
@@ -105,6 +105,7 @@ 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);
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
index 6a2840c011..edd4bdbcf5 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
@@ -23,7 +23,9 @@ 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")));
     }
 
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
index 9ba89412c2..3ed51c124b 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
@@ -34,146 +34,172 @@
         <StackPanel Grid.Row="1"
                     Style="{StaticResource SettingsStackStyle}">
 
-            <!--  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"
-                            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}" />
+            <!--  Section: {Profile.Name} profile (or "Profile defaults")  -->
+            <muxc:Expander IsExpanded="True"
+                           AutomationProperties.Name="{x:Bind Profile.SectionHeaderText, Mode=OneWay}"
+                           Style="{StaticResource SectionExpanderStyle}">
+                <muxc:Expander.Header>
+                    <StackPanel>
+                        <TextBlock Style="{StaticResource SectionExpanderHeaderTextStyle}"
+                                   Text="{x:Bind Profile.SectionHeaderText, Mode=OneWay}" />
                     </StackPanel>
+                </muxc:Expander.Header>
+                <StackPanel>
+                    <!--  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"
+                                    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>
+                        </StackPanel>
+                    </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>
-            </local:SettingContainer>
+            </muxc:Expander>
 
-            <!--  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>
+            <!--  Section: Visual/UI Affordance  -->
+            <muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Profile_Section_VisualUI_Title_AccTitle}"
+                       Style="{StaticResource SectionExpanderStyle}">
+                <muxc:Expander.Header>
+                    <StackPanel>
+                        <TextBlock x:Name="Profile_Section_VisualUI_Title_AccTitle"
+                                   x:Uid="Profile_Section_VisualUI_Title"
+                                   Style="{StaticResource SectionExpanderHeaderTextStyle}" />
+                    </StackPanel>
+                </muxc:Expander.Header>
+                <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>
 
-            <!--  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>
+                    <!--  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>
-
-            <!--  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>
+                    <!--  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>
+            </muxc:Expander>
 
             <TextBlock x:Uid="Profile_AdditionalSettingsHeader"
                        Margin="0,32,0,4"
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.cpp b/src/cascadia/TerminalSettingsEditor/Rendering.cpp
deleted file mode 100644
index b6535d5609..0000000000
--- a/src/cascadia/TerminalSettingsEditor/Rendering.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// 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));
-    }
-}
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.h b/src/cascadia/TerminalSettingsEditor/Rendering.h
deleted file mode 100644
index dd202b1c7e..0000000000
--- a/src/cascadia/TerminalSettingsEditor/Rendering.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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);
-}
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.idl b/src/cascadia/TerminalSettingsEditor/Rendering.idl
deleted file mode 100644
index 21dc7d8023..0000000000
--- a/src/cascadia/TerminalSettingsEditor/Rendering.idl
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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; };
-    }
-}
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.xaml b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
deleted file mode 100644
index 9a966d0f91..0000000000
--- a/src/cascadia/TerminalSettingsEditor/Rendering.xaml
+++ /dev/null
@@ -1,48 +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.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>
diff --git a/src/cascadia/TerminalSettingsEditor/RenderingViewModel.cpp b/src/cascadia/TerminalSettingsEditor/RenderingViewModel.cpp
deleted file mode 100644
index 74c4d5922a..0000000000
--- a/src/cascadia/TerminalSettingsEditor/RenderingViewModel.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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");
-    }
-}
diff --git a/src/cascadia/TerminalSettingsEditor/RenderingViewModel.h b/src/cascadia/TerminalSettingsEditor/RenderingViewModel.h
deleted file mode 100644
index b3042d893a..0000000000
--- a/src/cascadia/TerminalSettingsEditor/RenderingViewModel.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// 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);
-}
diff --git a/src/cascadia/TerminalSettingsEditor/RenderingViewModel.idl b/src/cascadia/TerminalSettingsEditor/RenderingViewModel.idl
deleted file mode 100644
index 1ca164fbd9..0000000000
--- a/src/cascadia/TerminalSettingsEditor/RenderingViewModel.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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);
-    }
-}
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index ba6631deaa..55044f40d4 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -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>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>
+    <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>
   </data>
   <data name="Nav_ColorSchemes.Content" xml:space="preserve">
     <value>Color schemes</value>
@@ -677,10 +677,6 @@
     <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>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>
@@ -2780,4 +2776,169 @@
     <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>
+  <!--  Section expander headers + help text. These group settings into collapsible sections on each Settings page.  -->
+  <data name="Launch_Section_LaunchBehavior_Title.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_LaunchBehavior_Help.Text" xml:space="preserve">
+    <value>Control how the terminal opens and behaves when its launched.</value>
+    <comment>Description for the "Launch behavior" section.</comment>
+  </data>
+  <data name="Launch_Section_SystemInputDefaults_Title.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="Launch_Section_SystemInputDefaults_Help.Text" xml:space="preserve">
+    <value>Set default system and input behaviors that apply when the terminal starts and integrates with Windows.</value>
+    <comment>Description for the "System &amp; input defaults" section.</comment>
+  </data>
+  <data name="Interaction_Section_Clipboard_Title.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_Clipboard_Help.Text" xml:space="preserve">
+    <value>Controls how Terminal responds to common user actions, including selection, copying, and pasting.</value>
+    <comment>Description for the "Clipboard and paste behavior" section.</comment>
+  </data>
+  <data name="Interaction_Section_TextSelection_Title.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_TextSelection_Help.Text" xml:space="preserve">
+    <value>Controls how text is selected, edited, and formatted within the terminal.</value>
+    <comment>Description for the "Text selection &amp; editing" section.</comment>
+  </data>
+  <data name="Interaction_Section_WindowLayout_Title.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_WindowLayout_Help.Text" xml:space="preserve">
+    <value>Control how terminal windows are sized, arranged, and grouped.</value>
+    <comment>Description for the "Window and layout behavior" section.</comment>
+  </data>
+  <data name="Interaction_Section_MouseScrolling_Title.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_MouseScrolling_Help.Text" xml:space="preserve">
+    <value>Configure how mouse and scroll wheel input affect the terminal.</value>
+    <comment>Description for the "Mouse &amp; scrolling" section.</comment>
+  </data>
+  <data name="Interaction_Section_UrlsExternal_Title.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_UrlsExternal_Help.Text" xml:space="preserve">
+    <value>Manage how Terminal handles links and triggers actions in external apps.</value>
+    <comment>Description for the "URLs &amp; external actions" section.</comment>
+  </data>
+  <data name="Interaction_Section_Warnings_Title.Text" xml:space="preserve">
+    <value>Warnings</value>
+    <comment>Title of a section that groups warning-related settings.</comment>
+  </data>
+  <data name="Interaction_Section_Warnings_Help.Text" xml:space="preserve">
+    <value>Choose when Terminal should alert you before potentially disruptive actions.</value>
+    <comment>Description for the "Warnings" section.</comment>
+  </data>
+  <data name="Globals_Section_VisualStyle_Title.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_VisualStyle_Help.Text" xml:space="preserve">
+    <value>Control the terminal's visual appearance</value>
+    <comment>Description for the "Visual style" section.</comment>
+  </data>
+  <data name="Globals_Section_TabsLayout_Title.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_TabsLayout_Help.Text" xml:space="preserve">
+    <value>Manage how tabs and panes are organized, resized, and navigated.</value>
+    <comment>Description for the "Tabs and layout" section.</comment>
+  </data>
+  <data name="Globals_Section_WindowBehavior_Title.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_WindowBehavior_Help.Text" xml:space="preserve">
+    <value>Manage terminal window behavior.</value>
+    <comment>Description for the "Window behavior" section.</comment>
+  </data>
+  <data name="Globals_Section_TitleBarIdentity_Title.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_TitleBarIdentity_Help.Text" xml:space="preserve">
+    <value>Manage title bar identity and indicators</value>
+    <comment>Description for the "Title bar &amp; identity" section.</comment>
+  </data>
+  <data name="Globals_Section_SystemIntegration_Title.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="Globals_Section_SystemIntegration_Help.Text" xml:space="preserve">
+    <value>Control how the terminal integrates with Windows and how system-level notifications are shown.</value>
+    <comment>Description for the "System integration &amp; notifications" section.</comment>
+  </data>
+  <data name="Compatibility_Section_Compatibility_Title.Text" xml:space="preserve">
+    <value>Compatibility</value>
+    <comment>Title of a section that groups compatibility-related settings.</comment>
+  </data>
+  <data name="Compatibility_Section_Compatibility_Help.Text" xml:space="preserve">
+    <value>Settings for troubleshooting and supporting different command-line tools.</value>
+    <comment>Description for the "Compatibility" section.</comment>
+  </data>
+  <data name="Compatibility_Section_Rendering_Title.Text" xml:space="preserve">
+    <value>Rendering</value>
+    <comment>Title of a section that groups rendering-related settings.</comment>
+  </data>
+  <data name="Compatibility_Section_Rendering_Help.Text" xml:space="preserve">
+    <value>Rendering controls the terminal's drawing behavior.</value>
+    <comment>Description for the "Rendering" section.</comment>
+  </data>
+  <data name="Profile_Section_VisualUI_Title.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_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_Title.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_Typography_Help.Text" xml:space="preserve">
+    <value>Choose how text looks in this profile, including the font, size, and more advanced options.</value>
+    <comment>Description for the "Typography settings" section.</comment>
+  </data>
+  <data name="Appearance_Section_Cursor_Title.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_Cursor_Help.Text" xml:space="preserve">
+    <value>Customize how the text cursor looks and behaves while typing in this profile.</value>
+    <comment>Description for the "Cursor settings" section.</comment>
+  </data>
+  <data name="Appearance_Section_BackgroundImage_Title.Text" xml:space="preserve">
+    <value>Background image</value>
+    <comment>Title of a section that groups settings controlling the background image.</comment>
+  </data>
+  <data name="Appearance_Section_BackgroundImage_Help.Text" xml:space="preserve">
+    <value>Select a background image to personalize the look of your terminal.</value>
+    <comment>Description for the "Background image" section.</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>
diff --git a/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.cpp b/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.cpp
index 293f225d0c..6358a4d178 100644
--- a/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.cpp
+++ b/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.cpp
@@ -5,6 +5,7 @@
 #include "TerminalColorConverters.h"
 #include "ColorToBrushConverter.g.cpp"
 #include "ColorToStringConverter.g.cpp"
+#include "EmptyStringToVisibilityConverter.g.cpp"
 
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 
@@ -32,4 +33,22 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         throw hresult_not_implemented();
     }
+
+    Windows::Foundation::IInspectable EmptyStringToVisibilityConverter::Convert(Windows::Foundation::IInspectable const& value, Windows::UI::Xaml::Interop::TypeName const& /*targetType*/, Windows::Foundation::IInspectable const& /*parameter*/, hstring const& /*language*/)
+    {
+        hstring text;
+        if (value)
+        {
+            if (const auto& str{ value.try_as<hstring>() })
+            {
+                text = *str;
+            }
+        }
+        return winrt::box_value(text.empty() ? Windows::UI::Xaml::Visibility::Collapsed : Windows::UI::Xaml::Visibility::Visible);
+    }
+
+    Windows::Foundation::IInspectable EmptyStringToVisibilityConverter::ConvertBack(Windows::Foundation::IInspectable const& /*value*/, Windows::UI::Xaml::Interop::TypeName const& /*targetType*/, Windows::Foundation::IInspectable const& /*parameter*/, hstring const& /*language*/)
+    {
+        throw hresult_not_implemented();
+    }
 }
diff --git a/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.h b/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.h
index 9c956548a4..f4f2d223c0 100644
--- a/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.h
+++ b/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.h
@@ -5,6 +5,7 @@
 
 #include "ColorToBrushConverter.g.h"
 #include "ColorToStringConverter.g.h"
+#include "EmptyStringToVisibilityConverter.g.h"
 #include "Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
@@ -24,10 +25,19 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         Windows::Foundation::IInspectable Convert(Windows::Foundation::IInspectable const& value, Windows::UI::Xaml::Interop::TypeName const& targetType, Windows::Foundation::IInspectable const& parameter, hstring const& language);
         Windows::Foundation::IInspectable ConvertBack(Windows::Foundation::IInspectable const& value, Windows::UI::Xaml::Interop::TypeName const& targetType, Windows::Foundation::IInspectable const& parameter, hstring const& language);
     };
+
+    struct EmptyStringToVisibilityConverter : EmptyStringToVisibilityConverterT<EmptyStringToVisibilityConverter>
+    {
+        EmptyStringToVisibilityConverter() = default;
+
+        Windows::Foundation::IInspectable Convert(Windows::Foundation::IInspectable const& value, Windows::UI::Xaml::Interop::TypeName const& targetType, Windows::Foundation::IInspectable const& parameter, hstring const& language);
+        Windows::Foundation::IInspectable ConvertBack(Windows::Foundation::IInspectable const& value, Windows::UI::Xaml::Interop::TypeName const& targetType, Windows::Foundation::IInspectable const& parameter, hstring const& language);
+    };
 };
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
 {
     BASIC_FACTORY(ColorToBrushConverter);
     BASIC_FACTORY(ColorToStringConverter);
+    BASIC_FACTORY(EmptyStringToVisibilityConverter);
 }
diff --git a/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.idl b/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.idl
index 98f06c89af..b9716e6210 100644
--- a/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.idl
+++ b/src/cascadia/TerminalSettingsEditor/TerminalColorConverters.idl
@@ -12,4 +12,9 @@ namespace Microsoft.Terminal.Settings.Editor
     {
         ColorToStringConverter();
     }
+
+    runtimeclass EmptyStringToVisibilityConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        EmptyStringToVisibilityConverter();
+    }
 }
diff --git a/src/cascadia/TerminalSettingsEditor/Utils.h b/src/cascadia/TerminalSettingsEditor/Utils.h
index 2a4d6f6139..6ad7bfff7d 100644
--- a/src/cascadia/TerminalSettingsEditor/Utils.h
+++ b/src/cascadia/TerminalSettingsEditor/Utils.h
@@ -133,11 +133,38 @@ struct HasScrollViewer
             {
                 if (const auto& controlToFocus{ page->FindName(elementName).try_as<winrt::Windows::UI::Xaml::Controls::Control>() })
                 {
-                    // 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);
+                    // 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 (auto control = weakControl.get())
+                        {
+                            control.UpdateLayout();
+                            control.StartBringIntoView();
+                            control.Focus(winrt::Windows::UI::Xaml::FocusState::Programmatic);
+                        }
+                    });
                 }
                 page->_loadedRevoker.revoke();
             }
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index 1a5d774702..5909471e06 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -56,11 +56,6 @@ $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"