From 7fed067f43d7e280eb7dbf8111786a1eba15d0c8 Mon Sep 17 00:00:00 2001
From: Carlos Zamora <cazamor@microsoft.com>
Date: Thu, 14 May 2026 17:32:46 -0700
Subject: [PATCH] Remove expander sections; use regular sections instead

---
 .../TerminalSettingsEditor/Appearances.xaml   | 1443 ++++++++---------
 .../TerminalSettingsEditor/Compatibility.xaml |  206 ++-
 .../GlobalAppearance.xaml                     |  261 ++-
 .../TerminalSettingsEditor/Interaction.xaml   |  296 ++--
 .../TerminalSettingsEditor/Launch.xaml        |  512 +++---
 .../Profiles_Appearance.xaml                  |  213 ++-
 .../TerminalSettingsEditor/Profiles_Base.xaml |  285 ++--
 .../Resources/en-US/Resources.resw            |  112 +-
 .../SettingContainerStyle.xaml                |   53 -
 tools/GenerateSettingsIndex.ps1               |    3 +-
 10 files changed, 1617 insertions(+), 1767 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
index 90bf89888e..e42a77c0c8 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -69,754 +69,749 @@
 
     <StackPanel>
         <!--  Section: Typography settings  -->
-        <local:SettingContainer x:Uid="Appearance_Section_Typography"
-                                StartExpanded="True"
-                                Style="{StaticResource SectionExpanderStyle}">
-            <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}"
-                                        CurrentValueAccessibleName="{x:Bind Appearance.CurrentColorScheme.Name, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Appearance.HasDarkColorSchemeName, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.DarkColorSchemeNameOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                    <local:SettingContainer.CurrentValue>
-                        <ComboBox Padding="4"
-                                  ItemsSource="{x:Bind Appearance.SchemesList, Mode=OneWay}"
-                                  SelectedItem="{x:Bind Appearance.CurrentColorScheme, Mode=TwoWay}"
-                                  Style="{StaticResource ComboBoxSettingStyle}">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate x:DataType="local:ColorSchemeViewModel">
-                                    <Grid Grid.Column="0"
-                                          Padding="8"
-                                          VerticalAlignment="Center"
-                                          Background="{x:Bind mtu:Converters.ColorToBrush(BackgroundColor.Color), Mode=OneWay}"
-                                          ColumnSpacing="1"
-                                          CornerRadius="2"
-                                          RowSpacing="1">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                        </Grid.RowDefinitions>
-                                        <ContentControl Grid.Row="0"
-                                                        Grid.Column="0"
-                                                        Content="{x:Bind ColorEntryAt(0), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="0"
-                                                        Grid.Column="1"
-                                                        Content="{x:Bind ColorEntryAt(1), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="0"
-                                                        Grid.Column="2"
-                                                        Content="{x:Bind ColorEntryAt(2), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="0"
-                                                        Grid.Column="3"
-                                                        Content="{x:Bind ColorEntryAt(3), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="0"
-                                                        Grid.Column="4"
-                                                        Content="{x:Bind ColorEntryAt(4), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="0"
-                                                        Grid.Column="5"
-                                                        Content="{x:Bind ColorEntryAt(5), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="0"
-                                                        Grid.Column="6"
-                                                        Content="{x:Bind ColorEntryAt(6), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="0"
-                                                        Grid.Column="7"
-                                                        Content="{x:Bind ColorEntryAt(7), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="1"
-                                                        Grid.Column="0"
-                                                        Content="{x:Bind ColorEntryAt(8), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="1"
-                                                        Grid.Column="1"
-                                                        Content="{x:Bind ColorEntryAt(9), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="1"
-                                                        Grid.Column="2"
-                                                        Content="{x:Bind ColorEntryAt(10), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="1"
-                                                        Grid.Column="3"
-                                                        Content="{x:Bind ColorEntryAt(11), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="1"
-                                                        Grid.Column="4"
-                                                        Content="{x:Bind ColorEntryAt(12), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="1"
-                                                        Grid.Column="5"
-                                                        Content="{x:Bind ColorEntryAt(13), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="1"
-                                                        Grid.Column="6"
-                                                        Content="{x:Bind ColorEntryAt(14), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <ContentControl Grid.Row="1"
-                                                        Grid.Column="7"
-                                                        Content="{x:Bind ColorEntryAt(15), Mode=OneWay}"
-                                                        ContentTemplate="{StaticResource ColorChipTemplate}"
-                                                        IsTabStop="False" />
-                                        <TextBlock Grid.RowSpan="2"
-                                                   Grid.Column="8"
-                                                   MaxWidth="192"
-                                                   Margin="4,0,4,0"
-                                                   HorizontalAlignment="Center"
-                                                   VerticalAlignment="Center"
-                                                   AutomationProperties.AccessibilityView="Raw"
-                                                   FontFamily="Cascadia Code"
-                                                   Foreground="{x:Bind mtu:Converters.ColorToBrush(ForegroundColor.Color), Mode=OneWay}"
-                                                   Text="{x:Bind Name, Mode=OneWay}"
-                                                   TextTrimming="WordEllipsis"
-                                                   ToolTipService.ToolTip="{x:Bind Name, Mode=OneWay}" />
-                                    </Grid>
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-                    </local:SettingContainer.CurrentValue>
-                    <local:SettingContainer.Content>
-                        <StackPanel>
-
-                            <!--  Foreground Color  -->
-                            <local:SettingContainer x:Name="Foreground"
-                                                    x:Uid="Profile_Foreground"
-                                                    ClearSettingValue="{x:Bind Appearance.ClearForeground}"
-                                                    CurrentValue="{x:Bind Appearance.ForegroundPreview, Mode=OneWay}"
-                                                    CurrentValueAccessibleName="{x:Bind Appearance.ForegroundPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
-                                                    CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
-                                                    HasSettingValue="{x:Bind Appearance.HasForeground, Mode=OneWay}"
-                                                    SettingOverrideSource="{x:Bind Appearance.ForegroundOverrideSource, Mode=OneWay}"
-                                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                                <local:NullableColorPicker x:Uid="Profile_Foreground_NullableColorPicker"
-                                                           ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
-                                                           CurrentColor="{x:Bind Appearance.Foreground, Mode=TwoWay}"
-                                                           NullColorPreview="{x:Bind Appearance.CurrentColorScheme.ForegroundColor.Color, Mode=OneWay}" />
-                            </local:SettingContainer>
-
-                            <!--  Background Color  -->
-                            <local:SettingContainer x:Name="Background"
-                                                    x:Uid="Profile_Background"
-                                                    ClearSettingValue="{x:Bind Appearance.ClearBackground}"
-                                                    CurrentValue="{x:Bind Appearance.BackgroundPreview, Mode=OneWay}"
-                                                    CurrentValueAccessibleName="{x:Bind Appearance.BackgroundPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
-                                                    CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
-                                                    HasSettingValue="{x:Bind Appearance.HasBackground, Mode=OneWay}"
-                                                    SettingOverrideSource="{x:Bind Appearance.BackgroundOverrideSource, Mode=OneWay}"
-                                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                                <local:NullableColorPicker x:Uid="Profile_Background_NullableColorPicker"
-                                                           ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
-                                                           CurrentColor="{x:Bind Appearance.Background, Mode=TwoWay}"
-                                                           NullColorPreview="{x:Bind Appearance.CurrentColorScheme.BackgroundColor.Color, Mode=OneWay}" />
-                            </local:SettingContainer>
-
-                            <!--  Selection Background Color  -->
-                            <local:SettingContainer x:Name="SelectionBackground"
-                                                    x:Uid="Profile_SelectionBackground"
-                                                    ClearSettingValue="{x:Bind Appearance.ClearSelectionBackground}"
-                                                    CurrentValue="{x:Bind Appearance.SelectionBackgroundPreview, Mode=OneWay}"
-                                                    CurrentValueAccessibleName="{x:Bind Appearance.SelectionBackgroundPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
-                                                    CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
-                                                    HasSettingValue="{x:Bind Appearance.HasSelectionBackground, Mode=OneWay}"
-                                                    SettingOverrideSource="{x:Bind Appearance.SelectionBackgroundOverrideSource, Mode=OneWay}"
-                                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                                <local:NullableColorPicker x:Uid="Profile_SelectionBackground_NullableColorPicker"
-                                                           ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
-                                                           CurrentColor="{x:Bind Appearance.SelectionBackground, Mode=TwoWay}"
-                                                           NullColorPreview="{x:Bind Appearance.CurrentColorScheme.SelectionBackgroundColor.Color, Mode=OneWay}" />
-                            </local:SettingContainer>
-                        </StackPanel>
-                    </local:SettingContainer.Content>
-                </local:SettingContainer>
-                <!--  Font Face  -->
-                <local:SettingContainer x:Name="FontFaceContainer"
-                                        x:Uid="Profile_FontFace"
-                                        ClearSettingValue="{x:Bind Appearance.ClearFontFace}"
-                                        HasSettingValue="{x:Bind Appearance.HasFontFace, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.FontFaceOverrideSource, Mode=OneWay}"
-                                        Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
-
-                    <StackPanel Margin="0,8,0,0">
-                        <AutoSuggestBox x:Uid="Profile_FontFaceBox"
-                                        GotFocus="FontFaceBox_GotFocus"
-                                        ItemTemplate="{StaticResource FontFaceComboBoxItemTemplate}"
-                                        ItemsSource="{x:Bind FilteredFontList, Mode=OneWay}"
-                                        LostFocus="FontFaceBox_LostFocus"
-                                        QuerySubmitted="FontFaceBox_QuerySubmitted"
-                                        Text="{x:Bind Appearance.FontFace, Mode=OneWay}"
-                                        TextBoxStyle="{StaticResource TextBoxSettingStyle}"
-                                        TextChanged="FontFaceBox_TextChanged"
-                                        UpdateTextOnSelect="False" />
-                        <CheckBox x:Name="ShowAllFontsCheckbox"
-                                  x:Uid="Profile_FontFaceShowAllFonts"
-                                  IsChecked="{x:Bind ShowAllFonts, Mode=TwoWay}" />
-                    </StackPanel>
-                </local:SettingContainer>
-                <local:SettingContainer x:Name="MissingFontFaces"
-                                        x:Uid="Profile_MissingFontFaces"
-                                        HelpText="{x:Bind Appearance.MissingFontFaces, Mode=OneWay}"
-                                        Style="{StaticResource SettingContainerErrorStyle}"
-                                        Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.MissingFontFaces), Mode=OneWay}" />
-                <local:SettingContainer x:Name="ProportionalFontFaces"
-                                        x:Uid="Profile_ProportionalFontFaces"
-                                        HelpText="{x:Bind Appearance.ProportionalFontFaces, Mode=OneWay}"
-                                        Style="{StaticResource SettingContainerWarningStyle}"
-                                        Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.ProportionalFontFaces), Mode=OneWay}" />
-
-                <!--  Font Size  -->
-                <local:SettingContainer x:Name="FontSize"
-                                        x:Uid="Profile_FontSize"
-                                        ClearSettingValue="{x:Bind Appearance.ClearFontSize}"
-                                        HasSettingValue="{x:Bind Appearance.HasFontSize, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.FontSizeOverrideSource, Mode=OneWay}"
-                                        Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
-                    <muxc:NumberBox x:Name="_fontSizeBox"
-                                    x:Uid="Profile_FontSizeBox"
-                                    LargeChange="10"
-                                    Maximum="128"
-                                    Minimum="1"
-                                    SmallChange="1"
-                                    Style="{StaticResource NumberBoxSettingStyle}"
-                                    Value="{x:Bind Appearance.FontSize, Mode=TwoWay}" />
-                </local:SettingContainer>
-
-                <!--  Line Height  -->
-                <local:SettingContainer x:Name="LineHeight"
-                                        x:Uid="Profile_LineHeight"
-                                        ClearSettingValue="{x:Bind Appearance.ClearLineHeight}"
-                                        HasSettingValue="{x:Bind Appearance.HasLineHeight, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.LineHeightOverrideSource, Mode=OneWay}"
-                                        Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
-                    <muxc:NumberBox x:Name="_lineHeightBox"
-                                    x:Uid="Profile_LineHeightBox"
-                                    LargeChange="0.1"
-                                    Maximum="10"
-                                    Minimum="0.1"
-                                    SmallChange="0.1"
-                                    Style="{StaticResource NumberBoxSettingStyle}"
-                                    Value="{x:Bind Appearance.LineHeight, Mode=TwoWay}" />
-                </local:SettingContainer>
-
-                <!--  Cell Width  -->
-                <local:SettingContainer x:Name="CellWidth"
-                                        x:Uid="Profile_CellWidth"
-                                        ClearSettingValue="{x:Bind Appearance.ClearCellWidth}"
-                                        HasSettingValue="{x:Bind Appearance.HasCellWidth, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.CellWidthOverrideSource, Mode=OneWay}"
-                                        Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
-                    <muxc:NumberBox x:Name="_cellWidthBox"
-                                    x:Uid="Profile_CellWidthBox"
-                                    LargeChange="0.1"
-                                    Maximum="10"
-                                    Minimum="0.1"
-                                    SmallChange="0.1"
-                                    Style="{StaticResource NumberBoxSettingStyle}"
-                                    Value="{x:Bind Appearance.CellWidth, Mode=TwoWay}" />
-                </local:SettingContainer>
-
-                <!--  Font Weight  -->
-                <local:SettingContainer x:Name="FontWeight"
-                                        x:Uid="Profile_FontWeight"
-                                        ClearSettingValue="{x:Bind Appearance.ClearFontWeight}"
-                                        HasSettingValue="{x:Bind Appearance.HasFontWeight, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.FontWeightOverrideSource, Mode=OneWay}"
-                                        Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
+        <StackPanel Style="{StaticResource PivotStackStyle}">
+            <TextBlock x:Uid="Appearance_Section_Typography"
+                       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.  -->
+            <local:SettingContainer x:Name="ColorScheme"
+                                    x:Uid="Profile_ColorScheme"
+                                    ClearSettingValue="{x:Bind Appearance.ClearColorScheme}"
+                                    CurrentValueAccessibleName="{x:Bind Appearance.CurrentColorScheme.Name, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Appearance.HasDarkColorSchemeName, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.DarkColorSchemeNameOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                <local:SettingContainer.CurrentValue>
+                    <ComboBox Padding="4"
+                              ItemsSource="{x:Bind Appearance.SchemesList, Mode=OneWay}"
+                              SelectedItem="{x:Bind Appearance.CurrentColorScheme, Mode=TwoWay}"
+                              Style="{StaticResource ComboBoxSettingStyle}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="local:ColorSchemeViewModel">
+                                <Grid Grid.Column="0"
+                                      Padding="8"
+                                      VerticalAlignment="Center"
+                                      Background="{x:Bind mtu:Converters.ColorToBrush(BackgroundColor.Color), Mode=OneWay}"
+                                      ColumnSpacing="1"
+                                      CornerRadius="2"
+                                      RowSpacing="1">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <ContentControl Grid.Row="0"
+                                                    Grid.Column="0"
+                                                    Content="{x:Bind ColorEntryAt(0), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="0"
+                                                    Grid.Column="1"
+                                                    Content="{x:Bind ColorEntryAt(1), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="0"
+                                                    Grid.Column="2"
+                                                    Content="{x:Bind ColorEntryAt(2), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="0"
+                                                    Grid.Column="3"
+                                                    Content="{x:Bind ColorEntryAt(3), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="0"
+                                                    Grid.Column="4"
+                                                    Content="{x:Bind ColorEntryAt(4), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="0"
+                                                    Grid.Column="5"
+                                                    Content="{x:Bind ColorEntryAt(5), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="0"
+                                                    Grid.Column="6"
+                                                    Content="{x:Bind ColorEntryAt(6), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="0"
+                                                    Grid.Column="7"
+                                                    Content="{x:Bind ColorEntryAt(7), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="1"
+                                                    Grid.Column="0"
+                                                    Content="{x:Bind ColorEntryAt(8), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="1"
+                                                    Grid.Column="1"
+                                                    Content="{x:Bind ColorEntryAt(9), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="1"
+                                                    Grid.Column="2"
+                                                    Content="{x:Bind ColorEntryAt(10), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="1"
+                                                    Grid.Column="3"
+                                                    Content="{x:Bind ColorEntryAt(11), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="1"
+                                                    Grid.Column="4"
+                                                    Content="{x:Bind ColorEntryAt(12), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="1"
+                                                    Grid.Column="5"
+                                                    Content="{x:Bind ColorEntryAt(13), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="1"
+                                                    Grid.Column="6"
+                                                    Content="{x:Bind ColorEntryAt(14), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <ContentControl Grid.Row="1"
+                                                    Grid.Column="7"
+                                                    Content="{x:Bind ColorEntryAt(15), Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorChipTemplate}"
+                                                    IsTabStop="False" />
+                                    <TextBlock Grid.RowSpan="2"
+                                               Grid.Column="8"
+                                               MaxWidth="192"
+                                               Margin="4,0,4,0"
+                                               HorizontalAlignment="Center"
+                                               VerticalAlignment="Center"
+                                               AutomationProperties.AccessibilityView="Raw"
+                                               FontFamily="Cascadia Code"
+                                               Foreground="{x:Bind mtu:Converters.ColorToBrush(ForegroundColor.Color), Mode=OneWay}"
+                                               Text="{x:Bind Name, Mode=OneWay}"
+                                               TextTrimming="WordEllipsis"
+                                               ToolTipService.ToolTip="{x:Bind Name, Mode=OneWay}" />
+                                </Grid>
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+                </local:SettingContainer.CurrentValue>
+                <local:SettingContainer.Content>
                     <StackPanel>
