diff --git a/.github/actions/spelling/allow/allow.txt b/.github/actions/spelling/allow/allow.txt
index 35742a6111e..ccc5c02d972 100644
--- a/.github/actions/spelling/allow/allow.txt
+++ b/.github/actions/spelling/allow/allow.txt
@@ -1,4 +1,5 @@
 apc
+breadcrumb
 calt
 ccmp
 changelog
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 381e33a0ad6..19f1340be11 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -314,28 +314,28 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                                                                             *this);
 
             _profileViewModelChangedRevoker = _lastProfilesNavState.Profile().PropertyChanged(winrt::auto_revoke, [=](auto&&, const PropertyChangedEventArgs& args) {
-                    const auto settingName{ args.PropertyName() };
-                    if (settingName == L"CurrentPage")
+                const auto settingName{ args.PropertyName() };
+                if (settingName == L"CurrentPage")
+                {
+                    const auto currentPage = _lastProfilesNavState.Profile().CurrentPage();
+                    if (currentPage == L"Base")
                     {
-                        const auto currentPage = _lastProfilesNavState.Profile().CurrentPage();
-                        if (currentPage == L"Base")
-                        {
-                            contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), _lastProfilesNavState);
-                            _breadcrumbs.Clear();
-                            _breadcrumbs.Append(RS_(L"Nav_ProfileDefaults/Content"));
-                        }
-                        else if (currentPage == L"Appearance")
-                        {
-                            contentFrame().Navigate(xaml_typename<Editor::Profiles_Appearance>(), _lastProfilesNavState);
-                            _breadcrumbs.Append(RS_(L"Profile_Appearance/Header"));
-                        }
-                        else if (currentPage == L"Advanced")
-                        {
-                            contentFrame().Navigate(xaml_typename<Editor::Profiles_Advanced>(), _lastProfilesNavState);
-                            _breadcrumbs.Append(RS_(L"Profile_Advanced/Header"));
-                        }
+                        contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), _lastProfilesNavState);
+                        _breadcrumbs.Clear();
+                        _breadcrumbs.Append(RS_(L"Nav_ProfileDefaults/Content"));
                     }
-                });
+                    else if (currentPage == L"Appearance")
+                    {
+                        contentFrame().Navigate(xaml_typename<Editor::Profiles_Appearance>(), _lastProfilesNavState);
+                        _breadcrumbs.Append(RS_(L"Profile_Appearance/Header"));
+                    }
+                    else if (currentPage == L"Advanced")
+                    {
+                        contentFrame().Navigate(xaml_typename<Editor::Profiles_Advanced>(), _lastProfilesNavState);
+                        _breadcrumbs.Append(RS_(L"Profile_Advanced/Header"));
+                    }
+                }
+            });
 
             contentFrame().Navigate(xaml_typename<Editor::Profiles_Base>(), _lastProfilesNavState);
             _breadcrumbs.Append(RS_(L"Nav_ProfileDefaults/Content"));
@@ -451,7 +451,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _lastProfilesNavState.Profile().CurrentPage(L"Base");
     }
 
-
     void MainPage::_InitializeProfilesList()
     {
         const auto menuItems = SettingsNav().MenuItems();
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index 926072dd7af..98fc28e9efe 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -43,9 +43,9 @@
                          TabFocusNavigation="Cycle">
         <muxc:NavigationView.Header>
             <muxc:BreadcrumbBar x:Name="NavigationBreadcrumbBar"
-                                ItemsSource="{x:Bind Breadcrumbs}"
+                                Margin="-40,0,0,16"
                                 ItemClicked="BreadcrumbBar_ItemClicked"
-                                Margin="-40,0,0,16">
+                                ItemsSource="{x:Bind Breadcrumbs}">
                 <muxc:BreadcrumbBar.Resources>
                     <ResourceDictionary>
                         <x:Double x:Key="BreadcrumbBarItemThemeFontSize">28</x:Double>
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
index 3508bfff572..33c84d738e1 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
@@ -35,84 +35,84 @@
                    Margin="{StaticResource StandardIndentMargin}"
                    Style="{StaticResource DisclaimerStyle}"
                    Visibility="{x:Bind State.Profile.IsBaseLayer}" />
-        <ScrollViewer ViewChanging="ViewChanging"
-                      Grid.Row="1">
-            <StackPanel Style="{StaticResource PivotStackStyle}"
-                    Margin="13,0,0,0">
+        <ScrollViewer Grid.Row="1"
+                      ViewChanging="ViewChanging">
+            <StackPanel Margin="13,0,0,0"
+                        Style="{StaticResource PivotStackStyle}">
                 <!--  Suppress Application Title  -->
                 <local:SettingContainer x:Uid="Profile_SuppressApplicationTitle"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearSuppressApplicationTitle}"
-                                                HasSettingValue="{x:Bind State.Profile.HasSuppressApplicationTitle, Mode=OneWay}"
-                                                SettingOverrideSource="{x:Bind State.Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}">
+                                        ClearSettingValue="{x:Bind State.Profile.ClearSuppressApplicationTitle}"
+                                        HasSettingValue="{x:Bind State.Profile.HasSuppressApplicationTitle, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind State.Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}">
                     <ToggleSwitch IsOn="{x:Bind State.Profile.SuppressApplicationTitle, Mode=TwoWay}" />
                 </local:SettingContainer>
 
                 <!--  Antialiasing Mode  -->
                 <local:SettingContainer x:Uid="Profile_AntialiasingMode"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearAntialiasingMode}"
-                                                HasSettingValue="{x:Bind State.Profile.HasAntialiasingMode, Mode=OneWay}"
-                                                SettingOverrideSource="{x:Bind State.Profile.AntialiasingModeOverrideSource, Mode=OneWay}"
-                                                Style="{StaticResource ExpanderSettingContainerStyle}">
+                                        ClearSettingValue="{x:Bind State.Profile.ClearAntialiasingMode}"
+                                        HasSettingValue="{x:Bind State.Profile.HasAntialiasingMode, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind State.Profile.AntialiasingModeOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}">
                     <muxc:RadioButtons AutomationProperties.AccessibilityView="Content"
-                                               ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
-                                               ItemsSource="{x:Bind AntiAliasingModeList, Mode=OneWay}"
-                                               SelectedItem="{x:Bind CurrentAntiAliasingMode, Mode=TwoWay}" />
+                                       ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
+                                       ItemsSource="{x:Bind AntiAliasingModeList, Mode=OneWay}"
+                                       SelectedItem="{x:Bind CurrentAntiAliasingMode, Mode=TwoWay}" />
                 </local:SettingContainer>
 
                 <!--  AltGr Aliasing  -->
                 <local:SettingContainer x:Uid="Profile_AltGrAliasing"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearAltGrAliasing}"
-                                                HasSettingValue="{x:Bind State.Profile.HasAltGrAliasing, Mode=OneWay}"
-                                                SettingOverrideSource="{x:Bind State.Profile.AltGrAliasingOverrideSource, Mode=OneWay}">
+                                        ClearSettingValue="{x:Bind State.Profile.ClearAltGrAliasing}"
+                                        HasSettingValue="{x:Bind State.Profile.HasAltGrAliasing, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind State.Profile.AltGrAliasingOverrideSource, Mode=OneWay}">
                     <ToggleSwitch IsOn="{x:Bind State.Profile.AltGrAliasing, Mode=TwoWay}" />
                 </local:SettingContainer>
 
                 <!--  Snap On Input  -->
                 <local:SettingContainer x:Uid="Profile_SnapOnInput"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearSnapOnInput}"
-                                                HasSettingValue="{x:Bind State.Profile.HasSnapOnInput, Mode=OneWay}"
-                                                SettingOverrideSource="{x:Bind State.Profile.SnapOnInputOverrideSource, Mode=OneWay}">
+                                        ClearSettingValue="{x:Bind State.Profile.ClearSnapOnInput}"
+                                        HasSettingValue="{x:Bind State.Profile.HasSnapOnInput, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind State.Profile.SnapOnInputOverrideSource, Mode=OneWay}">
                     <ToggleSwitch IsOn="{x:Bind State.Profile.SnapOnInput, Mode=TwoWay}" />
                 </local:SettingContainer>
 
                 <!--  History Size  -->
                 <local:SettingContainer x:Uid="Profile_HistorySize"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearHistorySize}"
-                                                HasSettingValue="{x:Bind State.Profile.HasHistorySize, Mode=OneWay}"
-                                                SettingOverrideSource="{x:Bind State.Profile.HistorySizeOverrideSource, Mode=OneWay}">
+                                        ClearSettingValue="{x:Bind State.Profile.ClearHistorySize}"
+                                        HasSettingValue="{x:Bind State.Profile.HasHistorySize, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind State.Profile.HistorySizeOverrideSource, Mode=OneWay}">
                     <muxc:NumberBox x:Uid="Profile_HistorySizeBox"
-                                            LargeChange="100"
-                                            Minimum="0"
-                                            SmallChange="10"
-                                            Style="{StaticResource NumberBoxSettingStyle}"
-                                            Value="{x:Bind State.Profile.HistorySize, Mode=TwoWay}" />
+                                    LargeChange="100"
+                                    Minimum="0"
+                                    SmallChange="10"
+                                    Style="{StaticResource NumberBoxSettingStyle}"
+                                    Value="{x:Bind State.Profile.HistorySize, Mode=TwoWay}" />
                 </local:SettingContainer>
 
                 <!--  Close On Exit  -->
                 <local:SettingContainer x:Uid="Profile_CloseOnExit"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearCloseOnExit}"
-                                                HasSettingValue="{x:Bind State.Profile.HasCloseOnExit, Mode=OneWay}"
-                                                SettingOverrideSource="{x:Bind State.Profile.CloseOnExitOverrideSource, Mode=OneWay}"
-                                                Style="{StaticResource ExpanderSettingContainerStyle}">
+                                        ClearSettingValue="{x:Bind State.Profile.ClearCloseOnExit}"
+                                        HasSettingValue="{x:Bind State.Profile.HasCloseOnExit, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind State.Profile.CloseOnExitOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}">
                     <muxc:RadioButtons AutomationProperties.AccessibilityView="Content"
-                                               ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
-                                               ItemsSource="{x:Bind CloseOnExitModeList, Mode=OneWay}"
-                                               SelectedItem="{x:Bind CurrentCloseOnExitMode, Mode=TwoWay}" />
+                                       ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
+                                       ItemsSource="{x:Bind CloseOnExitModeList, Mode=OneWay}"
+                                       SelectedItem="{x:Bind CurrentCloseOnExitMode, Mode=TwoWay}" />
                 </local:SettingContainer>
 
                 <!--  Bell Style  -->
                 <local:SettingContainer x:Uid="Profile_BellStyle"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearBellStyle}"
-                                                HasSettingValue="{x:Bind State.Profile.HasBellStyle, Mode=OneWay}"
-                                                SettingOverrideSource="{x:Bind State.Profile.BellStyleOverrideSource, Mode=OneWay}"
-                                                Style="{StaticResource ExpanderSettingContainerStyle}">
+                                        ClearSettingValue="{x:Bind State.Profile.ClearBellStyle}"
+                                        HasSettingValue="{x:Bind State.Profile.HasBellStyle, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind State.Profile.BellStyleOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}">
                     <StackPanel>
                         <CheckBox x:Uid="Profile_BellStyleAudible"
-                                          IsChecked="{x:Bind IsBellStyleFlagSet(1), BindBack=SetBellStyleAudible, Mode=TwoWay}" />
+                                  IsChecked="{x:Bind IsBellStyleFlagSet(1), BindBack=SetBellStyleAudible, Mode=TwoWay}" />
                         <CheckBox x:Uid="Profile_BellStyleWindow"