-                        <ComboBox x:Name="FontWeightComboBox"
-                                  x:Uid="Profile_FontWeightComboBox"
-                                  ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                                  ItemsSource="{x:Bind FontWeightList, Mode=OneWay}"
-                                  SelectedItem="{x:Bind CurrentFontWeight, Mode=TwoWay}"
-                                  Style="{StaticResource ComboBoxSettingStyle}" />
 
-                        <!--  Custom Font Weight Control  -->
-                        <Grid Margin="0,10,0,0"
-                              Style="{StaticResource CustomSliderControlGridStyle}"
-                              Visibility="{x:Bind IsCustomFontWeight, Mode=OneWay}">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Slider x:Name="FontWeightSlider"
-                                    x:Uid="Profile_FontWeightSlider"
-                                    Grid.Column="0"
-                                    Maximum="1000"
-                                    Minimum="0"
-                                    TickFrequency="50"
-                                    TickPlacement="Outside"
-                                    Value="{x:Bind mtu:Converters.FontWeightToDouble(Appearance.FontWeight), BindBack=Appearance.SetFontWeightFromDouble, Mode=TwoWay}" />
-                            <TextBlock Grid.Column="1"
-                                       Margin="10,0,0,0"
-                                       Style="{StaticResource SliderValueLabelStyle}"
-                                       Text="{Binding ElementName=FontWeightSlider, Path=Value, Mode=OneWay}" />
-                        </Grid>
+                        <!--  Foreground Color  -->
+                        <local:SettingContainer x:Name="Foreground"
+                                                x:Uid="Profile_Foreground"
+                                                ClearSettingValue="{x:Bind Appearance.ClearForeground}"
+                                                CurrentValue="{x:Bind Appearance.ForegroundPreview, Mode=OneWay}"
+                                                CurrentValueAccessibleName="{x:Bind Appearance.ForegroundPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
+                                                CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
+                                                HasSettingValue="{x:Bind Appearance.HasForeground, Mode=OneWay}"
+                                                SettingOverrideSource="{x:Bind Appearance.ForegroundOverrideSource, Mode=OneWay}"
+                                                Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                            <local:NullableColorPicker x:Uid="Profile_Foreground_NullableColorPicker"
+                                                       ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
+                                                       CurrentColor="{x:Bind Appearance.Foreground, Mode=TwoWay}"
+                                                       NullColorPreview="{x:Bind Appearance.CurrentColorScheme.ForegroundColor.Color, Mode=OneWay}" />
+                        </local:SettingContainer>
+
+                        <!--  Background Color  -->
+                        <local:SettingContainer x:Name="Background"
+                                                x:Uid="Profile_Background"
+                                                ClearSettingValue="{x:Bind Appearance.ClearBackground}"
+                                                CurrentValue="{x:Bind Appearance.BackgroundPreview, Mode=OneWay}"
+                                                CurrentValueAccessibleName="{x:Bind Appearance.BackgroundPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
+                                                CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
+                                                HasSettingValue="{x:Bind Appearance.HasBackground, Mode=OneWay}"
+                                                SettingOverrideSource="{x:Bind Appearance.BackgroundOverrideSource, Mode=OneWay}"
+                                                Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                            <local:NullableColorPicker x:Uid="Profile_Background_NullableColorPicker"
+                                                       ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
+                                                       CurrentColor="{x:Bind Appearance.Background, Mode=TwoWay}"
+                                                       NullColorPreview="{x:Bind Appearance.CurrentColorScheme.BackgroundColor.Color, Mode=OneWay}" />
+                        </local:SettingContainer>
+
+                        <!--  Selection Background Color  -->
+                        <local:SettingContainer x:Name="SelectionBackground"
+                                                x:Uid="Profile_SelectionBackground"
+                                                ClearSettingValue="{x:Bind Appearance.ClearSelectionBackground}"
+                                                CurrentValue="{x:Bind Appearance.SelectionBackgroundPreview, Mode=OneWay}"
+                                                CurrentValueAccessibleName="{x:Bind Appearance.SelectionBackgroundPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
+                                                CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
+                                                HasSettingValue="{x:Bind Appearance.HasSelectionBackground, Mode=OneWay}"
+                                                SettingOverrideSource="{x:Bind Appearance.SelectionBackgroundOverrideSource, Mode=OneWay}"
+                                                Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                            <local:NullableColorPicker x:Uid="Profile_SelectionBackground_NullableColorPicker"
+                                                       ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
+                                                       CurrentColor="{x:Bind Appearance.SelectionBackground, Mode=TwoWay}"
+                                                       NullColorPreview="{x:Bind Appearance.CurrentColorScheme.SelectionBackgroundColor.Color, Mode=OneWay}" />
+                        </local:SettingContainer>
                     </StackPanel>
-                </local:SettingContainer>
-                <local:SettingContainer x:Name="FontAxes"
-                                        x:Uid="Profile_FontAxes"
-                                        ClearSettingValue="{x:Bind Appearance.ClearFontAxes}"
-                                        HasSettingValue="{x:Bind Appearance.HasFontAxes, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.FontAxesOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <StackPanel Spacing="16">
-                        <ListView IsItemClickEnabled="False"
-                                  ItemTemplate="{StaticResource FontKeyValuePairTemplate}"
-                                  ItemsSource="{x:Bind Appearance.FontAxes, Mode=OneWay}"
-                                  SelectionMode="None" />
-                        <muxc:DropDownButton x:Name="AddFontAxisButton"
-                                             x:Uid="Profile_AddFontAxisButton">
-                            <muxc:DropDownButton.Content>
-                                <StackPanel Orientation="Horizontal">
-                                    <FontIcon VerticalAlignment="Bottom"
-                                              FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE710;" />
-                                    <TextBlock x:Uid="Profile_AddNewFontAxis"
-                                               Style="{StaticResource IconButtonTextBlockStyle}" />
-                                </StackPanel>
-                            </muxc:DropDownButton.Content>
-                            <muxc:DropDownButton.Flyout>
-                                <MenuFlyout />
-                            </muxc:DropDownButton.Flyout>
-                        </muxc:DropDownButton>
-                    </StackPanel>
-                </local:SettingContainer>
-                <local:SettingContainer x:Name="FontFeatures"
-                                        x:Uid="Profile_FontFeatures"
-                                        ClearSettingValue="{x:Bind Appearance.ClearFontFeatures}"
-                                        HasSettingValue="{x:Bind Appearance.HasFontFeatures, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.FontFeaturesOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <StackPanel Spacing="16">
-                        <ListView IsItemClickEnabled="False"
-                                  ItemTemplate="{StaticResource FontKeyValuePairTemplate}"
-                                  ItemsSource="{x:Bind Appearance.FontFeatures, Mode=OneWay}"
-                                  SelectionMode="None" />
-                        <muxc:DropDownButton x:Name="AddFontFeatureButton"
-                                             x:Uid="Profile_AddFontFeatureButton">
-                            <muxc:DropDownButton.Content>
-                                <StackPanel Orientation="Horizontal">
-                                    <FontIcon VerticalAlignment="Bottom"
-                                              FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE710;" />
-                                    <TextBlock x:Uid="Profile_AddNewFontFeature"
-                                               Style="{StaticResource IconButtonTextBlockStyle}" />
-                                </StackPanel>
-                            </muxc:DropDownButton.Content>
-                            <muxc:DropDownButton.Flyout>
-                                <MenuFlyout />
-                            </muxc:DropDownButton.Flyout>
-                        </muxc:DropDownButton>
-                    </StackPanel>
-                </local:SettingContainer>
+                </local:SettingContainer.Content>
+            </local:SettingContainer>
+            <!--  Font Face  -->
+            <local:SettingContainer x:Name="FontFaceContainer"
+                                    x:Uid="Profile_FontFace"
+                                    ClearSettingValue="{x:Bind Appearance.ClearFontFace}"
+                                    HasSettingValue="{x:Bind Appearance.HasFontFace, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.FontFaceOverrideSource, Mode=OneWay}"
+                                    Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
 
-                <!--  Builtin Glyphs  -->
-                <local:SettingContainer x:Name="EnableBuiltinGlyphs"
-                                        x:Uid="Profile_EnableBuiltinGlyphs"
-                                        ClearSettingValue="{x:Bind Appearance.ClearEnableBuiltinGlyphs}"
-                                        HasSettingValue="{x:Bind Appearance.HasEnableBuiltinGlyphs, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.EnableBuiltinGlyphsOverrideSource, Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Appearance.EnableBuiltinGlyphs, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+                <StackPanel Margin="0,8,0,0">
+                    <AutoSuggestBox x:Uid="Profile_FontFaceBox"
+                                    GotFocus="FontFaceBox_GotFocus"
+                                    ItemTemplate="{StaticResource FontFaceComboBoxItemTemplate}"
+                                    ItemsSource="{x:Bind FilteredFontList, Mode=OneWay}"
+                                    LostFocus="FontFaceBox_LostFocus"
+                                    QuerySubmitted="FontFaceBox_QuerySubmitted"
+                                    Text="{x:Bind Appearance.FontFace, Mode=OneWay}"
+                                    TextBoxStyle="{StaticResource TextBoxSettingStyle}"
+                                    TextChanged="FontFaceBox_TextChanged"
+                                    UpdateTextOnSelect="False" />
+                    <CheckBox x:Name="ShowAllFontsCheckbox"
+                              x:Uid="Profile_FontFaceShowAllFonts"
+                              IsChecked="{x:Bind ShowAllFonts, Mode=TwoWay}" />
+                </StackPanel>
+            </local:SettingContainer>
+            <local:SettingContainer x:Name="MissingFontFaces"
+                                    x:Uid="Profile_MissingFontFaces"
+                                    HelpText="{x:Bind Appearance.MissingFontFaces, Mode=OneWay}"
+                                    Style="{StaticResource SettingContainerErrorStyle}"
+                                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.MissingFontFaces), Mode=OneWay}" />
+            <local:SettingContainer x:Name="ProportionalFontFaces"
+                                    x:Uid="Profile_ProportionalFontFaces"
+                                    HelpText="{x:Bind Appearance.ProportionalFontFaces, Mode=OneWay}"
+                                    Style="{StaticResource SettingContainerWarningStyle}"
+                                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.ProportionalFontFaces), Mode=OneWay}" />
 
-                <!--  Color Glyphs  -->
-                <local:SettingContainer x:Name="EnableColorGlyphs"
-                                        x:Uid="Profile_EnableColorGlyphs"
-                                        ClearSettingValue="{x:Bind Appearance.ClearEnableColorGlyphs}"
-                                        HasSettingValue="{x:Bind Appearance.HasEnableColorGlyphs, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.EnableColorGlyphsOverrideSource, Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Appearance.EnableColorGlyphs, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Font Size  -->
+            <local:SettingContainer x:Name="FontSize"
+                                    x:Uid="Profile_FontSize"
+                                    ClearSettingValue="{x:Bind Appearance.ClearFontSize}"
+                                    HasSettingValue="{x:Bind Appearance.HasFontSize, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.FontSizeOverrideSource, Mode=OneWay}"
+                                    Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
+                <muxc:NumberBox x:Name="_fontSizeBox"
+                                x:Uid="Profile_FontSizeBox"
+                                LargeChange="10"
+                                Maximum="128"
+                                Minimum="1"
+                                SmallChange="1"
+                                Style="{StaticResource NumberBoxSettingStyle}"
+                                Value="{x:Bind Appearance.FontSize, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Retro Terminal Effect  -->
-                <local:SettingContainer x:Name="RetroTerminalEffect"
-                                        x:Uid="Profile_RetroTerminalEffect"
-                                        ClearSettingValue="{x:Bind Appearance.ClearRetroTerminalEffect}"
-                                        HasSettingValue="{x:Bind Appearance.HasRetroTerminalEffect, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.RetroTerminalEffectOverrideSource, Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Appearance.RetroTerminalEffect, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Line Height  -->
+            <local:SettingContainer x:Name="LineHeight"
+                                    x:Uid="Profile_LineHeight"
+                                    ClearSettingValue="{x:Bind Appearance.ClearLineHeight}"
+                                    HasSettingValue="{x:Bind Appearance.HasLineHeight, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.LineHeightOverrideSource, Mode=OneWay}"
+                                    Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
+                <muxc:NumberBox x:Name="_lineHeightBox"
+                                x:Uid="Profile_LineHeightBox"
+                                LargeChange="0.1"
+                                Maximum="10"
+                                Minimum="0.1"
+                                SmallChange="0.1"
+                                Style="{StaticResource NumberBoxSettingStyle}"
+                                Value="{x:Bind Appearance.LineHeight, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Adjust Indistinguishable Colors  -->
-                <local:SettingContainer x:Name="AdjustIndistinguishableColors"
-                                        x:Uid="Profile_AdjustIndistinguishableColors"
-                                        ClearSettingValue="{x:Bind Appearance.ClearAdjustIndistinguishableColors}"
-                                        HasSettingValue="{x:Bind Appearance.HasAdjustIndistinguishableColors, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.AdjustIndistinguishableColorsOverrideSource, Mode=OneWay}">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
+            <!--  Cell Width  -->
+            <local:SettingContainer x:Name="CellWidth"
+                                    x:Uid="Profile_CellWidth"
+                                    ClearSettingValue="{x:Bind Appearance.ClearCellWidth}"
+                                    HasSettingValue="{x:Bind Appearance.HasCellWidth, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.CellWidthOverrideSource, Mode=OneWay}"
+                                    Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
+                <muxc:NumberBox x:Name="_cellWidthBox"
+                                x:Uid="Profile_CellWidthBox"
+                                LargeChange="0.1"
+                                Maximum="10"
+                                Minimum="0.1"
+                                SmallChange="0.1"
+                                Style="{StaticResource NumberBoxSettingStyle}"
+                                Value="{x:Bind Appearance.CellWidth, Mode=TwoWay}" />
+            </local:SettingContainer>
+
+            <!--  Font Weight  -->
+            <local:SettingContainer x:Name="FontWeight"
+                                    x:Uid="Profile_FontWeight"
+                                    ClearSettingValue="{x:Bind Appearance.ClearFontWeight}"
+                                    HasSettingValue="{x:Bind Appearance.HasFontWeight, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.FontWeightOverrideSource, Mode=OneWay}"
+                                    Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
+                <StackPanel>
+                    <ComboBox x:Name="FontWeightComboBox"
+                              x:Uid="Profile_FontWeightComboBox"
                               ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind AdjustIndistinguishableColorsList, Mode=OneWay}"
-                              SelectedItem="{x:Bind CurrentAdjustIndistinguishableColors, Mode=TwoWay}"
+                              ItemsSource="{x:Bind FontWeightList, Mode=OneWay}"
+                              SelectedItem="{x:Bind CurrentFontWeight, Mode=TwoWay}"
                               Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
 
-                <!--  Intense is bold, bright  -->
-                <local:SettingContainer x:Name="IntenseTextStyle"
-                                        x:Uid="Appearance_IntenseTextStyle"
-                                        ClearSettingValue="{x:Bind Appearance.ClearIntenseTextStyle}"
-                                        HasSettingValue="{x:Bind Appearance.HasIntenseTextStyle, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.IntenseTextStyleOverrideSource, Mode=OneWay}">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind IntenseTextStyleList, Mode=OneWay}"
-                              SelectedItem="{x:Bind CurrentIntenseTextStyle, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
-        </local:SettingContainer>
+                    <!--  Custom Font Weight Control  -->
+                    <Grid Margin="0,10,0,0"
+                          Style="{StaticResource CustomSliderControlGridStyle}"
+                          Visibility="{x:Bind IsCustomFontWeight, Mode=OneWay}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Slider x:Name="FontWeightSlider"
+                                x:Uid="Profile_FontWeightSlider"
+                                Grid.Column="0"
+                                Maximum="1000"
+                                Minimum="0"
+                                TickFrequency="50"
+                                TickPlacement="Outside"
+                                Value="{x:Bind mtu:Converters.FontWeightToDouble(Appearance.FontWeight), BindBack=Appearance.SetFontWeightFromDouble, Mode=TwoWay}" />
+                        <TextBlock Grid.Column="1"
+                                   Margin="10,0,0,0"
+                                   Style="{StaticResource SliderValueLabelStyle}"
+                                   Text="{Binding ElementName=FontWeightSlider, Path=Value, Mode=OneWay}" />
+                    </Grid>
+                </StackPanel>
+            </local:SettingContainer>
+            <local:SettingContainer x:Name="FontAxes"
+                                    x:Uid="Profile_FontAxes"
+                                    ClearSettingValue="{x:Bind Appearance.ClearFontAxes}"
+                                    HasSettingValue="{x:Bind Appearance.HasFontAxes, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.FontAxesOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <StackPanel Spacing="16">
+                    <ListView IsItemClickEnabled="False"
+                              ItemTemplate="{StaticResource FontKeyValuePairTemplate}"
+                              ItemsSource="{x:Bind Appearance.FontAxes, Mode=OneWay}"
+                              SelectionMode="None" />
+                    <muxc:DropDownButton x:Name="AddFontAxisButton"
+                                         x:Uid="Profile_AddFontAxisButton">
+                        <muxc:DropDownButton.Content>
+                            <StackPanel Orientation="Horizontal">
+                                <FontIcon VerticalAlignment="Bottom"
+                                          FontSize="{StaticResource StandardIconSize}"
+                                          Glyph="&#xE710;" />
+                                <TextBlock x:Uid="Profile_AddNewFontAxis"
+                                           Style="{StaticResource IconButtonTextBlockStyle}" />
+                            </StackPanel>
+                        </muxc:DropDownButton.Content>
+                        <muxc:DropDownButton.Flyout>
+                            <MenuFlyout />
+                        </muxc:DropDownButton.Flyout>
+                    </muxc:DropDownButton>
+                </StackPanel>
+            </local:SettingContainer>
+            <local:SettingContainer x:Name="FontFeatures"
+                                    x:Uid="Profile_FontFeatures"
+                                    ClearSettingValue="{x:Bind Appearance.ClearFontFeatures}"
+                                    HasSettingValue="{x:Bind Appearance.HasFontFeatures, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.FontFeaturesOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <StackPanel Spacing="16">
+                    <ListView IsItemClickEnabled="False"
+                              ItemTemplate="{StaticResource FontKeyValuePairTemplate}"
+                              ItemsSource="{x:Bind Appearance.FontFeatures, Mode=OneWay}"
+                              SelectionMode="None" />
+                    <muxc:DropDownButton x:Name="AddFontFeatureButton"
+                                         x:Uid="Profile_AddFontFeatureButton">
+                        <muxc:DropDownButton.Content>
+                            <StackPanel Orientation="Horizontal">
+                                <FontIcon VerticalAlignment="Bottom"
+                                          FontSize="{StaticResource StandardIconSize}"
+                                          Glyph="&#xE710;" />
+                                <TextBlock x:Uid="Profile_AddNewFontFeature"
+                                           Style="{StaticResource IconButtonTextBlockStyle}" />
+                            </StackPanel>
+                        </muxc:DropDownButton.Content>
+                        <muxc:DropDownButton.Flyout>
+                            <MenuFlyout />
+                        </muxc:DropDownButton.Flyout>
+                    </muxc:DropDownButton>
+                </StackPanel>
+            </local:SettingContainer>
+
+            <!--  Builtin Glyphs  -->
+            <local:SettingContainer x:Name="EnableBuiltinGlyphs"
+                                    x:Uid="Profile_EnableBuiltinGlyphs"
+                                    ClearSettingValue="{x:Bind Appearance.ClearEnableBuiltinGlyphs}"
+                                    HasSettingValue="{x:Bind Appearance.HasEnableBuiltinGlyphs, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.EnableBuiltinGlyphsOverrideSource, Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Appearance.EnableBuiltinGlyphs, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+
+            <!--  Color Glyphs  -->
+            <local:SettingContainer x:Name="EnableColorGlyphs"
+                                    x:Uid="Profile_EnableColorGlyphs"
+                                    ClearSettingValue="{x:Bind Appearance.ClearEnableColorGlyphs}"
+                                    HasSettingValue="{x:Bind Appearance.HasEnableColorGlyphs, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.EnableColorGlyphsOverrideSource, Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Appearance.EnableColorGlyphs, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+
+            <!--  Retro Terminal Effect  -->
+            <local:SettingContainer x:Name="RetroTerminalEffect"
+                                    x:Uid="Profile_RetroTerminalEffect"
+                                    ClearSettingValue="{x:Bind Appearance.ClearRetroTerminalEffect}"
+                                    HasSettingValue="{x:Bind Appearance.HasRetroTerminalEffect, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.RetroTerminalEffectOverrideSource, Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Appearance.RetroTerminalEffect, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+
+            <!--  Adjust Indistinguishable Colors  -->
+            <local:SettingContainer x:Name="AdjustIndistinguishableColors"
+                                    x:Uid="Profile_AdjustIndistinguishableColors"
+                                    ClearSettingValue="{x:Bind Appearance.ClearAdjustIndistinguishableColors}"
+                                    HasSettingValue="{x:Bind Appearance.HasAdjustIndistinguishableColors, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.AdjustIndistinguishableColorsOverrideSource, Mode=OneWay}">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind AdjustIndistinguishableColorsList, Mode=OneWay}"
+                          SelectedItem="{x:Bind CurrentAdjustIndistinguishableColors, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
+
+            <!--  Intense is bold, bright  -->
+            <local:SettingContainer x:Name="IntenseTextStyle"
+                                    x:Uid="Appearance_IntenseTextStyle"
+                                    ClearSettingValue="{x:Bind Appearance.ClearIntenseTextStyle}"
+                                    HasSettingValue="{x:Bind Appearance.HasIntenseTextStyle, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.IntenseTextStyleOverrideSource, Mode=OneWay}">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind IntenseTextStyleList, Mode=OneWay}"
+                          SelectedItem="{x:Bind CurrentIntenseTextStyle, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
+        </StackPanel>
 
         <!--  Section: Cursor settings  -->
-        <local:SettingContainer x:Uid="Appearance_Section_Cursor"
-                                Style="{StaticResource SectionExpanderStyle}">
-            <StackPanel>
+        <StackPanel Style="{StaticResource PivotStackStyle}">
+            <TextBlock x:Uid="Appearance_Section_Cursor"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Cursor Shape  -->
+            <local:SettingContainer x:Name="CursorShape"
+                                    x:Uid="Profile_CursorShape"
+                                    ClearSettingValue="{x:Bind Appearance.ClearCursorShape}"
+                                    HasSettingValue="{x:Bind Appearance.HasCursorShape, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.CursorShapeOverrideSource, Mode=OneWay}">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind CursorShapeList, Mode=OneWay}"
+                          SelectedItem="{x:Bind CurrentCursorShape, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Cursor Shape  -->
-                <local:SettingContainer x:Name="CursorShape"
-                                        x:Uid="Profile_CursorShape"
-                                        ClearSettingValue="{x:Bind Appearance.ClearCursorShape}"
-                                        HasSettingValue="{x:Bind Appearance.HasCursorShape, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.CursorShapeOverrideSource, Mode=OneWay}">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind CursorShapeList, Mode=OneWay}"
-                              SelectedItem="{x:Bind CurrentCursorShape, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+            <!--  Cursor Height  -->
+            <local:SettingContainer x:Name="CursorHeight"
+                                    x:Uid="Profile_CursorHeight"
+                                    ClearSettingValue="{x:Bind Appearance.ClearCursorHeight}"
+                                    HasSettingValue="{x:Bind Appearance.HasCursorHeight, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.CursorHeightOverrideSource, Mode=OneWay}"
+                                    Visibility="{x:Bind IsVintageCursor, Mode=OneWay}">
+                <Grid Style="{StaticResource CustomSliderControlGridStyle}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Slider x:Name="CursorHeightSlider"
+                            Grid.Column="0"
+                            Maximum="100"
+                            Minimum="1"
+                            Value="{x:Bind Appearance.CursorHeight, Mode=TwoWay}" />
+                    <TextBlock Grid.Column="1"
+                               Style="{StaticResource SliderValueLabelStyle}"
+                               Text="{Binding ElementName=CursorHeightSlider, Path=Value, Mode=OneWay}" />
+                </Grid>
+            </local:SettingContainer>
 
-                <!--  Cursor Height  -->
-                <local:SettingContainer x:Name="CursorHeight"
-                                        x:Uid="Profile_CursorHeight"
-                                        ClearSettingValue="{x:Bind Appearance.ClearCursorHeight}"
-                                        HasSettingValue="{x:Bind Appearance.HasCursorHeight, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.CursorHeightOverrideSource, Mode=OneWay}"
-                                        Visibility="{x:Bind IsVintageCursor, Mode=OneWay}">
-                    <Grid Style="{StaticResource CustomSliderControlGridStyle}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Slider x:Name="CursorHeightSlider"
-                                Grid.Column="0"
-                                Maximum="100"
-                                Minimum="1"
-                                Value="{x:Bind Appearance.CursorHeight, Mode=TwoWay}" />
-                        <TextBlock Grid.Column="1"
-                                   Style="{StaticResource SliderValueLabelStyle}"
-                                   Text="{Binding ElementName=CursorHeightSlider, Path=Value, Mode=OneWay}" />
-                    </Grid>
-                </local:SettingContainer>
-
-                <!--  Cursor Color  -->
-                <local:SettingContainer x:Name="CursorColor"
-                                        x:Uid="Profile_CursorColor"
-                                        ClearSettingValue="{x:Bind Appearance.ClearCursorColor}"
-                                        CurrentValue="{x:Bind Appearance.CursorColorPreview, Mode=OneWay}"
-                                        CurrentValueAccessibleName="{x:Bind Appearance.CursorColorPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
-                                        CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
-                                        HasSettingValue="{x:Bind Appearance.HasCursorColor, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.CursorColorOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                    <local:NullableColorPicker x:Uid="Profile_CursorColor_NullableColorPicker"
-                                               ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
-                                               CurrentColor="{x:Bind Appearance.CursorColor, Mode=TwoWay}"
-                                               NullColorPreview="{x:Bind Appearance.CurrentColorScheme.CursorColor.Color, Mode=OneWay}" />
-                </local:SettingContainer>
-            </StackPanel>
-        </local:SettingContainer>
+            <!--  Cursor Color  -->
+            <local:SettingContainer x:Name="CursorColor"
+                                    x:Uid="Profile_CursorColor"
+                                    ClearSettingValue="{x:Bind Appearance.ClearCursorColor}"
+                                    CurrentValue="{x:Bind Appearance.CursorColorPreview, Mode=OneWay}"
+                                    CurrentValueAccessibleName="{x:Bind Appearance.CursorColorPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
+                                    CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
+                                    HasSettingValue="{x:Bind Appearance.HasCursorColor, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.CursorColorOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                <local:NullableColorPicker x:Uid="Profile_CursorColor_NullableColorPicker"
+                                           ColorSchemeVM="{x:Bind Appearance.CurrentColorScheme, Mode=OneWay}"
+                                           CurrentColor="{x:Bind Appearance.CursorColor, Mode=TwoWay}"
+                                           NullColorPreview="{x:Bind Appearance.CurrentColorScheme.CursorColor.Color, Mode=OneWay}" />
+            </local:SettingContainer>
+        </StackPanel>
 
         <!--  Section: Background image  -->
-        <local:SettingContainer x:Uid="Appearance_Section_BackgroundImage"
-                                Style="{StaticResource SectionExpanderStyle}">
-            <StackPanel>
-
-                <!--  Background Image  -->
-                <local:SettingContainer x:Name="BackgroundImageContainer"
-                                        x:Uid="Profile_BackgroundImage"
-                                        ClearSettingValue="{x:Bind Appearance.ClearBackgroundImagePath}"
-                                        CurrentValue="{x:Bind Appearance.CurrentBackgroundImagePath, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Appearance.HasBackgroundImagePath, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.BackgroundImagePathOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <StackPanel Orientation="Vertical">
-                        <TextBox x:Uid="Profile_BackgroundImageBox"
-                                 IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Appearance.UseDesktopBGImage), Mode=OneWay}"
-                                 IsSpellCheckEnabled="False"
-                                 Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind mtu:Converters.StringOrEmptyIfPlaceholder('desktopWallpaper', Appearance.BackgroundImagePath.Path), Mode=TwoWay, BindBack=Appearance.SetBackgroundImagePath}" />
-                        <StackPanel Orientation="Horizontal">
-                            <Button x:Uid="Profile_BackgroundImageBrowse"
-                                    Margin="0,10,10,0"
-                                    Click="BackgroundImage_Click"
-                                    IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Appearance.UseDesktopBGImage), Mode=OneWay}"
-                                    Style="{StaticResource BrowseButtonStyle}" />
-                            <CheckBox x:Name="UseDesktopImageCheckBox"
-                                      x:Uid="Profile_UseDesktopImage"
-                                      Margin="0,5,0,0"
-                                      IsChecked="{x:Bind Appearance.UseDesktopBGImage, Mode=TwoWay}" />
-                        </StackPanel>
+        <StackPanel Style="{StaticResource PivotStackStyle}">
+            <TextBlock x:Uid="Appearance_Section_BackgroundImage"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Background Image  -->
+            <local:SettingContainer x:Name="BackgroundImageContainer"
+                                    x:Uid="Profile_BackgroundImage"
+                                    ClearSettingValue="{x:Bind Appearance.ClearBackgroundImagePath}"
+                                    CurrentValue="{x:Bind Appearance.CurrentBackgroundImagePath, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Appearance.HasBackgroundImagePath, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.BackgroundImagePathOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <StackPanel Orientation="Vertical">
+                    <TextBox x:Uid="Profile_BackgroundImageBox"
+                             IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Appearance.UseDesktopBGImage), Mode=OneWay}"
+                             IsSpellCheckEnabled="False"
+                             Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind mtu:Converters.StringOrEmptyIfPlaceholder('desktopWallpaper', Appearance.BackgroundImagePath.Path), Mode=TwoWay, BindBack=Appearance.SetBackgroundImagePath}" />
+                    <StackPanel Orientation="Horizontal">
+                        <Button x:Uid="Profile_BackgroundImageBrowse"
+                                Margin="0,10,10,0"
+                                Click="BackgroundImage_Click"
+                                IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Appearance.UseDesktopBGImage), Mode=OneWay}"
+                                Style="{StaticResource BrowseButtonStyle}" />
+                        <CheckBox x:Name="UseDesktopImageCheckBox"
+                                  x:Uid="Profile_UseDesktopImage"
+                                  Margin="0,5,0,0"
+                                  IsChecked="{x:Bind Appearance.UseDesktopBGImage, Mode=TwoWay}" />
                     </StackPanel>
-                </local:SettingContainer>
+                </StackPanel>
+            </local:SettingContainer>
 