-                                          IsChecked="{x:Bind IsBellStyleFlagSet(2), BindBack=SetBellStyleWindow, Mode=TwoWay}" />
+                                  IsChecked="{x:Bind IsBellStyleFlagSet(2), BindBack=SetBellStyleWindow, Mode=TwoWay}" />
                         <CheckBox x:Uid="Profile_BellStyleTaskbar"
-                                          IsChecked="{x:Bind IsBellStyleFlagSet(4), BindBack=SetBellStyleTaskbar, Mode=TwoWay}" />
+                                  IsChecked="{x:Bind IsBellStyleFlagSet(4), BindBack=SetBellStyleTaskbar, Mode=TwoWay}" />
                     </StackPanel>
                 </local:SettingContainer>
             </StackPanel>
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
index a57b8e9344b..2d1b80bbcc8 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
@@ -41,32 +41,32 @@
                    Margin="{StaticResource StandardIndentMargin}"
                    Style="{StaticResource DisclaimerStyle}"
                    Visibility="{x:Bind State.Profile.IsBaseLayer}" />
-        <ScrollViewer ViewChanging="ViewChanging"
-                      Grid.Row="1">
+        <ScrollViewer Grid.Row="1"
+                      ViewChanging="ViewChanging">
             <StackPanel Margin="13,0,0,0">
                 <!--  Control Preview  -->
                 <Border x:Name="ControlPreview"
-                                Width="350"
-                                Height="160"
-                                Margin="0,0,0,12"
-                                HorizontalAlignment="Left"
-                                BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
-                                BorderThickness="1" />
+                        Width="350"
+                        Height="160"
+                        Margin="0,0,0,12"
+                        HorizontalAlignment="Left"
+                        BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
+                        BorderThickness="1" />
 
                 <local:Appearances Appearance="{x:Bind State.Profile.DefaultAppearance, Mode=OneWay}"
-                                           SourceProfile="{x:Bind State.Profile, Mode=OneWay}" />
+                                   SourceProfile="{x:Bind State.Profile, Mode=OneWay}" />
 
                 <!--  Grouping: Transparency  -->
                 <StackPanel Style="{StaticResource PivotStackStyle}">
                     <TextBlock x:Uid="Profile_TransparencyHeader"
-                                       Style="{StaticResource SubtitleTextBlockStyle}" />
+                               Style="{StaticResource SubtitleTextBlockStyle}" />
 
                     <!--  Opacity  -->
                     <local:SettingContainer x:Name="OpacityContainer"
-                                                    x:Uid="Profile_Opacity"
-                                                    ClearSettingValue="{x:Bind State.Profile.ClearOpacity}"
-                                                    HasSettingValue="{x:Bind State.Profile.HasOpacity, Mode=OneWay}"
-                                                    SettingOverrideSource="{x:Bind State.Profile.OpacityOverrideSource, Mode=OneWay}">
+                                            x:Uid="Profile_Opacity"
+                                            ClearSettingValue="{x:Bind State.Profile.ClearOpacity}"
+                                            HasSettingValue="{x:Bind State.Profile.HasOpacity, Mode=OneWay}"
+                                            SettingOverrideSource="{x:Bind State.Profile.OpacityOverrideSource, Mode=OneWay}">
                         <StackPanel x:Name="OpacityControl">
                             <Grid Style="{StaticResource CustomSliderControlGridStyle}">
                                 <Grid.ColumnDefinitions>
@@ -74,22 +74,22 @@
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
                                 <Slider x:Name="OpacitySlider"
-                                                Grid.Column="0"
-                                                Value="{x:Bind local:Converters.PercentageToPercentageValue(State.Profile.Opacity), BindBack=State.Profile.SetAcrylicOpacityPercentageValue, Mode=TwoWay}" />
+                                        Grid.Column="0"
+                                        Value="{x:Bind local:Converters.PercentageToPercentageValue(State.Profile.Opacity), BindBack=State.Profile.SetAcrylicOpacityPercentageValue, Mode=TwoWay}" />
                                 <TextBlock Grid.Column="1"
-                                                   Style="{StaticResource SliderValueLabelStyle}"
-                                                   Text="{x:Bind local:Converters.AppendPercentageSign(OpacitySlider.Value), Mode=OneWay}" />
+                                           Style="{StaticResource SliderValueLabelStyle}"
+                                           Text="{x:Bind local:Converters.AppendPercentageSign(OpacitySlider.Value), Mode=OneWay}" />
                             </Grid>
                         </StackPanel>
                     </local:SettingContainer>
 
                     <!--  Use Acrylic  -->
                     <local:SettingContainer x:Uid="Profile_UseAcrylic"
-                                                    ClearSettingValue="{x:Bind State.Profile.ClearUseAcrylic}"
-                                                    HasSettingValue="{x:Bind State.Profile.HasUseAcrylic, Mode=OneWay}"
-                                                    SettingOverrideSource="{x:Bind State.Profile.UseAcrylicOverrideSource, Mode=OneWay}">
+                                            ClearSettingValue="{x:Bind State.Profile.ClearUseAcrylic}"
+                                            HasSettingValue="{x:Bind State.Profile.HasUseAcrylic, Mode=OneWay}"
+                                            SettingOverrideSource="{x:Bind State.Profile.UseAcrylicOverrideSource, Mode=OneWay}">
                         <ToggleSwitch x:Name="UseAcrylicToggleSwitch"
-                                              IsOn="{x:Bind State.Profile.UseAcrylic, Mode=TwoWay}" />
+                                      IsOn="{x:Bind State.Profile.UseAcrylic, Mode=TwoWay}" />
                     </local:SettingContainer>
 
                 </StackPanel>