-                <!--  Background Image Stretch Mode  -->
-                <local:SettingContainer x:Name="BackgroundImageStretchMode"
-                                        x:Uid="Profile_BackgroundImageStretchMode"
-                                        ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageStretchMode}"
-                                        HasSettingValue="{x:Bind Appearance.HasBackgroundImageStretchMode, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.BackgroundImageStretchModeOverrideSource, Mode=OneWay}"
-                                        Visibility="{x:Bind Appearance.BackgroundImageSettingsVisible, Mode=OneWay}">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind BackgroundImageStretchModeList, Mode=OneWay}"
-                              SelectedItem="{x:Bind CurrentBackgroundImageStretchMode, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+            <!--  Background Image Stretch Mode  -->
+            <local:SettingContainer x:Name="BackgroundImageStretchMode"
+                                    x:Uid="Profile_BackgroundImageStretchMode"
+                                    ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageStretchMode}"
+                                    HasSettingValue="{x:Bind Appearance.HasBackgroundImageStretchMode, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.BackgroundImageStretchModeOverrideSource, Mode=OneWay}"
+                                    Visibility="{x:Bind Appearance.BackgroundImageSettingsVisible, Mode=OneWay}">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind BackgroundImageStretchModeList, Mode=OneWay}"
+                          SelectedItem="{x:Bind CurrentBackgroundImageStretchMode, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Background Image Alignment  -->
-                <local:SettingContainer x:Name="BackgroundImageAlignment"
-                                        x:Uid="Profile_BackgroundImageAlignment"
-                                        ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageAlignment}"
-                                        CurrentValue="{x:Bind Appearance.BackgroundImageAlignmentCurrentValue, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Appearance.HasBackgroundImageAlignment, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.BackgroundImageAlignmentOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}"
-                                        Visibility="{x:Bind Appearance.BackgroundImageSettingsVisible, Mode=OneWay}">
-                    <Grid HorizontalAlignment="Left">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
+            <!--  Background Image Alignment  -->
+            <local:SettingContainer x:Name="BackgroundImageAlignment"
+                                    x:Uid="Profile_BackgroundImageAlignment"
+                                    ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageAlignment}"
+                                    CurrentValue="{x:Bind Appearance.BackgroundImageAlignmentCurrentValue, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Appearance.HasBackgroundImageAlignment, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.BackgroundImageAlignmentOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}"
+                                    Visibility="{x:Bind Appearance.BackgroundImageSettingsVisible, Mode=OneWay}">
+                <Grid HorizontalAlignment="Left">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
 
-                        <Grid.Resources>
-                            <Style BasedOn="{StaticResource DefaultToggleButtonStyle}"
-                                   TargetType="ToggleButton">
-                                <Setter Property="Margin" Value="2" />
-                                <Setter Property="Width" Value="40" />
-                                <Setter Property="Height" Value="40" />
-                                <Setter Property="ToolTipService.Placement" Value="Mouse" />
-                            </Style>
-                        </Grid.Resources>
+                    <Grid.Resources>
+                        <Style BasedOn="{StaticResource DefaultToggleButtonStyle}"
+                               TargetType="ToggleButton">
+                            <Setter Property="Margin" Value="2" />
+                            <Setter Property="Width" Value="40" />
+                            <Setter Property="Height" Value="40" />
+                            <Setter Property="ToolTipService.Placement" Value="Mouse" />
+                        </Style>
+                    </Grid.Resources>
 
-                        <!--  Top Row  -->
-                        <ToggleButton x:Name="BIAlign_TopLeft"
-                                      x:Uid="Profile_BackgroundImageAlignmentTopLeft"
-                                      Grid.Row="0"
-                                      Grid.Column="0"
-                                      Click="BIAlignment_Click"
-                                      Style="{StaticResource BIAlignmentToggleButtonStyle}">
-                            <ToggleButton.Tag>
-                                <!--  ConvergedAlignment: Vertical_Top (0x10) | Horizontal_Left (0x01)  -->
-                                <x:Int32>17</x:Int32>
-                            </ToggleButton.Tag>
-                            <ToggleButton.Content>
-                                <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                          Glyph="&#xE744;"
-                                          RenderTransformOrigin="0.5,0.5">
-                                    <FontIcon.RenderTransform>
-                                        <RotateTransform Angle="90" />
-                                    </FontIcon.RenderTransform>
-                                </FontIcon>
-                            </ToggleButton.Content>
-                        </ToggleButton>
-                        <ToggleButton x:Name="BIAlign_Top"
-                                      x:Uid="Profile_BackgroundImageAlignmentTop"
-                                      Grid.Row="0"
-                                      Grid.Column="1"
-                                      Click="BIAlignment_Click"
-                                      Style="{StaticResource BIAlignmentToggleButtonStyle}">
-                            <ToggleButton.Tag>
-                                <!--  ConvergedAlignment: Vertical_Top (0x10) | Horizontal_Center (0x00)  -->
-                                <x:Int32>16</x:Int32>
-                            </ToggleButton.Tag>
-                            <ToggleButton.Content>
-                                <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                          Glyph="&#xE745;"
-                                          RenderTransformOrigin="0.5,0.5">
-                                    <FontIcon.RenderTransform>
-                                        <RotateTransform Angle="180" />
-                                    </FontIcon.RenderTransform>
-                                </FontIcon>
-                            </ToggleButton.Content>
-                        </ToggleButton>
-                        <ToggleButton x:Name="BIAlign_TopRight"
-                                      x:Uid="Profile_BackgroundImageAlignmentTopRight"
-                                      Grid.Row="0"
-                                      Grid.Column="2"
-                                      Click="BIAlignment_Click"
-                                      Style="{StaticResource BIAlignmentToggleButtonStyle}">
-                            <ToggleButton.Tag>
-                                <!--  ConvergedAlignment: Vertical_Top (0x10) | Horizontal_Right (0x02)  -->
-                                <x:Int32>18</x:Int32>
-                            </ToggleButton.Tag>
-                            <ToggleButton.Content>
-                                <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                          Glyph="&#xEA5F;"
-                                          RenderTransformOrigin="0.5,0.5">
-                                    <FontIcon.RenderTransform>
-                                        <RotateTransform Angle="270" />
-                                    </FontIcon.RenderTransform>
-                                </FontIcon>
-                            </ToggleButton.Content>
-                        </ToggleButton>
+                    <!--  Top Row  -->
+                    <ToggleButton x:Name="BIAlign_TopLeft"
+                                  x:Uid="Profile_BackgroundImageAlignmentTopLeft"
+                                  Grid.Row="0"
+                                  Grid.Column="0"
+                                  Click="BIAlignment_Click"
+                                  Style="{StaticResource BIAlignmentToggleButtonStyle}">
+                        <ToggleButton.Tag>
+                            <!--  ConvergedAlignment: Vertical_Top (0x10) | Horizontal_Left (0x01)  -->
+                            <x:Int32>17</x:Int32>
+                        </ToggleButton.Tag>
+                        <ToggleButton.Content>
+                            <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                      Glyph="&#xE744;"
+                                      RenderTransformOrigin="0.5,0.5">
+                                <FontIcon.RenderTransform>
+                                    <RotateTransform Angle="90" />
+                                </FontIcon.RenderTransform>
+                            </FontIcon>
+                        </ToggleButton.Content>
+                    </ToggleButton>
+                    <ToggleButton x:Name="BIAlign_Top"
+                                  x:Uid="Profile_BackgroundImageAlignmentTop"
+                                  Grid.Row="0"
+                                  Grid.Column="1"
+                                  Click="BIAlignment_Click"
+                                  Style="{StaticResource BIAlignmentToggleButtonStyle}">
+                        <ToggleButton.Tag>
+                            <!--  ConvergedAlignment: Vertical_Top (0x10) | Horizontal_Center (0x00)  -->
+                            <x:Int32>16</x:Int32>
+                        </ToggleButton.Tag>
+                        <ToggleButton.Content>
+                            <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                      Glyph="&#xE745;"
+                                      RenderTransformOrigin="0.5,0.5">
+                                <FontIcon.RenderTransform>
+                                    <RotateTransform Angle="180" />
+                                </FontIcon.RenderTransform>
+                            </FontIcon>
+                        </ToggleButton.Content>
+                    </ToggleButton>
+                    <ToggleButton x:Name="BIAlign_TopRight"
+                                  x:Uid="Profile_BackgroundImageAlignmentTopRight"
+                                  Grid.Row="0"
+                                  Grid.Column="2"
+                                  Click="BIAlignment_Click"
+                                  Style="{StaticResource BIAlignmentToggleButtonStyle}">
+                        <ToggleButton.Tag>
+                            <!--  ConvergedAlignment: Vertical_Top (0x10) | Horizontal_Right (0x02)  -->
+                            <x:Int32>18</x:Int32>
+                        </ToggleButton.Tag>
+                        <ToggleButton.Content>
+                            <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                      Glyph="&#xEA5F;"
+                                      RenderTransformOrigin="0.5,0.5">
+                                <FontIcon.RenderTransform>
+                                    <RotateTransform Angle="270" />
+                                </FontIcon.RenderTransform>
+                            </FontIcon>
+                        </ToggleButton.Content>
+                    </ToggleButton>
 
-                        <!--  Middle Row  -->
-                        <ToggleButton x:Name="BIAlign_Left"
-                                      x:Uid="Profile_BackgroundImageAlignmentLeft"
-                                      Grid.Row="1"
-                                      Grid.Column="0"
-                                      Click="BIAlignment_Click"
-                                      Style="{StaticResource BIAlignmentToggleButtonStyle}">
-                            <ToggleButton.Tag>
-                                <!--  ConvergedAlignment: Vertical_Center (0x00) | Horizontal_Left (0x01)  -->
-                                <x:Int32>1</x:Int32>
-                            </ToggleButton.Tag>
-                            <ToggleButton.Content>
-                                <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                          Glyph="&#xE746;" />
-                            </ToggleButton.Content>
-                        </ToggleButton>
-                        <ToggleButton x:Name="BIAlign_Center"
-                                      x:Uid="Profile_BackgroundImageAlignmentCenter"
-                                      Grid.Row="1"
-                                      Grid.Column="1"
-                                      Click="BIAlignment_Click"
-                                      Style="{StaticResource BIAlignmentToggleButtonStyle}">
-                            <ToggleButton.Tag>
-                                <!--  ConvergedAlignment: Vertical_Center (0x00) | Horizontal_Center (0x00)  -->
-                                <x:Int32>0</x:Int32>
-                            </ToggleButton.Tag>
-                            <ToggleButton.Content>
-                                <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                          Glyph="&#xF16E;" />
-                            </ToggleButton.Content>
-                        </ToggleButton>
-                        <ToggleButton x:Name="BIAlign_Right"
-                                      x:Uid="Profile_BackgroundImageAlignmentRight"
-                                      Grid.Row="1"
-                                      Grid.Column="2"
-                                      Click="BIAlignment_Click"
-                                      Style="{StaticResource BIAlignmentToggleButtonStyle}">
-                            <ToggleButton.Tag>
-                                <!--  ConvergedAlignment: Vertical_Center (0x00) | Horizontal_Right (0x02)  -->
-                                <x:Int32>2</x:Int32>
-                            </ToggleButton.Tag>
-                            <ToggleButton.Content>
-                                <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                          Glyph="&#xEA61;" />
-                            </ToggleButton.Content>
-                        </ToggleButton>
+                    <!--  Middle Row  -->
+                    <ToggleButton x:Name="BIAlign_Left"
+                                  x:Uid="Profile_BackgroundImageAlignmentLeft"
+                                  Grid.Row="1"
+                                  Grid.Column="0"
+                                  Click="BIAlignment_Click"
+                                  Style="{StaticResource BIAlignmentToggleButtonStyle}">
+                        <ToggleButton.Tag>
+                            <!--  ConvergedAlignment: Vertical_Center (0x00) | Horizontal_Left (0x01)  -->
+                            <x:Int32>1</x:Int32>
+                        </ToggleButton.Tag>
+                        <ToggleButton.Content>
+                            <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                      Glyph="&#xE746;" />
+                        </ToggleButton.Content>
+                    </ToggleButton>
+                    <ToggleButton x:Name="BIAlign_Center"
+                                  x:Uid="Profile_BackgroundImageAlignmentCenter"
+                                  Grid.Row="1"
+                                  Grid.Column="1"
+                                  Click="BIAlignment_Click"
+                                  Style="{StaticResource BIAlignmentToggleButtonStyle}">
+                        <ToggleButton.Tag>
+                            <!--  ConvergedAlignment: Vertical_Center (0x00) | Horizontal_Center (0x00)  -->
+                            <x:Int32>0</x:Int32>
+                        </ToggleButton.Tag>
+                        <ToggleButton.Content>
+                            <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                      Glyph="&#xF16E;" />
+                        </ToggleButton.Content>
+                    </ToggleButton>
+                    <ToggleButton x:Name="BIAlign_Right"
+                                  x:Uid="Profile_BackgroundImageAlignmentRight"
+                                  Grid.Row="1"
+                                  Grid.Column="2"
+                                  Click="BIAlignment_Click"
+                                  Style="{StaticResource BIAlignmentToggleButtonStyle}">
+                        <ToggleButton.Tag>
+                            <!--  ConvergedAlignment: Vertical_Center (0x00) | Horizontal_Right (0x02)  -->
+                            <x:Int32>2</x:Int32>
+                        </ToggleButton.Tag>
+                        <ToggleButton.Content>
+                            <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                      Glyph="&#xEA61;" />
+                        </ToggleButton.Content>
+                    </ToggleButton>
 
-                        <!--  Bottom Row  -->
-                        <ToggleButton x:Name="BIAlign_BottomLeft"
-                                      x:Uid="Profile_BackgroundImageAlignmentBottomLeft"
-                                      Grid.Row="2"
-                                      Grid.Column="0"
-                                      Click="BIAlignment_Click"
-                                      Style="{StaticResource BIAlignmentToggleButtonStyle}">
-                            <ToggleButton.Tag>
-                                <!--  ConvergedAlignment: Vertical_Bottom (0x20) | Horizontal_Left (0x01)  -->
-                                <x:Int32>33</x:Int32>
-                            </ToggleButton.Tag>
-                            <ToggleButton.Content>
-                                <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                          Glyph="&#xE744;" />
-                            </ToggleButton.Content>
-                        </ToggleButton>
-                        <ToggleButton x:Name="BIAlign_Bottom"
-                                      x:Uid="Profile_BackgroundImageAlignmentBottom"
-                                      Grid.Row="2"
-                                      Grid.Column="1"
-                                      Click="BIAlignment_Click"
-                                      Style="{StaticResource BIAlignmentToggleButtonStyle}">
-                            <ToggleButton.Tag>
-                                <!--  ConvergedAlignment: Vertical_Bottom (0x20) | Horizontal_Center (0x00)  -->
-                                <x:Int32>32</x:Int32>
-                            </ToggleButton.Tag>
-                            <ToggleButton.Content>
-                                <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                          Glyph="&#xE745;" />
-                            </ToggleButton.Content>
-                        </ToggleButton>
-                        <ToggleButton x:Name="BIAlign_BottomRight"
-                                      x:Uid="Profile_BackgroundImageAlignmentBottomRight"
-                                      Grid.Row="2"
-                                      Grid.Column="2"
-                                      Click="BIAlignment_Click"
-                                      Style="{StaticResource BIAlignmentToggleButtonStyle}">
-                            <ToggleButton.Tag>
-                                <!--  ConvergedAlignment: Vertical_Top (0x20) | Horizontal_Right (0x02)  -->
-                                <x:Int32>34</x:Int32>
-                            </ToggleButton.Tag>
-                            <ToggleButton.Content>
-                                <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                          Glyph="&#xEA5F;" />
-                            </ToggleButton.Content>
-                        </ToggleButton>
-                    </Grid>
-                </local:SettingContainer>
+                    <!--  Bottom Row  -->
+                    <ToggleButton x:Name="BIAlign_BottomLeft"
+                                  x:Uid="Profile_BackgroundImageAlignmentBottomLeft"
+                                  Grid.Row="2"
+                                  Grid.Column="0"
+                                  Click="BIAlignment_Click"
+                                  Style="{StaticResource BIAlignmentToggleButtonStyle}">
+                        <ToggleButton.Tag>
+                            <!--  ConvergedAlignment: Vertical_Bottom (0x20) | Horizontal_Left (0x01)  -->
+                            <x:Int32>33</x:Int32>
+                        </ToggleButton.Tag>
+                        <ToggleButton.Content>
+                            <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                      Glyph="&#xE744;" />
+                        </ToggleButton.Content>
+                    </ToggleButton>
+                    <ToggleButton x:Name="BIAlign_Bottom"
+                                  x:Uid="Profile_BackgroundImageAlignmentBottom"
+                                  Grid.Row="2"
+                                  Grid.Column="1"
+                                  Click="BIAlignment_Click"
+                                  Style="{StaticResource BIAlignmentToggleButtonStyle}">
+                        <ToggleButton.Tag>
+                            <!--  ConvergedAlignment: Vertical_Bottom (0x20) | Horizontal_Center (0x00)  -->
+                            <x:Int32>32</x:Int32>
+                        </ToggleButton.Tag>
+                        <ToggleButton.Content>
+                            <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                      Glyph="&#xE745;" />
+                        </ToggleButton.Content>
+                    </ToggleButton>
+                    <ToggleButton x:Name="BIAlign_BottomRight"
+                                  x:Uid="Profile_BackgroundImageAlignmentBottomRight"
+                                  Grid.Row="2"
+                                  Grid.Column="2"
+                                  Click="BIAlignment_Click"
+                                  Style="{StaticResource BIAlignmentToggleButtonStyle}">
+                        <ToggleButton.Tag>
+                            <!--  ConvergedAlignment: Vertical_Top (0x20) | Horizontal_Right (0x02)  -->
+                            <x:Int32>34</x:Int32>
+                        </ToggleButton.Tag>
+                        <ToggleButton.Content>
+                            <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                      Glyph="&#xEA5F;" />
+                        </ToggleButton.Content>
+                    </ToggleButton>
+                </Grid>
+            </local:SettingContainer>
 
-                <!--  Background Image Opacity  -->
-                <local:SettingContainer x:Name="BackgroundImageOpacity"
-                                        x:Uid="Profile_BackgroundImageOpacity"
-                                        ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageOpacity}"
-                                        HasSettingValue="{x:Bind Appearance.HasBackgroundImageOpacity, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Appearance.BackgroundImageOpacityOverrideSource, Mode=OneWay}"
-                                        Visibility="{x:Bind Appearance.BackgroundImageSettingsVisible, Mode=OneWay}">
-                    <Grid Style="{StaticResource CustomSliderControlGridStyle}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Slider x:Uid="Profile_BackgroundImageOpacitySlider"
-                                Grid.Column="0"
-                                Value="{x:Bind mtu:Converters.PercentageToPercentageValue(Appearance.BackgroundImageOpacity), BindBack=Appearance.SetBackgroundImageOpacityFromPercentageValue, Mode=TwoWay}" />
-                        <TextBlock Grid.Column="1"
-                                   Style="{StaticResource SliderValueLabelStyle}"
-                                   Text="{x:Bind mtu:Converters.PercentageToPercentageString(Appearance.BackgroundImageOpacity), Mode=OneWay}" />
-                    </Grid>
-                </local:SettingContainer>
-            </StackPanel>
-        </local:SettingContainer>
+            <!--  Background Image Opacity  -->
+            <local:SettingContainer x:Name="BackgroundImageOpacity"
+                                    x:Uid="Profile_BackgroundImageOpacity"
+                                    ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageOpacity}"
+                                    HasSettingValue="{x:Bind Appearance.HasBackgroundImageOpacity, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Appearance.BackgroundImageOpacityOverrideSource, Mode=OneWay}"
+                                    Visibility="{x:Bind Appearance.BackgroundImageSettingsVisible, Mode=OneWay}">
+                <Grid Style="{StaticResource CustomSliderControlGridStyle}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Slider x:Uid="Profile_BackgroundImageOpacitySlider"
+                            Grid.Column="0"
+                            Value="{x:Bind mtu:Converters.PercentageToPercentageValue(Appearance.BackgroundImageOpacity), BindBack=Appearance.SetBackgroundImageOpacityFromPercentageValue, Mode=TwoWay}" />
+                    <TextBlock Grid.Column="1"
+                               Style="{StaticResource SliderValueLabelStyle}"
+                               Text="{x:Bind mtu:Converters.PercentageToPercentageString(Appearance.BackgroundImageOpacity), Mode=OneWay}" />
+                </Grid>
+            </local:SettingContainer>
+        </StackPanel>
 
     </StackPanel>
 </UserControl>
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
index 0cfc62ad44..c53f42563b 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
@@ -26,118 +26,116 @@
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
         <!--  Section: Compatibility  -->
-        <local:SettingContainer x:Uid="Compatibility_Section_Compatibility"
-                                StartExpanded="True"
-                                Style="{StaticResource SectionExpanderStyle}">
-            <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>
+        <StackPanel Style="{StaticResource PivotStackStyle}">
+            <TextBlock x:Uid="Compatibility_Section_Compatibility"
+                       Margin="0,0,0,4"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Allow Headless  -->
+            <local:SettingContainer x:Name="AllowHeadless"
+                                    x:Uid="Globals_AllowHeadless">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.AllowHeadless, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Text Measurement  -->
-                <local:SettingContainer x:Name="TextMeasurement"
-                                        x:Uid="Globals_TextMeasurement">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentTextMeasurement, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+            <!--  Text Measurement  -->
+            <local:SettingContainer x:Name="TextMeasurement"
+                                    x:Uid="Globals_TextMeasurement">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentTextMeasurement, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Ambiguous Width  -->
-                <local:SettingContainer x:Name="AmbiguousWidth"
-                                        x:Uid="Globals_AmbiguousWidth">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.AmbiguousWidthList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentAmbiguousWidth, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+            <!--  Ambiguous Width  -->
+            <local:SettingContainer x:Name="AmbiguousWidth"
+                                    x:Uid="Globals_AmbiguousWidth">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.AmbiguousWidthList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentAmbiguousWidth, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Debug Features  -->
-                <local:SettingContainer x:Name="DebugFeaturesEnabled"
-                                        x:Uid="Globals_DebugFeaturesEnabled"
-                                        Visibility="{x:Bind ViewModel.DebugFeaturesAvailable}">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.DebugFeaturesEnabled, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Debug Features  -->
+            <local:SettingContainer x:Name="DebugFeaturesEnabled"
+                                    x:Uid="Globals_DebugFeaturesEnabled"
+                                    Visibility="{x:Bind ViewModel.DebugFeaturesAvailable}">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.DebugFeaturesEnabled, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Reset Application State  -->
-                <local:SettingContainer x:Name="ResetApplicationState"
-                                        x:Uid="Settings_ResetApplicationState">
-                    <Button x:Uid="Settings_ResetApplicationStateButton"
-                            Style="{StaticResource DeleteButtonStyle}">
-                        <Button.Flyout>
-                            <Flyout x:Name="ResetCacheFlyout"
-                                    FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
-                                <StackPanel>
-                                    <TextBlock x:Uid="Settings_ResetApplicationStateConfirmationMessageHeader"
-                                               Style="{StaticResource CustomFlyoutTextStyle}" />
-                                    <TextBlock x:Uid="Settings_ResetApplicationStateConfirmationMessageBody"
-                                               FontWeight="Normal"
-                                               Style="{StaticResource CustomFlyoutTextStyle}" />
-                                    <Button x:Uid="Settings_ResetApplicationStateConfirmationButton"
-                                            Click="ResetApplicationStateButton_Click" />
-                                </StackPanel>
-                            </Flyout>
-                        </Button.Flyout>
-                    </Button>
-                </local:SettingContainer>
+            <!--  Reset Application State  -->
+            <local:SettingContainer x:Name="ResetApplicationState"
+                                    x:Uid="Settings_ResetApplicationState">
+                <Button x:Uid="Settings_ResetApplicationStateButton"
+                        Style="{StaticResource DeleteButtonStyle}">
+                    <Button.Flyout>
+                        <Flyout x:Name="ResetCacheFlyout"
+                                FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
+                            <StackPanel>
+                                <TextBlock x:Uid="Settings_ResetApplicationStateConfirmationMessageHeader"
+                                           Style="{StaticResource CustomFlyoutTextStyle}" />
+                                <TextBlock x:Uid="Settings_ResetApplicationStateConfirmationMessageBody"
+                                           FontWeight="Normal"
+                                           Style="{StaticResource CustomFlyoutTextStyle}" />
+                                <Button x:Uid="Settings_ResetApplicationStateConfirmationButton"
+                                        Click="ResetApplicationStateButton_Click" />
+                            </StackPanel>
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
+            </local:SettingContainer>
 
-                <!--  Reset to Default Settings  -->
-                <local:SettingContainer x:Name="ResetToDefaultSettings"
-                                        x:Uid="Settings_ResetToDefaultSettings">
-                    <Button x:Uid="Settings_ResetToDefaultSettingsButton"
-                            Style="{StaticResource DeleteButtonStyle}">
-                        <Button.Flyout>
-                            <Flyout FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
-                                <StackPanel>
-                                    <TextBlock x:Uid="Settings_ResetToDefaultSettingsConfirmationMessageHeader"
-                                               Style="{StaticResource CustomFlyoutTextStyle}" />
-                                    <TextBlock x:Uid="Settings_ResetToDefaultSettingsConfirmationMessageBody"
-                                               FontWeight="Normal"
-                                               Style="{StaticResource CustomFlyoutTextStyle}" />
-                                    <Button x:Uid="Settings_ResetToDefaultSettingsConfirmationButton"
-                                            Click="{x:Bind ViewModel.ResetToDefaultSettings}" />
-                                </StackPanel>
-                            </Flyout>
-                        </Button.Flyout>
-                    </Button>
-                </local:SettingContainer>
-            </StackPanel>
-        </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>
 
         <!--  Section: Rendering  -->
-        <local:SettingContainer x:Uid="Compatibility_Section_Rendering"
-                                Style="{StaticResource SectionExpanderStyle}">
-            <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>
+        <StackPanel Style="{StaticResource PivotStackStyle}">
+            <TextBlock x:Uid="Compatibility_Section_Rendering"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Graphics API  -->
+            <local:SettingContainer x:Name="GraphicsAPI"
+                                    x:Uid="Globals_GraphicsAPI">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.GraphicsAPIList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentGraphicsAPI, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Disable Partial Invalidation  -->
-                <local:SettingContainer x:Name="DisablePartialInvalidation"
-                                        x:Uid="Globals_DisablePartialInvalidation">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.DisablePartialInvalidation, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  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>
-        </local:SettingContainer>
+            <!--  Software Rendering  -->
+            <local:SettingContainer x:Name="SoftwareRendering"
+                                    x:Uid="Globals_SoftwareRendering">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.SoftwareRendering, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+        </StackPanel>
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
index 690c1961b0..312bf80a12 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
@@ -28,156 +28,151 @@
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
         <!--  Section: Visual style  -->
-        <local:SettingContainer x:Uid="Globals_Section_VisualStyle"
-                                StartExpanded="True"
-                                Style="{StaticResource SectionExpanderStyle}">
-            <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>
+        <StackPanel Style="{StaticResource PivotStackStyle}">
+            <TextBlock x:Uid="Globals_Section_VisualStyle"
+                       Margin="0,0,0,4"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Theme  -->
+            <local:SettingContainer x:Name="Theme"
+                                    x:Uid="Globals_Theme">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemsSource="{x:Bind ViewModel.ThemeList, Mode=OneWay}"
+                          SelectedItem="{x:Bind ViewModel.CurrentTheme, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="model:Theme">
+                            <TextBlock Text="{x:Bind local:GlobalAppearanceViewModel.ThemeNameConverter((model:Theme)), Mode=OneWay}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </local:SettingContainer>
 
-                <!--  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 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>
 
-                <!--  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>
+            <!--  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>
 
-                <!--  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>
-        </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>
 
         <!--  Section: Tabs and layout  -->
-        <local:SettingContainer x:Uid="Globals_Section_TabsLayout"
-                                Style="{StaticResource SectionExpanderStyle}">
-            <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>
+        <StackPanel Style="{StaticResource PivotStackStyle}">
+            <TextBlock x:Uid="Globals_Section_TabsLayout"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Position of new tab  -->
+            <local:SettingContainer x:Name="NewTabPosition"
+                                    x:Uid="Globals_NewTabPosition">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.NewTabPositionList, Mode=OneWay}"
+                          SelectedItem="{x:Bind ViewModel.CurrentNewTabPosition, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  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>
+            <!--  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 tabs in full screen  -->
-                <local:SettingContainer x:Name="ShowTabsFullscreen"
-                                        x:Uid="Globals_ShowTabsFullscreen">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsFullscreen, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Show 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>
 
-                <!--  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>
-        </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>
 
         <!--  Section: Window behavior  -->
-        <local:SettingContainer x:Uid="Globals_Section_WindowBehavior"
-                                Style="{StaticResource SectionExpanderStyle}">
-            <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>
+        <StackPanel Style="{StaticResource PivotStackStyle}">
+            <TextBlock x:Uid="Globals_Section_WindowBehavior"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Always on Top  -->
+            <local:SettingContainer x:Name="AlwaysOnTop"
+                                    x:Uid="Globals_AlwaysOnTop">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  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>
-        </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>
 
         <!--  Section: Title bar & identity  -->
-        <local:SettingContainer x:Uid="Globals_Section_TitleBarIdentity"
-                                Style="{StaticResource SectionExpanderStyle}">
-            <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>
+        <StackPanel Style="{StaticResource PivotStackStyle}">
+            <TextBlock x:Uid="Globals_Section_TitleBarIdentity"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Show Title in Titlebar (use active terminal title as application title)  -->
+            <local:SettingContainer x:Name="ShowTitleInTitlebar"
+                                    x:Uid="Globals_ShowTitleInTitlebar">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTitleInTitlebar, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  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>
-        </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>
 
         <!--  Section: System integration & notifications  -->
-        <local:SettingContainer x:Uid="Globals_Section_SystemIntegration"
-                                Style="{StaticResource SectionExpanderStyle}">
-            <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>
+        <StackPanel Style="{StaticResource PivotStackStyle}">
+            <TextBlock x:Uid="Globals_Section_SystemIntegration"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Always Show Notification Icon  -->
+            <local:SettingContainer x:Name="AlwaysShowNotificationIcon"
+                                    x:Uid="Globals_AlwaysShowNotificationIcon">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowNotificationIcon, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  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>
-        </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>
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
index 996fb9bf74..e9822039d8 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -27,178 +27,172 @@
     <StackPanel>
         <StackPanel Style="{StaticResource SettingsStackStyle}">
             <!--  Section: Clipboard and paste behavior  -->
-            <local:SettingContainer x:Uid="Interaction_Section_Clipboard"
-                                    StartExpanded="True"
-                                    Style="{StaticResource SectionExpanderStyle}">
-                <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>
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Interaction_Section_Clipboard"
+                           Margin="0,0,0,4"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+                <!--  Copy On Select  -->
+                <local:SettingContainer x:Name="CopyOnSelect"
+                                        x:Uid="Globals_CopyOnSelect">
+                    <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </local:SettingContainer>
 
-                    <!--  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 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>
 
-                    <!--  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>
-            </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>
 
             <!--  Section: Text selection & editing  -->
-            <local:SettingContainer x:Uid="Interaction_Section_TextSelection"
-                                    Style="{StaticResource SectionExpanderStyle}">
-                <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>
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Interaction_Section_TextSelection"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+                <!--  Word Delimiters  -->
+                <local:SettingContainer x:Name="WordDelimiters"
+                                        x:Uid="Globals_WordDelimiters"
+                                        CurrentValue="{x:Bind ViewModel.WordDelimiters, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}">
+                    <TextBox IsSpellCheckEnabled="False"
+                             Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind ViewModel.WordDelimiters, Mode=TwoWay}" />
+                </local:SettingContainer>
 
-                    <!--  Enable Color Selection  -->
-                    <local:SettingContainer x:Name="EnableColorSelection"
-                                            x:Uid="Globals_EnableColorSelection">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.EnableColorSelection, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </local:SettingContainer>
-                </StackPanel>
-            </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>
 
             <!--  Section: Window and layout behavior  -->
-            <local:SettingContainer x:Uid="Interaction_Section_WindowLayout"
-                                    Style="{StaticResource SectionExpanderStyle}">
-                <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>
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Interaction_Section_WindowLayout"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+                <!--  Snap On Resize  -->
+                <local:SettingContainer x:Name="SnapToGridOnResize"
+                                        x:Uid="Globals_SnapToGridOnResize">
+                    <ToggleSwitch IsOn="{x:Bind ViewModel.SnapToGridOnResize, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </local:SettingContainer>
 
-                    <!--  Focus Follow Mouse Mode  -->
-                    <local:SettingContainer x:Name="FocusFollowMouse"
-                                            x:Uid="Globals_FocusFollowMouse">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </local:SettingContainer>
+                <!--  Focus Follow Mouse Mode  -->
+                <local:SettingContainer x:Name="FocusFollowMouse"
+                                        x:Uid="Globals_FocusFollowMouse">
+                    <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </local:SettingContainer>
 