@@ -97,107 +97,107 @@
                 <!--  Grouping: Window  -->
                 <StackPanel Style="{StaticResource PivotStackStyle}">
                     <TextBlock x:Uid="Profile_WindowHeader"
-                                       Style="{StaticResource SubtitleTextBlockStyle}" />
+                               Style="{StaticResource SubtitleTextBlockStyle}" />
 
                     <!--  Padding  -->
                     <local:SettingContainer x:Uid="Profile_Padding"
-                                                    ClearSettingValue="{x:Bind State.Profile.ClearPadding}"
-                                                    HasSettingValue="{x:Bind State.Profile.HasPadding, Mode=OneWay}"
-                                                    SettingOverrideSource="{x:Bind State.Profile.PaddingOverrideSource, Mode=OneWay}">
+                                            ClearSettingValue="{x:Bind State.Profile.ClearPadding}"
+                                            HasSettingValue="{x:Bind State.Profile.HasPadding, Mode=OneWay}"
+                                            SettingOverrideSource="{x:Bind State.Profile.PaddingOverrideSource, Mode=OneWay}">
                         <Grid Style="{StaticResource CustomSliderControlGridStyle}">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <Slider x:Name="PaddingSlider"
-                                            Grid.Column="0"
-                                            Value="{x:Bind local:Converters.MaxValueFromPaddingString(State.Profile.Padding), BindBack=State.Profile.SetPadding, Mode=TwoWay}" />
+                                    Grid.Column="0"
+                                    Value="{x:Bind local:Converters.MaxValueFromPaddingString(State.Profile.Padding), BindBack=State.Profile.SetPadding, Mode=TwoWay}" />
                             <TextBlock Grid.Column="1"
-                                               Style="{StaticResource SliderValueLabelStyle}"
-                                               Text="{Binding ElementName=PaddingSlider, Path=Value, Mode=OneWay}" />
+                                       Style="{StaticResource SliderValueLabelStyle}"
+                                       Text="{Binding ElementName=PaddingSlider, Path=Value, Mode=OneWay}" />
                         </Grid>
                     </local:SettingContainer>
 
                     <!--  Scrollbar Visibility  -->
                     <local:SettingContainer x:Uid="Profile_ScrollbarVisibility"
-                                                    ClearSettingValue="{x:Bind State.Profile.ClearScrollState}"
-                                                    HasSettingValue="{x:Bind State.Profile.HasScrollState, Mode=OneWay}"
-                                                    SettingOverrideSource="{x:Bind State.Profile.ScrollStateOverrideSource, Mode=OneWay}"
-                                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                                            ClearSettingValue="{x:Bind State.Profile.ClearScrollState}"
+                                            HasSettingValue="{x:Bind State.Profile.HasScrollState, Mode=OneWay}"
+                                            SettingOverrideSource="{x:Bind State.Profile.ScrollStateOverrideSource, Mode=OneWay}"
+                                            Style="{StaticResource ExpanderSettingContainerStyle}">
                         <muxc:RadioButtons AutomationProperties.AccessibilityView="Content"
-                                                   ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
-                                                   ItemsSource="{x:Bind ScrollStateList, Mode=OneWay}"
-                                                   SelectedItem="{x:Bind CurrentScrollState, Mode=TwoWay}" />
+                                           ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
+                                           ItemsSource="{x:Bind ScrollStateList, Mode=OneWay}"
+                                           SelectedItem="{x:Bind CurrentScrollState, Mode=TwoWay}" />
                     </local:SettingContainer>
                 </StackPanel>
                 <StackPanel>
                     <StackPanel Orientation="Horizontal"
-                                        Visibility="{x:Bind State.Profile.EditableUnfocusedAppearance, Mode=OneWay}">
+                                Visibility="{x:Bind State.Profile.EditableUnfocusedAppearance, Mode=OneWay}">
                         <TextBlock x:Uid="Profile_UnfocusedAppearanceTextBlock"
-                                           Style="{StaticResource TitleTextBlockStyle}" />
+                                   Style="{StaticResource TitleTextBlockStyle}" />
                         <Button x:Uid="Profile_CreateUnfocusedAppearanceButton"
-                                        Margin="32,0,0,0"
-                                        Click="CreateUnfocusedAppearance_Click"
-                                        Style="{StaticResource BaseButtonStyle}"
-                                        Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.HasUnfocusedAppearance), Mode=OneWay}">
+                                Margin="32,0,0,0"
+                                Click="CreateUnfocusedAppearance_Click"
+                                Style="{StaticResource BaseButtonStyle}"
+                                Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.HasUnfocusedAppearance), Mode=OneWay}">
                             <Button.Content>
                                 <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                                  Glyph="&#xE710;" />
+                                          Glyph="&#xE710;" />
                             </Button.Content>
                         </Button>
                         <Button x:Uid="Profile_DeleteUnfocusedAppearanceButton"
-                                        Margin="32,0,0,0"
-                                        Click="DeleteUnfocusedAppearance_Click"
-                                        Style="{StaticResource BaseButtonStyle}"
-                                        Visibility="{x:Bind State.Profile.HasUnfocusedAppearance, Mode=OneWay}">
+                                Margin="32,0,0,0"
+                                Click="DeleteUnfocusedAppearance_Click"
+                                Style="{StaticResource BaseButtonStyle}"
+                                Visibility="{x:Bind State.Profile.HasUnfocusedAppearance, Mode=OneWay}">
                             <Button.Content>
                                 <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                                  Glyph="&#xE74D;" />
+                                          Glyph="&#xE74D;" />
                             </Button.Content>
                             <Button.Resources>
                                 <ResourceDictionary>
                                     <ResourceDictionary.ThemeDictionaries>
                                         <ResourceDictionary x:Key="Light">
                                             <SolidColorBrush x:Key="ButtonBackground"
-                                                                     Color="Firebrick" />
+                                                             Color="Firebrick" />
                                             <SolidColorBrush x:Key="ButtonBackgroundPointerOver"