-                    <!--  Tab Switcher Mode  -->
-                    <local:SettingContainer x:Name="TabSwitcherMode"
-                                            x:Uid="Globals_TabSwitcherMode">
-                        <ComboBox AutomationProperties.AccessibilityView="Content"
-                                  ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                                  ItemsSource="{x:Bind ViewModel.TabSwitcherModeList}"
-                                  SelectedItem="{x:Bind ViewModel.CurrentTabSwitcherMode, Mode=TwoWay}"
-                                  Style="{StaticResource ComboBoxSettingStyle}" />
-                    </local:SettingContainer>
-                </StackPanel>
-            </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>
 
             <!--  Section: Mouse & scrolling  -->
-            <local:SettingContainer x:Uid="Interaction_Section_MouseScrolling"
-                                    Style="{StaticResource SectionExpanderStyle}">
-                <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>
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Interaction_Section_MouseScrolling"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+                <!--  Enable Font Size Changes with Scrolling  -->
+                <local:SettingContainer x:Name="ScrollToZoom"
+                                        x:Uid="Globals_ScrollToZoom">
+                    <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToZoom, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </local:SettingContainer>
 
-                    <!--  Enable Window Opacity Changes with Scrolling  -->
-                    <local:SettingContainer x:Name="ScrollToChangeOpacity"
-                                            x:Uid="Globals_ScrollToChangeOpacity">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToChangeOpacity, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </local:SettingContainer>
-                </StackPanel>
-            </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>
 
             <!--  Section: URLs & external actions  -->
-            <local:SettingContainer x:Uid="Interaction_Section_UrlsExternal"
-                                    Style="{StaticResource SectionExpanderStyle}">
-                <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>
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Interaction_Section_UrlsExternal"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+                <!--  Detect URLs  -->
+                <local:SettingContainer x:Name="DetectURLs"
+                                        x:Uid="Globals_DetectURLs">
+                    <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </local:SettingContainer>
 
-                    <!--  Search Web Default Query URL  -->
-                    <local:SettingContainer x:Name="SearchWebDefaultQueryUrl"
-                                            x:Uid="Globals_SearchWebDefaultQueryUrl"
-                                            CurrentValue="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=OneWay}"
-                                            Style="{StaticResource ExpanderSettingContainerStyle}">
-                        <TextBox IsSpellCheckEnabled="False"
-                                 Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=TwoWay}" />
-                    </local:SettingContainer>
-                </StackPanel>
-            </local:SettingContainer>
+                <!--  Search Web Default Query URL  -->
+                <local:SettingContainer x:Name="SearchWebDefaultQueryUrl"
+                                        x:Uid="Globals_SearchWebDefaultQueryUrl"
+                                        CurrentValue="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}">
+                    <TextBox IsSpellCheckEnabled="False"
+                             Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=TwoWay}" />
+                </local:SettingContainer>
+            </StackPanel>
 
             <!--  Section: Warnings  -->
-            <local:SettingContainer x:Uid="Interaction_Section_Warnings"
-                                    Style="{StaticResource SectionExpanderStyle}">
-                <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>
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Interaction_Section_Warnings"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+                <!--  Confirm Close On  -->
+                <local:SettingContainer x:Name="ConfirmOnClose"
+                                        x:Uid="Globals_ConfirmOnClose">
+                    <ComboBox AutomationProperties.AccessibilityView="Content"
+                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                              ItemsSource="{x:Bind ViewModel.ConfirmOnCloseList}"
+                              SelectedItem="{x:Bind ViewModel.CurrentConfirmOnClose, Mode=TwoWay}"
+                              Style="{StaticResource ComboBoxSettingStyle}" />
+                </local:SettingContainer>
 
-                    <!--  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>
+                <!--  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>
-            </local:SettingContainer>
+                <!--  Multi Line Paste Warning  -->
+                <local:SettingContainer x:Name="WarnAboutMultiLinePaste"
+                                        x:Uid="Globals_WarnAboutMultiLinePaste">
+                    <ComboBox AutomationProperties.AccessibilityView="Content"
+                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                              ItemsSource="{x:Bind WarnAboutMultiLinePasteList}"
+                              SelectedItem="{x:Bind CurrentWarnAboutMultiLinePaste, Mode=TwoWay}"
+                              Style="{StaticResource ComboBoxSettingStyle}" />
+                </local:SettingContainer>
+            </StackPanel>
         </StackPanel>
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.xaml b/src/cascadia/TerminalSettingsEditor/Launch.xaml
index 0772b2c622..cf57488bfa 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Launch.xaml
@@ -44,291 +44,289 @@
     <StackPanel>
         <StackPanel Style="{StaticResource SettingsStackStyle}">
             <!--  Section: Launch behavior  -->
-            <local:SettingContainer x:Uid="Launch_Section_LaunchBehavior"
-                                    StartExpanded="True"
-                                    Style="{StaticResource SectionExpanderStyle}">
-                <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">
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Launch_Section_LaunchBehavior"
+                           Margin="0,0,0,4"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+                <!--  Default Profile  -->
+                <local:SettingContainer x:Name="DefaultProfile"
+                                        x:Uid="Globals_DefaultProfile">
+                    <ComboBox ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
+                              SelectedItem="{x:Bind ViewModel.CurrentDefaultProfile, Mode=TwoWay}"
+                              Style="{StaticResource ComboBoxSettingStyle}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="SettingsModel:Profile">
+                                <Grid HorizontalAlignment="Stretch"
+                                      ColumnSpacing="8">
 
-                                        <Grid.ColumnDefinitions>
-                                            <!--  icon  -->
-                                            <ColumnDefinition Width="16" />
-                                            <!--  profile name  -->
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <!--  icon  -->
+                                        <ColumnDefinition Width="16" />
+                                        <!--  profile name  -->
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
 
-                                        <IconSourceElement Grid.Column="0"
-                                                           Width="16"
-                                                           Height="16"
-                                                           IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon.Resolved), Mode=OneTime}" />
+                                    <IconSourceElement Grid.Column="0"
+                                                       Width="16"
+                                                       Height="16"
+                                                       IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon.Resolved), Mode=OneTime}" />
 
-                                        <TextBlock Grid.Column="1"
-                                                   Text="{x:Bind Name}" />
+                                    <TextBlock Grid.Column="1"
+                                               Text="{x:Bind Name}" />
 
-                                    </Grid>
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-                    </local:SettingContainer>
+                                </Grid>
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+                </local:SettingContainer>
 
-                    <!--  First Window Behavior  -->
-                    <local:SettingContainer x:Name="FirstWindowPreference"
-                                            x:Uid="Globals_FirstWindowPreference">
-                        <ComboBox AutomationProperties.AccessibilityView="Content"
+                <!--  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>
+
+                <!--  Start on User Login  -->
+                <local:SettingContainer x:Name="StartOnUserLogin"
+                                        x:Uid="Globals_StartOnUserLogin"
+                                        HelpText="{x:Bind ViewModel.StartOnUserLoginStatefulHelpText, Mode=OneWay}"
+                                        Visibility="{x:Bind ViewModel.StartOnUserLoginAvailable, Mode=OneTime}">
+                    <ToggleSwitch IsEnabled="{x:Bind ViewModel.StartOnUserLoginConfigurable, Mode=OneWay}"
+                                  IsOn="{x:Bind ViewModel.StartOnUserLogin, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </local:SettingContainer>
+
+                <!--  Launch Parameters  -->
+                <local:SettingContainer x:Name="LaunchParameters"
+                                        x:Uid="Globals_LaunchParameters"
+                                        CurrentValue="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}">
+                    <Grid RowSpacing="8">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock x:Uid="Globals_LaunchModeSetting"
+                                   Grid.Row="0"
+                                   Grid.Column="0"
+                                   VerticalAlignment="Center" />
+                        <ComboBox x:Name="LaunchModeComboBox"
+                                  Grid.Row="0"
+                                  Grid.Column="1"
+                                  MinWidth="240"
+                                  AutomationProperties.AccessibilityView="Content"
                                   ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                                  ItemsSource="{x:Bind ViewModel.FirstWindowPreferenceList}"
-                                  SelectedItem="{x:Bind ViewModel.CurrentFirstWindowPreference, Mode=TwoWay}"
+                                  ItemsSource="{x:Bind ViewModel.LaunchModeList}"
+                                  SelectedItem="{x:Bind ViewModel.CurrentLaunchMode, Mode=TwoWay}"
                                   Style="{StaticResource ComboBoxSettingStyle}" />
-                    </local:SettingContainer>
-
-                    <!--  Windowing Behavior  -->
-                    <local:SettingContainer x:Name="WindowingBehavior"
-                                            x:Uid="Globals_WindowingBehavior">
-                        <ComboBox AutomationProperties.AccessibilityView="Content"
-                                  ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                                  ItemsSource="{x:Bind ViewModel.WindowingBehaviorList}"
-                                  SelectedItem="{x:Bind ViewModel.CurrentWindowingBehavior, Mode=TwoWay}"
-                                  Style="{StaticResource ComboBoxSettingStyle}" />
-                    </local:SettingContainer>
-
-                    <!--  Start on User Login  -->
-                    <local:SettingContainer x:Name="StartOnUserLogin"
-                                            x:Uid="Globals_StartOnUserLogin"
-                                            HelpText="{x:Bind ViewModel.StartOnUserLoginStatefulHelpText, Mode=OneWay}"
-                                            Visibility="{x:Bind ViewModel.StartOnUserLoginAvailable, Mode=OneTime}">
-                        <ToggleSwitch IsEnabled="{x:Bind ViewModel.StartOnUserLoginConfigurable, Mode=OneWay}"
-                                      IsOn="{x:Bind ViewModel.StartOnUserLogin, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </local:SettingContainer>
-
-                    <!--  Launch Parameters  -->
-                    <local:SettingContainer x:Name="LaunchParameters"
-                                            x:Uid="Globals_LaunchParameters"
-                                            CurrentValue="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}"
-                                            Style="{StaticResource ExpanderSettingContainerStyle}">
-                        <Grid RowSpacing="8">
+                        <TextBlock x:Uid="Globals_LaunchPosition"
+                                   Grid.Row="1"
+                                   Grid.Column="0"
+                                   VerticalAlignment="Center" />
+                        <Grid Grid.Row="1"
+                              Grid.Column="1"
+                              ColumnSpacing="4">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
-                            <TextBlock x:Uid="Globals_LaunchModeSetting"
-                                       Grid.Row="0"
-                                       Grid.Column="0"
-                                       VerticalAlignment="Center" />
-                            <ComboBox x:Name="LaunchModeComboBox"
-                                      Grid.Row="0"
-                                      Grid.Column="1"
-                                      MinWidth="240"
-                                      AutomationProperties.AccessibilityView="Content"
-                                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                                      ItemsSource="{x:Bind ViewModel.LaunchModeList}"
-                                      SelectedItem="{x:Bind ViewModel.CurrentLaunchMode, Mode=TwoWay}"
-                                      Style="{StaticResource ComboBoxSettingStyle}" />
-                            <TextBlock x:Uid="Globals_LaunchPosition"
-                                       Grid.Row="1"
-                                       Grid.Column="0"
-                                       VerticalAlignment="Center" />
-                            <Grid Grid.Row="1"
-                                  Grid.Column="1"
-                                  ColumnSpacing="4">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <!--  Match the width of these NumberBoxes to the Width of the LaunchModeComboBox above minus the Grid's ColumnSpacing  -->
-                                <muxc:NumberBox x:Name="PosXBox"
-                                                x:Uid="Globals_InitialPosXBox"
-                                                Grid.Row="0"
-                                                Grid.Column="0"
-                                                Width="118"
-                                                IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
-                                                Style="{StaticResource LaunchPositionNumberBoxStyle}"
-                                                Value="{x:Bind ViewModel.InitialPosX, Mode=TwoWay}" />
-                                <muxc:NumberBox x:Name="PosYBox"
-                                                x:Uid="Globals_InitialPosYBox"
-                                                Grid.Row="0"
-                                                Grid.Column="1"
-                                                Width="118"
-                                                IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
-                                                Style="{StaticResource LaunchPositionNumberBoxStyle}"
-                                                Value="{x:Bind ViewModel.InitialPosY, Mode=TwoWay}" />
-                                <CheckBox x:Name="UseDefaultLaunchPositionCheckbox"
-                                          x:Uid="Globals_DefaultLaunchPositionCheckbox"
-                                          Grid.Row="1"
-                                          Grid.Column="0"
-                                          Grid.ColumnSpan="2"
-                                          IsChecked="{x:Bind ViewModel.UseDefaultLaunchPosition, Mode=TwoWay}" />
-                            </Grid>
-                            <TextBlock x:Uid="Globals_CenterOnLaunch"
-                                       Grid.Row="2"
-                                       Grid.Column="0"
-                                       VerticalAlignment="Center" />
-                            <ToggleSwitch x:Name="CenterOnLaunchToggle"
-                                          Grid.Row="2"
-                                          Grid.Column="1"
-                                          IsOn="{x:Bind ViewModel.CenterOnLaunch, Mode=TwoWay}"
-                                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                        </Grid>
-                    </local:SettingContainer>
-
-                    <!--  Launch Size  -->
-                    <local:SettingContainer x:Name="LaunchSize"
-                                            x:Uid="Globals_LaunchSize"
-                                            CurrentValue="{x:Bind ViewModel.LaunchSizeCurrentValue, Mode=OneWay}"
-                                            Style="{StaticResource ExpanderSettingContainerStyle}">
-                        <Grid ColumnSpacing="12"
-                              RowSpacing="8">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <TextBlock x:Uid="Globals_InitialCols"
-                                       Grid.Row="0"
-                                       Grid.Column="0"
-                                       VerticalAlignment="Center"
-                                       Style="{StaticResource SettingsPageItemHeaderStyle}" />
-                            <muxc:NumberBox x:Uid="Globals_InitialColsBox"
+                            <!--  Match the width of these NumberBoxes to the Width of the LaunchModeComboBox above minus the Grid's ColumnSpacing  -->
+                            <muxc:NumberBox x:Name="PosXBox"
+                                            x:Uid="Globals_InitialPosXBox"
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            Width="118"
+                                            IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
+                                            Style="{StaticResource LaunchPositionNumberBoxStyle}"
+                                            Value="{x:Bind ViewModel.InitialPosX, Mode=TwoWay}" />
+                            <muxc:NumberBox x:Name="PosYBox"
+                                            x:Uid="Globals_InitialPosYBox"
                                             Grid.Row="0"
                                             Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Maximum="999"
-                                            Minimum="1"
-                                            Style="{StaticResource LaunchSizeNumberBoxStyle}"
-                                            Value="{x:Bind ViewModel.InitialCols, Mode=TwoWay}" />
-                            <TextBlock x:Uid="Globals_InitialRows"
-                                       Grid.Row="1"
-                                       Grid.Column="0"
-                                       VerticalAlignment="Center"
-                                       Style="{StaticResource SettingsPageItemHeaderStyle}" />
-                            <muxc:NumberBox x:Uid="Globals_InitialRowsBox"
-                                            Grid.Row="1"
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Maximum="999"
-                                            Minimum="1"
-                                            Style="{StaticResource LaunchSizeNumberBoxStyle}"
-                                            Value="{x:Bind ViewModel.InitialRows, Mode=TwoWay}" />
+                                            Width="118"
+                                            IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
+                                            Style="{StaticResource LaunchPositionNumberBoxStyle}"
+                                            Value="{x:Bind ViewModel.InitialPosY, Mode=TwoWay}" />
+                            <CheckBox x:Name="UseDefaultLaunchPositionCheckbox"
+                                      x:Uid="Globals_DefaultLaunchPositionCheckbox"
+                                      Grid.Row="1"
+                                      Grid.Column="0"
+                                      Grid.ColumnSpan="2"
+                                      IsChecked="{x:Bind ViewModel.UseDefaultLaunchPosition, Mode=TwoWay}" />
                         </Grid>
-                    </local:SettingContainer>
-                </StackPanel>
-            </local:SettingContainer>
+                        <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>
 
             <!--  Section: System & input defaults  -->