-                                                                     Color="#C23232" />
+                                                             Color="#C23232" />
                                             <SolidColorBrush x:Key="ButtonBackgroundPressed"
-                                                                     Color="#A21212" />
+                                                             Color="#A21212" />
                                             <SolidColorBrush x:Key="ButtonForeground"
-                                                                     Color="White" />
+                                                             Color="White" />
                                             <SolidColorBrush x:Key="ButtonForegroundPointerOver"
-                                                                     Color="White" />
+                                                             Color="White" />
                                             <SolidColorBrush x:Key="ButtonForegroundPressed"
-                                                                     Color="White" />
+                                                             Color="White" />
                                         </ResourceDictionary>
                                         <ResourceDictionary x:Key="Dark">
                                             <SolidColorBrush x:Key="ButtonBackground"
-                                                                     Color="Firebrick" />
+                                                             Color="Firebrick" />
                                             <SolidColorBrush x:Key="ButtonBackgroundPointerOver"
-                                                                     Color="#C23232" />
+                                                             Color="#C23232" />
                                             <SolidColorBrush x:Key="ButtonBackgroundPressed"
-                                                                     Color="#A21212" />
+                                                             Color="#A21212" />
                                             <SolidColorBrush x:Key="ButtonForeground"
-                                                                     Color="White" />
+                                                             Color="White" />
                                             <SolidColorBrush x:Key="ButtonForegroundPointerOver"
-                                                                     Color="White" />
+                                                             Color="White" />
                                             <SolidColorBrush x:Key="ButtonForegroundPressed"
-                                                                     Color="White" />
+                                                             Color="White" />
                                         </ResourceDictionary>
                                         <ResourceDictionary x:Key="HighContrast">
                                             <SolidColorBrush x:Key="ButtonBackground"
-                                                                     Color="{ThemeResource SystemColorButtonFaceColor}" />
+                                                             Color="{ThemeResource SystemColorButtonFaceColor}" />
                                             <SolidColorBrush x:Key="ButtonBackgroundPointerOver"
-                                                                     Color="{ThemeResource SystemColorHighlightColor}" />
+                                                             Color="{ThemeResource SystemColorHighlightColor}" />
                                             <SolidColorBrush x:Key="ButtonBackgroundPressed"
-                                                                     Color="{ThemeResource SystemColorHighlightColor}" />
+                                                             Color="{ThemeResource SystemColorHighlightColor}" />
                                             <SolidColorBrush x:Key="ButtonForeground"
-                                                                     Color="{ThemeResource SystemColorButtonTextColor}" />
+                                                             Color="{ThemeResource SystemColorButtonTextColor}" />
                                             <SolidColorBrush x:Key="ButtonForegroundPointerOver"
-                                                                     Color="{ThemeResource SystemColorHighlightTextColor}" />
+                                                             Color="{ThemeResource SystemColorHighlightTextColor}" />
                                             <SolidColorBrush x:Key="ButtonForegroundPressed"
-                                                                     Color="{ThemeResource SystemColorHighlightTextColor}" />
+                                                             Color="{ThemeResource SystemColorHighlightTextColor}" />
                                         </ResourceDictionary>
                                     </ResourceDictionary.ThemeDictionaries>
                                 </ResourceDictionary>
@@ -205,8 +205,8 @@
                         </Button>
                     </StackPanel>
                     <local:Appearances Appearance="{x:Bind State.Profile.UnfocusedAppearance, Mode=OneWay}"
-                                               SourceProfile="{x:Bind State.Profile, Mode=OneWay}"
-                                               Visibility="{x:Bind State.Profile.ShowUnfocusedAppearance, Mode=OneWay}" />
+                                       SourceProfile="{x:Bind State.Profile, Mode=OneWay}"
+                                       Visibility="{x:Bind State.Profile.ShowUnfocusedAppearance, Mode=OneWay}" />
                 </StackPanel>
             </StackPanel>
         </ScrollViewer>
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
index 9b62449a127..ecce8321a06 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
@@ -29,7 +29,7 @@
                 <Setter Property="HorizontalAlignment" Value="Stretch" />
                 <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
                 <Setter Property="VerticalAlignment" Value="Stretch" />
-                <Setter Property="HorizontalContentAlignment" Value="Left"/>
+                <Setter Property="HorizontalContentAlignment" Value="Left" />
             </Style>
         </ResourceDictionary>
     </Page.Resources>
@@ -45,171 +45,170 @@
                    Margin="{StaticResource StandardIndentMargin}"
                    Style="{StaticResource DisclaimerStyle}"
                    Visibility="{x:Bind State.Profile.IsBaseLayer}" />
-        <ScrollViewer ViewChanging="ViewChanging"
-                      Grid.Row="1">
-            <StackPanel Style="{StaticResource PivotStackStyle}"
-                        Margin="13,0,0,0">
+        <ScrollViewer Grid.Row="1"
+                      ViewChanging="ViewChanging">
+            <StackPanel Margin="13,0,0,0"
+                        Style="{StaticResource PivotStackStyle}">
 
-                    <!--  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:Uid="Profile_Name"
-                                                CurrentValue="{x:Bind State.Profile.Name, Mode=OneWay}"
-                                                Style="{StaticResource ExpanderSettingContainerStyle}"
-                                                Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
-                        <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                                     Text="{x:Bind State.Profile.Name, Mode=TwoWay}" />
-                    </local:SettingContainer>
-
-                    <!--  Commandline  -->
-                    <local:SettingContainer x:Name="CommandlineContainer"
-                                                x:Uid="Profile_Commandline"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearCommandline}"
-                                                CurrentValue="{x:Bind State.Profile.Commandline, Mode=OneWay}"
-                                                HasSettingValue="{x:Bind State.Profile.HasCommandline, Mode=OneWay}"
-                                                SettingOverrideSource="{x:Bind State.Profile.CommandlineOverrideSource, Mode=OneWay}"
-                                                Style="{StaticResource ExpanderSettingContainerStyle}"
-                                                Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBox x:Uid="Profile_CommandlineBox"
-                                         IsSpellCheckEnabled="False"
-                                         Style="{StaticResource TextBoxSettingStyle}"
-                                         Text="{x:Bind State.Profile.Commandline, Mode=TwoWay}" />
-                            <Button x:Uid="Profile_CommandlineBrowse"
-                                        Click="Commandline_Click"
-                                        Style="{StaticResource BrowseButtonStyle}" />
-                        </StackPanel>
-                    </local:SettingContainer>
+                <!--  Name  -->
+                <!--
+                    NOTE: Has/Clear is not bound because we don't want the reset button & override text to appear.
+                    Additionally, the JSON stubs generated by auto-generated profiles come with a name,
+                    so the name will always be overridden.
+                -->
+                <local:SettingContainer x:Uid="Profile_Name"
+                                        CurrentValue="{x:Bind State.Profile.Name, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}"
+                                        Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
+                    <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind State.Profile.Name, Mode=TwoWay}" />
+                </local:SettingContainer>
 
-                    <!--  Starting Directory  -->
-                    <local:SettingContainer x:Name="StartingDirectoryContainer"
-                                                x:Uid="Profile_StartingDirectory"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearStartingDirectory}"
-                                                CurrentValue="{x:Bind State.Profile.StartingDirectory, Mode=OneWay}"
-                                                HasSettingValue="{x:Bind State.Profile.HasStartingDirectory, Mode=OneWay}"
-                                                SettingOverrideSource="{x:Bind State.Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
-                                                Style="{StaticResource ExpanderSettingContainerStyle}">
-                        <StackPanel Orientation="Vertical">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBox x:Uid="Profile_StartingDirectoryBox"
-                                             IsEnabled="{x:Bind State.Profile.UseCustomStartingDirectory, Mode=OneWay}"
-                                             IsSpellCheckEnabled="False"
-                                             Style="{StaticResource TextBoxSettingStyle}"
-                                             Text="{x:Bind State.Profile.StartingDirectory, Mode=TwoWay}" />
-                                <Button x:Name="StartingDirectoryBrowse"
-                                            x:Uid="Profile_StartingDirectoryBrowse"
-                                            Click="StartingDirectory_Click"
-                                            IsEnabled="{x:Bind State.Profile.UseCustomStartingDirectory, Mode=OneWay}"
-                                            Style="{StaticResource BrowseButtonStyle}" />
-                            </StackPanel>
-                            <CheckBox x:Name="StartingDirectoryUseParentCheckbox"
-                                          x:Uid="Profile_StartingDirectoryUseParentCheckbox"
-                                          IsChecked="{x:Bind State.Profile.UseParentProcessDirectory, Mode=TwoWay}" />
-                        </StackPanel>
-                    </local:SettingContainer>
+                <!--  Commandline  -->
+                <local:SettingContainer x:Name="CommandlineContainer"
+                                        x:Uid="Profile_Commandline"
+                                        ClearSettingValue="{x:Bind State.Profile.ClearCommandline}"
+                                        CurrentValue="{x:Bind State.Profile.Commandline, Mode=OneWay}"
+                                        HasSettingValue="{x:Bind State.Profile.HasCommandline, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind State.Profile.CommandlineOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}"
+                                        Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBox x:Uid="Profile_CommandlineBox"
+                                 IsSpellCheckEnabled="False"
+                                 Style="{StaticResource TextBoxSettingStyle}"
+                                 Text="{x:Bind State.Profile.Commandline, Mode=TwoWay}" />
+                        <Button x:Uid="Profile_CommandlineBrowse"
+                                Click="Commandline_Click"
+                                Style="{StaticResource BrowseButtonStyle}" />
+                    </StackPanel>
+                </local:SettingContainer>
 
-                    <!--  Icon  -->
-                    <local:SettingContainer x:Uid="Profile_Icon"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearIcon}"
-                                                CurrentValue="{x:Bind State.Profile.Icon, Mode=OneWay}"
-                                                HasSettingValue="{x:Bind State.Profile.HasIcon, Mode=OneWay}"
-                                                SettingOverrideSource="{x:Bind State.Profile.IconOverrideSource, Mode=OneWay}"
-                                                Style="{StaticResource ExpanderSettingContainerStyle}">
+                <!--  Starting Directory  -->
+                <local:SettingContainer x:Name="StartingDirectoryContainer"
+                                        x:Uid="Profile_StartingDirectory"
+                                        ClearSettingValue="{x:Bind State.Profile.ClearStartingDirectory}"
+                                        CurrentValue="{x:Bind State.Profile.StartingDirectory, Mode=OneWay}"
+                                        HasSettingValue="{x:Bind State.Profile.HasStartingDirectory, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind State.Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}">
+                    <StackPanel Orientation="Vertical">
                         <StackPanel Orientation="Horizontal">
-                            <TextBox x:Uid="Profile_IconBox"
-                                         FontFamily="Segoe UI, Segoe MDL2 Assets"
-                                         IsSpellCheckEnabled="False"
-                                         Style="{StaticResource TextBoxSettingStyle}"
-                                         Text="{x:Bind State.Profile.Icon, Mode=TwoWay}" />
-                            <Button x:Uid="Profile_IconBrowse"
-                                        Click="Icon_Click"
-                                        Style="{StaticResource BrowseButtonStyle}" />
+                            <TextBox x:Uid="Profile_StartingDirectoryBox"
+                                     IsEnabled="{x:Bind State.Profile.UseCustomStartingDirectory, Mode=OneWay}"
+                                     IsSpellCheckEnabled="False"
+                                     Style="{StaticResource TextBoxSettingStyle}"
+                                     Text="{x:Bind State.Profile.StartingDirectory, Mode=TwoWay}" />
+                            <Button x:Name="StartingDirectoryBrowse"
+                                    x:Uid="Profile_StartingDirectoryBrowse"
+                                    Click="StartingDirectory_Click"
+                                    IsEnabled="{x:Bind State.Profile.UseCustomStartingDirectory, Mode=OneWay}"
+                                    Style="{StaticResource BrowseButtonStyle}" />
                         </StackPanel>