-            <local:SettingContainer x:Uid="Launch_Section_SystemInputDefaults"
-                                    Style="{StaticResource SectionExpanderStyle}">
-                <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">
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Launch_Section_SystemInputDefaults"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+                <!--  Default Terminal  -->
+                <local:SettingContainer x:Name="DefaultTerminalDropdown"
+                                        x:Uid="Globals_DefaultTerminal"
+                                        x:Load="false">
+                    <ComboBox x:Name="DefaultTerminal"
+                              ItemsSource="{x:Bind ViewModel.DefaultTerminals}"
+                              SelectedItem="{x:Bind ViewModel.CurrentDefaultTerminal, Mode=TwoWay}"
+                              Style="{StaticResource ComboBoxSettingStyle}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="SettingsModel:DefaultTerminal">
+                                <Grid HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Stretch"
+                                      ColumnSpacing="8">
 
-                                        <Grid.ColumnDefinitions>
-                                            <!--  icon  -->
-                                            <ColumnDefinition Width="auto" />
-                                            <!--  terminal name and author  -->
-                                            <ColumnDefinition Width="auto" />
-                                            <!--  version  -->
-                                            <ColumnDefinition Width="auto" />
-                                        </Grid.ColumnDefinitions>
+                                    <Grid.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>
+                                    <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}" />
+                                    <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="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="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)}" />
+                                    <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>
+                                </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="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>
-            </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>
         </StackPanel>
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
index 54b8a6e557..6bc01896c9 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
@@ -81,123 +81,122 @@
                                WindowRoot="{x:Bind WindowRoot, Mode=OneTime}" />
 
             <!--  Section: Window settings  -->
-            <local:SettingContainer x:Uid="Profile_Section_Window"
-                                    Style="{StaticResource SectionExpanderStyle}">
-                <StackPanel>
-                    <!--  Opacity  -->
-                    <local:SettingContainer x:Name="Opacity"
-                                            x:Uid="Profile_Opacity"
-                                            ClearSettingValue="{x:Bind Profile.ClearOpacity}"
-                                            HasSettingValue="{x:Bind Profile.HasOpacity, Mode=OneWay}"
-                                            SettingOverrideSource="{x:Bind Profile.OpacityOverrideSource, Mode=OneWay}">
-                        <StackPanel>
-                            <Grid Style="{StaticResource CustomSliderControlGridStyle}">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Slider x:Uid="Profile_OpacitySlider"
-                                        Grid.Column="0"
-                                        Value="{x:Bind mtu:Converters.PercentageToPercentageValue(Profile.Opacity), BindBack=Profile.SetAcrylicOpacityPercentageValue, Mode=TwoWay}" />
-                                <TextBlock Grid.Column="1"
-                                           Style="{StaticResource SliderValueLabelStyle}"
-                                           Text="{x:Bind mtu:Converters.PercentageToPercentageString(Profile.Opacity), Mode=OneWay}" />
-                            </Grid>
-                        </StackPanel>
-                    </local:SettingContainer>
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Profile_Section_Window"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+                <!--  Opacity  -->
+                <local:SettingContainer x:Name="Opacity"
+                                        x:Uid="Profile_Opacity"
+                                        ClearSettingValue="{x:Bind Profile.ClearOpacity}"
+                                        HasSettingValue="{x:Bind Profile.HasOpacity, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.OpacityOverrideSource, Mode=OneWay}">
+                    <StackPanel>
+                        <Grid Style="{StaticResource CustomSliderControlGridStyle}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Slider x:Uid="Profile_OpacitySlider"
+                                    Grid.Column="0"
+                                    Value="{x:Bind mtu:Converters.PercentageToPercentageValue(Profile.Opacity), BindBack=Profile.SetAcrylicOpacityPercentageValue, Mode=TwoWay}" />
+                            <TextBlock Grid.Column="1"
+                                       Style="{StaticResource SliderValueLabelStyle}"
+                                       Text="{x:Bind mtu:Converters.PercentageToPercentageString(Profile.Opacity), Mode=OneWay}" />
+                        </Grid>
+                    </StackPanel>
+                </local:SettingContainer>
 
-                    <!--  Use Acrylic  -->
-                    <local:SettingContainer x:Name="UseAcrylic"
-                                            x:Uid="Profile_UseAcrylic"
-                                            ClearSettingValue="{x:Bind Profile.ClearUseAcrylic}"
-                                            HasSettingValue="{x:Bind Profile.HasUseAcrylic, Mode=OneWay}"
-                                            SettingOverrideSource="{x:Bind Profile.UseAcrylicOverrideSource, Mode=OneWay}">
-                        <ToggleSwitch IsOn="{x:Bind Profile.UseAcrylic, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </local:SettingContainer>
+                <!--  Use Acrylic  -->
+                <local:SettingContainer x:Name="UseAcrylic"
+                                        x:Uid="Profile_UseAcrylic"
+                                        ClearSettingValue="{x:Bind Profile.ClearUseAcrylic}"
+                                        HasSettingValue="{x:Bind Profile.HasUseAcrylic, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.UseAcrylicOverrideSource, Mode=OneWay}">
+                    <ToggleSwitch IsOn="{x:Bind Profile.UseAcrylic, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </local:SettingContainer>
 
-                    <!--  Padding  -->
-                    <local:SettingContainer x:Name="Padding"
-                                            x:Uid="Profile_Padding"
-                                            ClearSettingValue="{x:Bind Profile.ClearPadding}"
-                                            CurrentValue="{x:Bind Profile.Padding, Mode=OneWay}"
-                                            HasSettingValue="{x:Bind Profile.HasPadding, Mode=OneWay}"
-                                            SettingOverrideSource="{x:Bind Profile.PaddingOverrideSource, Mode=OneWay}"
-                                            Style="{StaticResource ExpanderSettingContainerStyle}">
-                        <Border Margin="0,12,0,12"
-                                Padding="2,0,2,0"
-                                HorizontalAlignment="Left"
-                                BorderBrush="{ThemeResource CardStrokeColorDefaultSolidBrush}"
-                                BorderThickness="1"
-                                CornerRadius="{StaticResource OverlayCornerRadius}">
-                            <Grid>
+                <!--  Padding  -->
+                <local:SettingContainer x:Name="Padding"
+                                        x:Uid="Profile_Padding"
+                                        ClearSettingValue="{x:Bind Profile.ClearPadding}"
+                                        CurrentValue="{x:Bind Profile.Padding, Mode=OneWay}"
+                                        HasSettingValue="{x:Bind Profile.HasPadding, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.PaddingOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}">
+                    <Border Margin="0,12,0,12"
+                            Padding="2,0,2,0"
+                            HorizontalAlignment="Left"
+                            BorderBrush="{ThemeResource CardStrokeColorDefaultSolidBrush}"
+                            BorderThickness="1"
+                            CornerRadius="{StaticResource OverlayCornerRadius}">
+                        <Grid>
 
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="48" />
-                                    <RowDefinition Height="48" />
-                                    <RowDefinition Height="48" />
-                                </Grid.RowDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="48" />
+                                <RowDefinition Height="48" />
+                                <RowDefinition Height="48" />
+                            </Grid.RowDefinitions>
 
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="72" />
-                                    <ColumnDefinition Width="72" />
-                                    <ColumnDefinition Width="72" />
-                                </Grid.ColumnDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="72" />
+                                <ColumnDefinition Width="72" />
+                                <ColumnDefinition Width="72" />
+                            </Grid.ColumnDefinitions>
 
-                                <muxc:NumberBox Grid.Row="1"
-                                                Grid.Column="0"
-                                                LargeChange="10"
-                                                Maximum="100"
-                                                Minimum="0"
-                                                SmallChange="1"
-                                                Style="{StaticResource PaddingNumberBoxStyle}"
-                                                Value="{x:Bind Profile.LeftPadding, Mode=TwoWay}" />
+                            <muxc:NumberBox Grid.Row="1"
+                                            Grid.Column="0"
+                                            LargeChange="10"
+                                            Maximum="100"
+                                            Minimum="0"
+                                            SmallChange="1"
+                                            Style="{StaticResource PaddingNumberBoxStyle}"
+                                            Value="{x:Bind Profile.LeftPadding, Mode=TwoWay}" />
 
-                                <muxc:NumberBox Grid.Row="0"
-                                                Grid.Column="1"
-                                                LargeChange="10"
-                                                Maximum="100"
-                                                Minimum="0"
-                                                SmallChange="1"
-                                                Style="{StaticResource PaddingNumberBoxStyle}"
-                                                Value="{x:Bind Profile.TopPadding, Mode=TwoWay}" />
+                            <muxc:NumberBox Grid.Row="0"
+                                            Grid.Column="1"
+                                            LargeChange="10"
+                                            Maximum="100"
+                                            Minimum="0"
+                                            SmallChange="1"
+                                            Style="{StaticResource PaddingNumberBoxStyle}"
+                                            Value="{x:Bind Profile.TopPadding, Mode=TwoWay}" />
 
-                                <muxc:NumberBox Grid.Row="1"
-                                                Grid.Column="2"
-                                                LargeChange="10"
-                                                Maximum="100"
-                                                Minimum="0"
-                                                SmallChange="1"
-                                                Style="{StaticResource PaddingNumberBoxStyle}"
-                                                Value="{x:Bind Profile.RightPadding, Mode=TwoWay}" />
+                            <muxc:NumberBox Grid.Row="1"
+                                            Grid.Column="2"
+                                            LargeChange="10"
+                                            Maximum="100"
+                                            Minimum="0"
+                                            SmallChange="1"
+                                            Style="{StaticResource PaddingNumberBoxStyle}"
+                                            Value="{x:Bind Profile.RightPadding, Mode=TwoWay}" />
 
-                                <muxc:NumberBox Grid.Row="2"
-                                                Grid.Column="1"
-                                                LargeChange="10"
-                                                Maximum="100"
-                                                Minimum="0"
-                                                SmallChange="1"
-                                                Style="{StaticResource PaddingNumberBoxStyle}"
-                                                Value="{x:Bind Profile.BottomPadding, Mode=TwoWay}" />
+                            <muxc:NumberBox Grid.Row="2"
+                                            Grid.Column="1"
+                                            LargeChange="10"
+                                            Maximum="100"
+                                            Minimum="0"
+                                            SmallChange="1"
+                                            Style="{StaticResource PaddingNumberBoxStyle}"
+                                            Value="{x:Bind Profile.BottomPadding, Mode=TwoWay}" />
 
-                            </Grid>
-                        </Border>
-                    </local:SettingContainer>
+                        </Grid>
+                    </Border>
+                </local:SettingContainer>
 
-                    <!--  Scrollbar Visibility  -->
-                    <local:SettingContainer x:Name="ScrollbarVisibility"
-                                            x:Uid="Profile_ScrollbarVisibility"
-                                            ClearSettingValue="{x:Bind Profile.ClearScrollState}"
-                                            HasSettingValue="{x:Bind Profile.HasScrollState, Mode=OneWay}"
-                                            SettingOverrideSource="{x:Bind Profile.ScrollStateOverrideSource, Mode=OneWay}">
-                        <ComboBox AutomationProperties.AccessibilityView="Content"
-                                  ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                                  ItemsSource="{x:Bind Profile.ScrollStateList, Mode=OneWay}"
-                                  SelectedItem="{x:Bind Profile.CurrentScrollState, Mode=TwoWay}"
-                                  Style="{StaticResource ComboBoxSettingStyle}" />
-                    </local:SettingContainer>
-                </StackPanel>
-            </local:SettingContainer>
+                <!--  Scrollbar Visibility  -->
+                <local:SettingContainer x:Name="ScrollbarVisibility"
+                                        x:Uid="Profile_ScrollbarVisibility"
+                                        ClearSettingValue="{x:Bind Profile.ClearScrollState}"
+                                        HasSettingValue="{x:Bind Profile.HasScrollState, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.ScrollStateOverrideSource, Mode=OneWay}">
+                    <ComboBox AutomationProperties.AccessibilityView="Content"
+                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                              ItemsSource="{x:Bind Profile.ScrollStateList, Mode=OneWay}"
+                              SelectedItem="{x:Bind Profile.CurrentScrollState, Mode=TwoWay}"
+                              Style="{StaticResource ComboBoxSettingStyle}" />
+                </local:SettingContainer>
+            </StackPanel>
             <StackPanel MaxWidth="{StaticResource StandardControlMaxWidth}">
                 <StackPanel Orientation="Horizontal"
                             Visibility="{x:Bind Profile.EditableUnfocusedAppearance, Mode=OneWay}">
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
index 3bd1739d7c..3e165cedb9 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
@@ -35,159 +35,156 @@
                     Style="{StaticResource SettingsStackStyle}">
 
             <!--  Section: {Profile.Name} profile (or "Profile defaults")  -->
-            <local:SettingContainer x:Uid="Profile_Section_HeaderPlaceholder"
-                                    Header="{x:Bind Profile.SectionHeaderText, Mode=OneWay}"
-                                    StartExpanded="True"
-                                    Style="{StaticResource SectionExpanderStyle}">
-                <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>
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock Margin="0,0,0,4"
+                           Style="{StaticResource TextBlockSubHeaderStyle}"
+                           Text="{x:Bind Profile.SectionHeaderText, Mode=OneWay}" />
+                <!--  Name  -->
+                <!--
+                    NOTE: Has/Clear is not bound because we don't want the reset button & override text to appear.
+                    Additionally, the JSON stubs generated by auto-generated profiles come with a name,
+                    so the name will always be overridden.
+                -->
+                <local:SettingContainer x:Name="Name"
+                                        x:Uid="Profile_Name"
+                                        CurrentValue="{x:Bind Profile.Name, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}"
+                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                    <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind Profile.Name, Mode=TwoWay}" />
+                </local:SettingContainer>
 
-                    <!--  Commandline  -->
-                    <local:SettingContainer x:Name="Commandline"
-                                            x:Uid="Profile_Commandline"
-                                            ClearSettingValue="{x:Bind Profile.ClearCommandline}"
-                                            CurrentValue="{x:Bind Profile.Commandline, Mode=OneWay}"
-                                            HasSettingValue="{x:Bind Profile.HasCommandline, Mode=OneWay}"
-                                            SettingOverrideSource="{x:Bind Profile.CommandlineOverrideSource, Mode=OneWay}"
-                                            Style="{StaticResource ExpanderSettingContainerStyle}"
-                                            Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
-                        <StackPanel>
-                            <TextBox x:Uid="Profile_CommandlineBox"
-                                     IsSpellCheckEnabled="False"
-                                     Style="{StaticResource TextBoxSettingStyle}"
-                                     Text="{x:Bind Profile.Commandline, Mode=TwoWay}" />
-                            <Button x:Uid="Profile_CommandlineBrowse"
-                                    Margin="0,8,0,0"
-                                    Click="Commandline_Click"
+                <!--  Commandline  -->
+                <local:SettingContainer x:Name="Commandline"
+                                        x:Uid="Profile_Commandline"
+                                        ClearSettingValue="{x:Bind Profile.ClearCommandline}"
+                                        CurrentValue="{x:Bind Profile.Commandline, Mode=OneWay}"
+                                        HasSettingValue="{x:Bind Profile.HasCommandline, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.CommandlineOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}"
+                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                    <StackPanel>
+                        <TextBox x:Uid="Profile_CommandlineBox"
+                                 IsSpellCheckEnabled="False"
+                                 Style="{StaticResource TextBoxSettingStyle}"
+                                 Text="{x:Bind Profile.Commandline, Mode=TwoWay}" />
+                        <Button x:Uid="Profile_CommandlineBrowse"
+                                Margin="0,8,0,0"
+                                Click="Commandline_Click"
+                                Style="{StaticResource BrowseButtonStyle}" />
+                    </StackPanel>
+                </local:SettingContainer>
+
+                <!--  Starting Directory  -->
+                <local:SettingContainer x:Name="StartingDirectory"
+                                        x:Uid="Profile_StartingDirectory"
+                                        ClearSettingValue="{x:Bind Profile.ClearStartingDirectory}"
+                                        CurrentValue="{x:Bind Profile.CurrentStartingDirectoryPreview, Mode=OneWay}"
+                                        HasSettingValue="{x:Bind Profile.HasStartingDirectory, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}">
+                    <StackPanel Orientation="Vertical">
+                        <TextBox x:Uid="Profile_StartingDirectoryBox"
+                                 IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Profile.UseParentProcessDirectory), Mode=OneWay}"
+                                 IsSpellCheckEnabled="False"
+                                 Style="{StaticResource TextBoxSettingStyle}"
+                                 Text="{x:Bind Profile.StartingDirectory, Mode=TwoWay}" />
+                        <StackPanel Orientation="Horizontal">
+                            <Button x:Name="StartingDirectoryBrowse"
+                                    x:Uid="Profile_StartingDirectoryBrowse"
+                                    Margin="0,12,12,0"
+                                    Click="StartingDirectory_Click"
+                                    IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Profile.UseParentProcessDirectory), Mode=OneWay}"
                                     Style="{StaticResource BrowseButtonStyle}" />