-                    </local:SettingContainer>
+                        <CheckBox x:Name="StartingDirectoryUseParentCheckbox"
+                                  x:Uid="Profile_StartingDirectoryUseParentCheckbox"
+                                  IsChecked="{x:Bind State.Profile.UseParentProcessDirectory, Mode=TwoWay}" />
+                    </StackPanel>
+                </local:SettingContainer>
 
-                    <!--  Tab Title  -->
-                    <local:SettingContainer x:Uid="Profile_TabTitle"
-                                                ClearSettingValue="{x:Bind State.Profile.ClearTabTitle}"
-                                                CurrentValue="{x:Bind State.Profile.TabTitle, Mode=OneWay}"
-                                                HasSettingValue="{x:Bind State.Profile.HasTabTitle, Mode=OneWay}"
-                                                SettingOverrideSource="{x:Bind State.Profile.TabTitleOverrideSource, Mode=OneWay}"
-                                                Style="{StaticResource ExpanderSettingContainerStyle}">
-                        <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                                     Text="{x:Bind State.Profile.TabTitle, Mode=TwoWay}" />
-                    </local:SettingContainer>
+                <!--  Icon  -->
+                <local:SettingContainer x:Uid="Profile_Icon"
+                                        ClearSettingValue="{x:Bind State.Profile.ClearIcon}"
+                                        CurrentValue="{x:Bind State.Profile.Icon, Mode=OneWay}"
+                                        HasSettingValue="{x:Bind State.Profile.HasIcon, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind State.Profile.IconOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBox x:Uid="Profile_IconBox"
+                                 FontFamily="Segoe UI, Segoe MDL2 Assets"
+                                 IsSpellCheckEnabled="False"
+                                 Style="{StaticResource TextBoxSettingStyle}"
+                                 Text="{x:Bind State.Profile.Icon, Mode=TwoWay}" />
+                        <Button x:Uid="Profile_IconBrowse"
+                                Click="Icon_Click"
+                                Style="{StaticResource BrowseButtonStyle}" />
+                    </StackPanel>
+                </local:SettingContainer>
+
+                <!--  Tab Title  -->
+                <local:SettingContainer x:Uid="Profile_TabTitle"
+                                        ClearSettingValue="{x:Bind State.Profile.ClearTabTitle}"
+                                        CurrentValue="{x:Bind State.Profile.TabTitle, Mode=OneWay}"
+                                        HasSettingValue="{x:Bind State.Profile.HasTabTitle, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind State.Profile.TabTitleOverrideSource, Mode=OneWay}"
+                                        Style="{StaticResource ExpanderSettingContainerStyle}">
+                    <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind State.Profile.TabTitle, Mode=TwoWay}" />
+                </local:SettingContainer>
 
-                    <!--  Hidden  -->
+                <!--  Hidden  -->
                 <local:SettingContainer x:Uid="Profile_Hidden"
-                                                Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
+                                        Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
                     <ToggleSwitch IsOn="{x:Bind State.Profile.Hidden, Mode=TwoWay}" />
                 </local:SettingContainer>
 
-                <ToggleButton Style="{StaticResource ProfilesBaseToggleButtonStyle}"
-                              Click="Appearance_Click">
-                    <TextBlock Text="Appearance"
-                           HorizontalAlignment="Left"
-                                   VerticalAlignment="Center"/>
+                <ToggleButton Click="Appearance_Click"
+                              Style="{StaticResource ProfilesBaseToggleButtonStyle}">
+                    <TextBlock HorizontalAlignment="Left"
+                               VerticalAlignment="Center"
+                               Text="Appearance" />
                 </ToggleButton>
-                <ToggleButton
-                          Style="{StaticResource ProfilesBaseToggleButtonStyle}"
-                          Click="Advanced_Click">
+                <ToggleButton Click="Advanced_Click"
+                              Style="{StaticResource ProfilesBaseToggleButtonStyle}">
                     <ContentPresenter HorizontalAlignment="Left">
-                        <TextBlock Text="Advanced"
-                               HorizontalAlignment="Left"/>
+                        <TextBlock HorizontalAlignment="Left"
+                                   Text="Advanced" />
                     </ContentPresenter>
                 </ToggleButton>
                 <!--  Delete Button  -->
                 <Button x:Name="DeleteButton"
-                                Margin="{StaticResource StandardControlMargin}"
-                                Style="{StaticResource DeleteButtonStyle}"
-                                Visibility="{x:Bind State.Profile.CanDeleteProfile}">
+                        Margin="{StaticResource StandardControlMargin}"
+                        Style="{StaticResource DeleteButtonStyle}"
+                        Visibility="{x:Bind State.Profile.CanDeleteProfile}">
                     <Button.Resources>
                         <ResourceDictionary>
                             <ResourceDictionary.ThemeDictionaries>
                                 <ResourceDictionary x:Key="Light">
                                     <SolidColorBrush x:Key="ButtonBackground"
-                                                             Color="Firebrick" />
+                                                     Color="Firebrick" />
                                     <SolidColorBrush x:Key="ButtonBackgroundPointerOver"
-                                                             Color="#C23232" />
+                                                     Color="#C23232" />
                                     <SolidColorBrush x:Key="ButtonBackgroundPressed"
-                                                             Color="#A21212" />
+                                                     Color="#A21212" />
                                     <SolidColorBrush x:Key="ButtonForeground"
-                                                             Color="White" />
+                                                     Color="White" />
                                     <SolidColorBrush x:Key="ButtonForegroundPointerOver"