+                            <CheckBox x:Name="StartingDirectoryUseParentCheckbox"
+                                      x:Uid="Profile_StartingDirectoryUseParentCheckbox"
+                                      Margin="0,4,0,0"
+                                      IsChecked="{x:Bind Profile.UseParentProcessDirectory, Mode=TwoWay}" />
                         </StackPanel>
-                    </local:SettingContainer>
+                    </StackPanel>
+                </local:SettingContainer>
 
-                    <!--  Starting Directory  -->
-                    <local:SettingContainer x:Name="StartingDirectory"
-                                            x:Uid="Profile_StartingDirectory"
-                                            ClearSettingValue="{x:Bind Profile.ClearStartingDirectory}"
-                                            CurrentValue="{x:Bind Profile.CurrentStartingDirectoryPreview, Mode=OneWay}"
-                                            HasSettingValue="{x:Bind Profile.HasStartingDirectory, Mode=OneWay}"
-                                            SettingOverrideSource="{x:Bind Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
-                                            Style="{StaticResource ExpanderSettingContainerStyle}">
-                        <StackPanel Orientation="Vertical">
-                            <TextBox x:Uid="Profile_StartingDirectoryBox"
-                                     IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Profile.UseParentProcessDirectory), Mode=OneWay}"
-                                     IsSpellCheckEnabled="False"
-                                     Style="{StaticResource TextBoxSettingStyle}"
-                                     Text="{x:Bind Profile.StartingDirectory, Mode=TwoWay}" />
-                            <StackPanel Orientation="Horizontal">
-                                <Button x:Name="StartingDirectoryBrowse"
-                                        x:Uid="Profile_StartingDirectoryBrowse"
-                                        Margin="0,12,12,0"
-                                        Click="StartingDirectory_Click"
-                                        IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Profile.UseParentProcessDirectory), Mode=OneWay}"
-                                        Style="{StaticResource BrowseButtonStyle}" />
-                                <CheckBox x:Name="StartingDirectoryUseParentCheckbox"
-                                          x:Uid="Profile_StartingDirectoryUseParentCheckbox"
-                                          Margin="0,4,0,0"
-                                          IsChecked="{x:Bind Profile.UseParentProcessDirectory, Mode=TwoWay}" />
-                            </StackPanel>
-                        </StackPanel>
-                    </local:SettingContainer>
-
-                    <!--  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>
+                <!--  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>
 
             <!--  Section: Visual/UI Affordance  -->
-            <local:SettingContainer x:Uid="Profile_Section_VisualUI"
-                                    Style="{StaticResource SectionExpanderStyle}">
-                <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>
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Profile_Section_VisualUI"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+                <!--  Tab Title  -->
+                <local:SettingContainer x:Name="TabTitle"
+                                        x:Uid="Profile_TabTitle"
+                                        ClearSettingValue="{x:Bind Profile.ClearTabTitle}"
+                                        CurrentValue="{x:Bind Profile.TabTitlePreview, Mode=OneWay}"
+                                        HasSettingValue="{x:Bind Profile.HasTabTitle, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.TabTitleOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}">
+                    <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind Profile.TabTitle, Mode=TwoWay}" />
+                </local:SettingContainer>
 
-                    <!--  Tab Color  -->
-                    <local:SettingContainer x:Name="TabColor"
-                                            x:Uid="Profile_TabColor"
-                                            ClearSettingValue="{x:Bind Profile.ClearTabColor}"
-                                            CurrentValue="{x:Bind Profile.TabColorPreview, Mode=OneWay}"
-                                            CurrentValueAccessibleName="{x:Bind Profile.TabColorPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
-                                            CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
-                                            HasSettingValue="{x:Bind Profile.HasTabColor, Mode=OneWay}"
-                                            SettingOverrideSource="{x:Bind Profile.TabColorOverrideSource, Mode=OneWay}"
-                                            Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                        <local:NullableColorPicker x:Uid="Profile_TabColor_NullableColorPicker"
-                                                   ColorSchemeVM="{x:Bind Profile.DefaultAppearance.CurrentColorScheme, Mode=OneWay}"
-                                                   CurrentColor="{x:Bind Profile.TabColor, Mode=TwoWay}"
-                                                   NullColorPreview="{x:Bind Profile.TabThemeColorPreview, Mode=OneWay}" />
-                    </local:SettingContainer>
+                <!--  Tab Color  -->
+                <local:SettingContainer x:Name="TabColor"
+                                        x:Uid="Profile_TabColor"
+                                        ClearSettingValue="{x:Bind Profile.ClearTabColor}"
+                                        CurrentValue="{x:Bind Profile.TabColorPreview, Mode=OneWay}"
+                                        CurrentValueAccessibleName="{x:Bind Profile.TabColorPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}"
+                                        CurrentValueTemplate="{StaticResource ColorPreviewTemplate}"
+                                        HasSettingValue="{x:Bind Profile.HasTabColor, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.TabColorOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                    <local:NullableColorPicker x:Uid="Profile_TabColor_NullableColorPicker"
+                                               ColorSchemeVM="{x:Bind Profile.DefaultAppearance.CurrentColorScheme, Mode=OneWay}"
+                                               CurrentColor="{x:Bind Profile.TabColor, Mode=TwoWay}"
+                                               NullColorPreview="{x:Bind Profile.TabThemeColorPreview, Mode=OneWay}" />
+                </local:SettingContainer>
 
-                    <!--  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>
+                <!--  Icon  -->
+                <local:SettingContainer x:Name="Icon"
+                                        x:Uid="Profile_Icon"
+                                        ClearSettingValue="{x:Bind Profile.ClearIcon}"
+                                        CurrentValueAccessibleName="{x:Bind Profile.LocalizedIcon, Mode=OneWay}"
+                                        HasSettingValue="{x:Bind Profile.HasIcon, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.IconOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
+                    <local:SettingContainer.CurrentValue>
+                        <Grid>
+                            <ContentControl Width="16"
+                                            Height="16"
+                                            Content="{x:Bind Profile.IconPreview, Mode=OneWay}"
+                                            IsTabStop="False"
+                                            Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.UsingNoIcon), Mode=OneWay}" />
+                            <TextBlock Margin="0,0,0,0"
+                                       HorizontalAlignment="Right"
+                                       VerticalAlignment="Center"
+                                       FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
+                                       Style="{StaticResource SettingsPageItemDescriptionStyle}"
+                                       Text="{x:Bind Profile.LocalizedIcon, Mode=OneWay}"
+                                       Visibility="{x:Bind Profile.UsingNoIcon, Mode=OneWay}" />
+                        </Grid>
+                    </local:SettingContainer.CurrentValue>
+                    <local:SettingContainer.Content>
+                        <local:IconPicker CurrentIconPath="{x:Bind Profile.IconPath, Mode=TwoWay}"
+                                          WindowRoot="{x:Bind WindowRoot, Mode=OneWay}" />
+                    </local:SettingContainer.Content>
+                </local:SettingContainer>
 
-                    <!--  Hidden  -->
-                    <local:SettingContainer x:Name="Hidden"
-                                            x:Uid="Profile_Hidden"
-                                            Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
-                        <ToggleSwitch IsOn="{x:Bind Profile.Hidden, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </local:SettingContainer>
-                </StackPanel>
-            </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>
 
             <TextBlock x:Uid="Profile_AdditionalSettingsHeader"
                        Margin="0,32,0,4"
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index 2e78095d1f..cd2a7c27d3 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -2768,131 +2768,71 @@
     <value>This text will be inserted between the paths of multiple files dropped into the terminal.</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
-  <data name="Launch_Section_LaunchBehavior.Header" xml:space="preserve">
+  <data name="Launch_Section_LaunchBehavior.Text" xml:space="preserve">
     <value>Launch behavior</value>
     <comment>Title of a section that groups settings that control how the terminal opens and behaves when launched.</comment>
   </data>
-  <data name="Launch_Section_LaunchBehavior.HelpText" 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.Header" xml:space="preserve">
+  <data name="Launch_Section_SystemInputDefaults.Text" xml:space="preserve">
     <value>System &amp; input defaults</value>
     <comment>Title of a section that groups settings for default system and input behaviors.</comment>
   </data>
-  <data name="Launch_Section_SystemInputDefaults.HelpText" 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.Header" xml:space="preserve">
+  <data name="Interaction_Section_Clipboard.Text" xml:space="preserve">
     <value>Clipboard and paste behavior</value>
     <comment>Title of a section that groups settings related to selection, copying, and pasting.</comment>
   </data>
-  <data name="Interaction_Section_Clipboard.HelpText" 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.Header" xml:space="preserve">
+  <data name="Interaction_Section_TextSelection.Text" xml:space="preserve">
     <value>Text selection &amp; editing</value>
     <comment>Title of a section that groups settings related to text selection and editing.</comment>
   </data>
-  <data name="Interaction_Section_TextSelection.HelpText" 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.Header" xml:space="preserve">
+  <data name="Interaction_Section_WindowLayout.Text" xml:space="preserve">
     <value>Window and layout behavior</value>
     <comment>Title of a section that groups settings related to window sizing, arrangement, and grouping.</comment>
   </data>
-  <data name="Interaction_Section_WindowLayout.HelpText" 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.Header" xml:space="preserve">
+  <data name="Interaction_Section_MouseScrolling.Text" xml:space="preserve">
     <value>Mouse &amp; scrolling</value>
     <comment>Title of a section that groups settings related to mouse and scroll wheel input.</comment>
   </data>
-  <data name="Interaction_Section_MouseScrolling.HelpText" 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.Header" xml:space="preserve">
+  <data name="Interaction_Section_UrlsExternal.Text" xml:space="preserve">
     <value>URLs &amp; external actions</value>
     <comment>Title of a section that groups settings related to URLs and external app actions.</comment>
   </data>
-  <data name="Interaction_Section_UrlsExternal.HelpText" 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.Header" xml:space="preserve">
+  <data name="Interaction_Section_Warnings.Text" xml:space="preserve">
     <value>Warnings</value>
     <comment>Title of a section that groups warning-related settings.</comment>
   </data>
-  <data name="Interaction_Section_Warnings.HelpText" 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.Header" xml:space="preserve">
+  <data name="Globals_Section_VisualStyle.Text" xml:space="preserve">
     <value>Visual style</value>
     <comment>Title of a section that groups settings related to the terminal's visual appearance.</comment>
   </data>
-  <data name="Globals_Section_VisualStyle.HelpText" 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.Header" xml:space="preserve">
+  <data name="Globals_Section_TabsLayout.Text" xml:space="preserve">
     <value>Tabs and layout</value>
     <comment>Title of a section that groups settings related to tabs and pane layout.</comment>
   </data>
-  <data name="Globals_Section_TabsLayout.HelpText" 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.Header" xml:space="preserve">
+  <data name="Globals_Section_WindowBehavior.Text" xml:space="preserve">
     <value>Window behavior</value>
     <comment>Title of a section that groups settings related to terminal window behavior.</comment>
   </data>
-  <data name="Globals_Section_WindowBehavior.HelpText" xml:space="preserve">
-    <value>Manage terminal window behavior.</value>
-    <comment>Description for the "Window behavior" section.</comment>
-  </data>
-  <data name="Globals_Section_TitleBarIdentity.Header" xml:space="preserve">
+  <data name="Globals_Section_TitleBarIdentity.Text" xml:space="preserve">
     <value>Title bar &amp; identity</value>
     <comment>Title of a section that groups settings related to title bar identity and indicators.</comment>
   </data>
-  <data name="Globals_Section_TitleBarIdentity.HelpText" 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.Header" xml:space="preserve">
+  <data name="Globals_Section_SystemIntegration.Text" xml:space="preserve">
     <value>System integration &amp; notifications</value>
     <comment>Title of a section that groups settings related to system integration and notifications.</comment>
   </data>
-  <data name="Globals_Section_SystemIntegration.HelpText" 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.Header" xml:space="preserve">
+  <data name="Compatibility_Section_Compatibility.Text" xml:space="preserve">
     <value>Compatibility</value>
     <comment>Title of a section that groups compatibility-related settings.</comment>
   </data>
-  <data name="Compatibility_Section_Compatibility.HelpText" 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.Header" xml:space="preserve">
+  <data name="Compatibility_Section_Rendering.Text" xml:space="preserve">
     <value>Rendering</value>
     <comment>Title of a section that groups rendering-related settings.</comment>
   </data>
-  <data name="Compatibility_Section_Rendering.HelpText" 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.Header" xml:space="preserve">
+  <data name="Profile_Section_VisualUI.Text" xml:space="preserve">
     <value>Visual/UI Affordance</value>
     <comment>Title of a section in a profile page that groups visual and UI settings (tab title, icon, tab color, etc.).</comment>
   </data>
-  <data name="Profile_Section_Window.Header" xml:space="preserve">
+  <data name="Profile_Section_Window.Text" xml:space="preserve">
     <value>Window settings</value>
     <comment>Title of a section expander on the Profile Appearance page that groups window-level appearance settings (background opacity, acrylic, padding, scrollbar visibility).</comment>
   </data>
@@ -2904,30 +2844,18 @@
     <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.Header" xml:space="preserve">
+  <data name="Appearance_Section_Typography.Text" xml:space="preserve">
     <value>Typography settings</value>
     <comment>Title of a section that groups settings controlling how text looks in a profile.</comment>
   </data>
-  <data name="Appearance_Section_Typography.HelpText" 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.Header" xml:space="preserve">
+  <data name="Appearance_Section_Cursor.Text" xml:space="preserve">
     <value>Cursor settings</value>
     <comment>Title of a section that groups settings controlling the cursor.</comment>
   </data>
-  <data name="Appearance_Section_Cursor.HelpText" 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.Header" xml:space="preserve">
+  <data name="Appearance_Section_BackgroundImage.Text" xml:space="preserve">
     <value>Background image</value>
     <comment>Title of a section that groups settings controlling the background image.</comment>
   </data>
-  <data name="Appearance_Section_BackgroundImage.HelpText" 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>
diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
index c0fac8189a..280dba68ad 100644
--- a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
+++ b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
@@ -580,57 +580,4 @@
         </Setter>
     </Style>
 
-    <!--
-        A "section" container that groups related SettingContainers under a
-        collapsible header.
-    -->
-    <Style x:Key="SectionExpanderHeaderTextStyle"
-           BasedOn="{StaticResource BodyTextBlockStyle}"
-           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>
-
-    <Style x:Key="SectionExpanderStyle"
-           TargetType="local:SettingContainer">
-        <Setter Property="MaxWidth" Value="1000" />
-        <Setter Property="Margin" Value="0,12,0,0" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="local:SettingContainer">
-                    <muxc:Expander x:Name="Expander"
-                                   HorizontalAlignment="Stretch"
-                                   HorizontalContentAlignment="Stretch"
-                                   IsExpanded="{TemplateBinding StartExpanded}">
-                        <muxc:Expander.Header>
-                            <StackPanel MinHeight="64"
-                                        Padding="0,12,0,12"
-                                        VerticalAlignment="Center">
-                                <TextBlock Style="{StaticResource SectionExpanderHeaderTextStyle}"
-                                           Text="{TemplateBinding Header}" />
-                                <TextBlock x:Name="HelpTextBlock"
-                                           Style="{StaticResource SectionExpanderHelpTextStyle}"
-                                           Text="{TemplateBinding HelpText}" />
-                            </StackPanel>
-                        </muxc:Expander.Header>
-                        <ContentPresenter Margin="0,-4,0,0"
-                                          Content="{TemplateBinding Content}" />
-                    </muxc:Expander>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index 2d6259c9ba..5909471e06 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -23,8 +23,7 @@ $ProhibitedUids = @(
     "Profile_ProportionalFontFaces",
     "ColorScheme_InboxSchemeDuplicate",
     "ColorScheme_ColorsHeader",
-    "ColorScheme_Rename",
-    "Profile_Section_HeaderPlaceholder"
+    "ColorScheme_Rename"
 )
 
 # Prohibited XAML files (already limited to Page root elements)