-                                                             Color="White" />
+                                                     Color="White" />
                                     <SolidColorBrush x:Key="ButtonForegroundPressed"
-                                                             Color="White" />
+                                                     Color="White" />
                                 </ResourceDictionary>
                                 <ResourceDictionary x:Key="Dark">
                                     <SolidColorBrush x:Key="ButtonBackground"
-                                                             Color="Firebrick" />
+                                                     Color="Firebrick" />
                                     <SolidColorBrush x:Key="ButtonBackgroundPointerOver"
-                                                             Color="#C23232" />
+                                                     Color="#C23232" />
                                     <SolidColorBrush x:Key="ButtonBackgroundPressed"
-                                                             Color="#A21212" />
+                                                     Color="#A21212" />
                                     <SolidColorBrush x:Key="ButtonForeground"
-                                                             Color="White" />
+                                                     Color="White" />
                                     <SolidColorBrush x:Key="ButtonForegroundPointerOver"
-                                                             Color="White" />
+                                                     Color="White" />
                                     <SolidColorBrush x:Key="ButtonForegroundPressed"
-                                                             Color="White" />
+                                                     Color="White" />
                                 </ResourceDictionary>
                                 <ResourceDictionary x:Key="HighContrast">
                                     <SolidColorBrush x:Key="ButtonBackground"
-                                                             Color="{ThemeResource SystemColorButtonFaceColor}" />
+                                                     Color="{ThemeResource SystemColorButtonFaceColor}" />
                                     <SolidColorBrush x:Key="ButtonBackgroundPointerOver"
-                                                             Color="{ThemeResource SystemColorHighlightColor}" />
+                                                     Color="{ThemeResource SystemColorHighlightColor}" />
                                     <SolidColorBrush x:Key="ButtonBackgroundPressed"
-                                                             Color="{ThemeResource SystemColorHighlightColor}" />
+                                                     Color="{ThemeResource SystemColorHighlightColor}" />
                                     <SolidColorBrush x:Key="ButtonForeground"
-                                                             Color="{ThemeResource SystemColorButtonTextColor}" />
+                                                     Color="{ThemeResource SystemColorButtonTextColor}" />
                                     <SolidColorBrush x:Key="ButtonForegroundPointerOver"
-                                                             Color="{ThemeResource SystemColorHighlightTextColor}" />
+                                                     Color="{ThemeResource SystemColorHighlightTextColor}" />
                                     <SolidColorBrush x:Key="ButtonForegroundPressed"
-                                                             Color="{ThemeResource SystemColorHighlightTextColor}" />
+                                                     Color="{ThemeResource SystemColorHighlightTextColor}" />
                                 </ResourceDictionary>
                             </ResourceDictionary.ThemeDictionaries>
                         </ResourceDictionary>
@@ -217,18 +216,18 @@
                     <Button.Content>
                         <StackPanel Orientation="Horizontal">
                             <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE74D;" />
+                                      Glyph="&#xE74D;" />
                             <TextBlock x:Uid="Profile_DeleteButton"
-                                               Margin="10,0,0,0" />
+                                       Margin="10,0,0,0" />
                         </StackPanel>
                     </Button.Content>
                     <Button.Flyout>
                         <Flyout>
                             <StackPanel>
                                 <TextBlock x:Uid="Profile_DeleteConfirmationMessage"
-                                                   Style="{StaticResource CustomFlyoutTextStyle}" />
+                                           Style="{StaticResource CustomFlyoutTextStyle}" />
                                 <Button x:Uid="Profile_DeleteConfirmationButton"
-                                                Click="DeleteConfirmation_Click" />
+                                        Click="DeleteConfirmation_Click" />
                             </StackPanel>
                         </Flyout>
                     </Button.Flyout>
diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
index f54c80efc48..6a062b1a966 100644
--- a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
+++ b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
@@ -19,8 +19,10 @@
             <SolidColorBrush x:Key="SubgroupHeaderBrush"
                              Color="{StaticResource SystemBaseMediumColor}" />
             <Color x:Key="CardStrokeColorDefault">#0F000000</Color>
-            <SolidColorBrush x:Key="CardStrokeColorDefaultBrush" Color="{StaticResource CardStrokeColorDefault}" />
-            <StaticResource x:Key="ExpanderHeaderBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+            <SolidColorBrush x:Key="CardStrokeColorDefaultBrush"
+                             Color="{StaticResource CardStrokeColorDefault}" />
+            <StaticResource x:Key="ExpanderHeaderBorderBrush"
+                            ResourceKey="CardStrokeColorDefaultBrush" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
             <Style x:Key="SecondaryTextBlockStyle"
@@ -28,7 +30,8 @@
             <!--  Do not mess with the foreground color for High Contrast. Let it ride as is.  -->
             <SolidColorBrush x:Key="SubgroupHeaderBrush"
                              Color="{ThemeResource SystemColorWindowTextColor}" />
-            <StaticResource x:Key="ExpanderHeaderBorderBrush" ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="ExpanderHeaderBorderBrush"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
             <Style x:Key="SecondaryTextBlockStyle"
@@ -38,8 +41,10 @@
             <SolidColorBrush x:Key="SubgroupHeaderBrush"
                              Color="{StaticResource SystemBaseMediumColor}" />
             <Color x:Key="CardStrokeColorDefault">#19000000</Color>
-            <SolidColorBrush x:Key="CardStrokeColorDefaultBrush" Color="{StaticResource CardStrokeColorDefault}" />
-            <StaticResource x:Key="ExpanderHeaderBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+            <SolidColorBrush x:Key="CardStrokeColorDefaultBrush"
+                             Color="{StaticResource CardStrokeColorDefault}" />
+            <StaticResource x:Key="ExpanderHeaderBorderBrush"
+                            ResourceKey="CardStrokeColorDefaultBrush" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>