diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml b/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
index 633dd20875f..0bee1fd2b41 100644
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
@@ -37,8 +37,8 @@
             </Button>
         </Border>
         <StackPanel Margin="{StaticResource StandardControlMargin}">
-            <local:SettingContainer x:Name="DuplicateProfile"
-                                    x:Uid="AddProfile_Duplicate">
+            <local:SettingsCard x:Name="DuplicateProfile"
+                                x:Uid="AddProfile_Duplicate">
                 <ComboBox x:Name="Profiles"
                           AutomationProperties.AccessibilityView="Content"
                           ItemsSource="{x:Bind State.Settings.AllProfiles, Mode=OneWay}"
@@ -69,7 +69,7 @@
                         </DataTemplate>
                     </ComboBox.ItemTemplate>
                 </ComboBox>
-            </local:SettingContainer>
+            </local:SettingsCard>
             <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
                 <Button x:Name="DuplicateButton"
                         Margin="{StaticResource StandardControlMargin}"
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.cpp b/src/cascadia/TerminalSettingsEditor/Appearances.cpp
index ec66af8cd02..5c30ef4b421 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.cpp
@@ -223,7 +223,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 // into the path TextBox, we properly update the checkbox and stored
                 // _lastBgImagePath. Without this, then we'll permanently hide the text
                 // box, prevent it from ever being changed again.
-                _NotifyChanges(L"UseDesktopBGImage", L"BackgroundImageSettingsVisible", L"CurrentBackgroundImagePath");
+                _NotifyChanges(L"UseDesktopBGImage", L"BackgroundImageSettingsEnabled", L"CurrentBackgroundImagePath");
             }
             else if (viewModelProperty == L"BackgroundImageAlignment")
             {
@@ -1002,7 +1002,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
-    bool AppearanceViewModel::BackgroundImageSettingsVisible() const
+    bool AppearanceViewModel::BackgroundImageSettingsEnabled() const
     {
         return !BackgroundImagePath().Path().empty();
     }
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.h b/src/cascadia/TerminalSettingsEditor/Appearances.h
index e0e8248db90..b994eeb5f97 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.h
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.h
@@ -22,7 +22,6 @@ Author(s):
 #include "AppearanceViewModel.g.h"
 #include "Utils.h"
 #include "ViewModelHelpers.h"
-#include "SettingContainer.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
@@ -123,7 +122,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         hstring CurrentBackgroundImagePath() const;
         bool UseDesktopBGImage() const;
         void UseDesktopBGImage(const bool useDesktop);
-        bool BackgroundImageSettingsVisible() const;
+        bool BackgroundImageSettingsEnabled() const;
         void SetBackgroundImageOpacityFromPercentageValue(double percentageValue);
         void SetBackgroundImagePath(winrt::hstring path);
         hstring BackgroundImageAlignmentCurrentValue() const;
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.idl b/src/cascadia/TerminalSettingsEditor/Appearances.idl
index cf2d0ed1223..a691f2ae77f 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.idl
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.idl
@@ -41,7 +41,7 @@ namespace Microsoft.Terminal.Settings.Editor
 
         String CurrentBackgroundImagePath { get; };
         Boolean UseDesktopBGImage;
-        Boolean BackgroundImageSettingsVisible { get; };
+        Boolean BackgroundImageSettingsEnabled { get; };
         String BackgroundImageAlignmentCurrentValue { get; };
 
         void ClearColorScheme();
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
index 931727c0e48..078d6060406 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -68,21 +68,18 @@
     </UserControl.Resources>
 
     <StackPanel>
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <!--  Grouping: Text  -->
-            <TextBlock x:Uid="Profile_TextHeader"
-                       Margin="0,0,0,4"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+        <!--  Grouping: Text  -->
+        <TextBlock x:Uid="Profile_TextHeader"
+                   Margin="0,0,0,4"
+                   Style="{StaticResource TextBlockSubHeaderStyle}" />
+        <StackPanel Spacing="2"
+                    Style="{StaticResource PivotStackStyle}">
             <!--  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"
+            <local:SettingsExpander 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>
+                                    AutomationProperties.Name="{x:Bind Appearance.CurrentColorScheme.Name, Mode=OneWay}">
+                <local:SettingsExpander.Content>
                     <ComboBox Padding="4"
                               ItemsSource="{x:Bind Appearance.SchemesList, Mode=OneWay}"
                               SelectedItem="{x:Bind Appearance.CurrentColorScheme, Mode=TwoWay}"
@@ -207,67 +204,72 @@
                             </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>
+                </local:SettingsExpander.Content>
+                <local:SettingsExpander.ItemsHeader>
+                    <ContentPresenter Padding="16,12,16,16">
+                        <StackPanel>
+
+                            <!--  Foreground Color  -->
+                            <local:SettingsExpander x:Name="Foreground"
+                                                    x:Uid="Profile_Foreground"
+                                                    AutomationProperties.Name="{x:Bind Appearance.ForegroundPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}">
+                                <local:SettingsExpander.Content>
+                                    <ContentControl Content="{x:Bind Appearance.ForegroundPreview, Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorPreviewTemplate}" />
+                                </local:SettingsExpander.Content>
+                                <local:SettingsExpander.ItemsHeader>
+                                    <ContentPresenter Padding="16,12,16,16">
+                                        <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}" />
+                                    </ContentPresenter>
+                                </local:SettingsExpander.ItemsHeader>
+                            </local:SettingsExpander>
+
+                            <!--  Background Color  -->
+                            <local:SettingsExpander x:Name="Background"
+                                                    x:Uid="Profile_Background"
+                                                    AutomationProperties.Name="{x:Bind Appearance.BackgroundPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}">
+                                <local:SettingsExpander.Content>
+                                    <ContentControl Content="{x:Bind Appearance.BackgroundPreview, Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorPreviewTemplate}" />
+                                </local:SettingsExpander.Content>
+                                <local:SettingsExpander.ItemsHeader>
+                                    <ContentPresenter Padding="16,12,16,16">
+                                        <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}" />
+                                    </ContentPresenter>
+                                </local:SettingsExpander.ItemsHeader>
+                            </local:SettingsExpander>
+
+                            <!--  Selection Background Color  -->
+                            <local:SettingsExpander x:Name="SelectionBackground"
+                                                    x:Uid="Profile_SelectionBackground"
+                                                    AutomationProperties.Name="{x:Bind Appearance.SelectionBackgroundPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}">
+                                <local:SettingsExpander.Content>
+                                    <ContentControl Content="{x:Bind Appearance.SelectionBackgroundPreview, Mode=OneWay}"
+                                                    ContentTemplate="{StaticResource ColorPreviewTemplate}" />
+                                </local:SettingsExpander.Content>
+                                <local:SettingsExpander.ItemsHeader>
+                                    <ContentPresenter Padding="16,12,16,16">
+                                        <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}" />
+                                    </ContentPresenter>
+                                </local:SettingsExpander.ItemsHeader>
+                            </local:SettingsExpander>
+                        </StackPanel>
+                    </ContentPresenter>
+                </local:SettingsExpander.ItemsHeader>
+            </local:SettingsExpander>
             <!--  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}">
+            <local:SettingsCard x:Name="FontFaceContainer"
+                                x:Uid="Profile_FontFace"
+                                Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
 
                 <StackPanel Margin="0,8,0,0">
                     <AutoSuggestBox x:Uid="Profile_FontFaceBox"
@@ -284,25 +286,36 @@
                               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}" />
+            </local:SettingsCard>
+            <local:SettingsCard x:Name="MissingFontFaces"
+                                x:Uid="Profile_MissingFontFaces"
+                                Background="{ThemeResource SettingContainerErrorSeverityBackgroundBrush}"
+                                Description="{x:Bind Appearance.MissingFontFaces, Mode=OneWay}"
+                                Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.MissingFontFaces), Mode=OneWay}">
+                <local:SettingsCard.HeaderIcon>
+                    <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                              FontSize="{StaticResource SettingContainerIconFontSize}"
+                              Foreground="{ThemeResource SettingContainerErrorSeverityIconBackground}"
+                              Glyph="{StaticResource SettingContainerErrorIconGlyph}" />
+                </local:SettingsCard.HeaderIcon>
+            </local:SettingsCard>
+            <local:SettingsCard x:Name="ProportionalFontFaces"
+                                x:Uid="Profile_ProportionalFontFaces"
+                                Background="{ThemeResource SettingContainerWarningSeverityBackgroundBrush}"
+                                Description="{x:Bind Appearance.ProportionalFontFaces, Mode=OneWay}"
+                                Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.ProportionalFontFaces), Mode=OneWay}">
+                <local:SettingsCard.HeaderIcon>
+                    <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                              FontSize="{StaticResource SettingContainerIconFontSize}"
+                              Foreground="{ThemeResource SettingContainerWarningSeverityIconBackground}"
+                              Glyph="{StaticResource SettingContainerWarningIconGlyph}" />
+                </local:SettingsCard.HeaderIcon>
+            </local:SettingsCard>
 
             <!--  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}">
+            <local:SettingsCard x:Name="FontSize"
+                                x:Uid="Profile_FontSize"
+                                Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
                 <muxc:NumberBox x:Name="_fontSizeBox"
                                 x:Uid="Profile_FontSizeBox"
                                 LargeChange="10"
@@ -311,15 +324,12 @@
                                 SmallChange="1"
                                 Style="{StaticResource NumberBoxSettingStyle}"
                                 Value="{x:Bind Appearance.FontSize, Mode=TwoWay}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  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}">
+            <local:SettingsCard x:Name="LineHeight"
+                                x:Uid="Profile_LineHeight"
+                                Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
                 <muxc:NumberBox x:Name="_lineHeightBox"
                                 x:Uid="Profile_LineHeightBox"
                                 LargeChange="0.1"
@@ -328,15 +338,12 @@
                                 SmallChange="0.1"
                                 Style="{StaticResource NumberBoxSettingStyle}"
                                 Value="{x:Bind Appearance.LineHeight, Mode=TwoWay}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  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}">
+            <local:SettingsCard x:Name="CellWidth"
+                                x:Uid="Profile_CellWidth"
+                                Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
                 <muxc:NumberBox x:Name="_cellWidthBox"
                                 x:Uid="Profile_CellWidthBox"
                                 LargeChange="0.1"
@@ -345,15 +352,12 @@
                                 SmallChange="0.1"
                                 Style="{StaticResource NumberBoxSettingStyle}"
                                 Value="{x:Bind Appearance.CellWidth, Mode=TwoWay}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  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}">
+            <local:SettingsCard x:Name="FontWeight"
+                                x:Uid="Profile_FontWeight"
+                                Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
                 <StackPanel>
                     <ComboBox x:Name="FontWeightComboBox"
                               x:Uid="Profile_FontWeightComboBox"
@@ -384,133 +388,115 @@
                                    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>
+            </local:SettingsCard>
+            <local:SettingsExpander x:Name="FontAxes"
+                                    x:Uid="Profile_FontAxes">
+                <local:SettingsExpander.ItemsHeader>
+                    <ContentPresenter Padding="16,12,16,16">
+                        <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>
+                    </ContentPresenter>
+                </local:SettingsExpander.ItemsHeader>
+            </local:SettingsExpander>
+            <local:SettingsExpander x:Name="FontFeatures"
+                                    x:Uid="Profile_FontFeatures">
+                <local:SettingsExpander.ItemsHeader>
+                    <ContentPresenter Padding="16,12,16,16">
+                        <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>
+                    </ContentPresenter>
+                </local:SettingsExpander.ItemsHeader>
+            </local:SettingsExpander>
 
             <!--  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}">
+            <local:SettingsCard x:Name="EnableBuiltinGlyphs"
+                                x:Uid="Profile_EnableBuiltinGlyphs">
                 <ToggleSwitch IsOn="{x:Bind Appearance.EnableBuiltinGlyphs, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  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}">
+            <local:SettingsCard x:Name="EnableColorGlyphs"
+                                x:Uid="Profile_EnableColorGlyphs">
                 <ToggleSwitch IsOn="{x:Bind Appearance.EnableColorGlyphs, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  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}">
+            <local:SettingsCard x:Name="RetroTerminalEffect"
+                                x:Uid="Profile_RetroTerminalEffect">
                 <ToggleSwitch IsOn="{x:Bind Appearance.RetroTerminalEffect, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  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}">
+            <local:SettingsCard x:Name="AdjustIndistinguishableColors"
+                                x:Uid="Profile_AdjustIndistinguishableColors">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind AdjustIndistinguishableColorsList, Mode=OneWay}"
                           SelectedItem="{x:Bind CurrentAdjustIndistinguishableColors, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
         </StackPanel>
 
         <!--  Grouping: Cursor  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Profile_CursorHeader"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-
+        <TextBlock x:Uid="Profile_CursorHeader"
+                   Style="{StaticResource TextBlockSubHeaderStyle}" />
+        <StackPanel Spacing="2"
+                    Style="{StaticResource PivotStackStyle}">
             <!--  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}">
+            <local:SettingsCard x:Name="CursorShape"
+                                x:Uid="Profile_CursorShape">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind CursorShapeList, Mode=OneWay}"
                           SelectedItem="{x:Bind CurrentCursorShape, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  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}">
+            <local:SettingsCard x:Name="CursorHeight"
+                                x:Uid="Profile_CursorHeight"
+                                Visibility="{x:Bind IsVintageCursor, Mode=OneWay}">
                 <Grid Style="{StaticResource CustomSliderControlGridStyle}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />
@@ -525,300 +511,286 @@
                                Style="{StaticResource SliderValueLabelStyle}"
                                Text="{Binding ElementName=CursorHeightSlider, Path=Value, Mode=OneWay}" />
                 </Grid>
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Cursor Color  -->
-            <local:SettingContainer x:Name="CursorColor"
+            <local:SettingsExpander 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>
+                                    AutomationProperties.Name="{x:Bind Appearance.CursorColorPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}">
+                <local:SettingsExpander.Content>
+                    <ContentControl Content="{x:Bind Appearance.CursorColorPreview, Mode=OneWay}"
+                                    ContentTemplate="{StaticResource ColorPreviewTemplate}" />
+                </local:SettingsExpander.Content>
+                <local:SettingsExpander.ItemsHeader>
+                    <ContentPresenter Padding="16,12,16,16">
+                        <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}" />
+                    </ContentPresenter>
+                </local:SettingsExpander.ItemsHeader>
+            </local:SettingsExpander>
         </StackPanel>
 
         <!--  Grouping: Background  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Profile_BackgroundHeader"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-
+        <TextBlock x:Uid="Profile_BackgroundHeader"
+                   Style="{StaticResource TextBlockSubHeaderStyle}" />
+        <StackPanel Spacing="2"
+                    Style="{StaticResource PivotStackStyle}">
             <!--  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}" />
+            <local:SettingsExpander x:Name="BackgroundImageContainer"
+                                    x:Uid="Profile_BackgroundImage">
+                <local:SettingsExpander.Content>
+                    <StackPanel Orientation="Vertical">
+                        <StackPanel Orientation="Horizontal"
+                                    Spacing="8">
+                            <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}" />
+                            <Button x:Uid="Profile_BackgroundImageBrowse"
+                                    Click="BackgroundImage_Click"
+                                    IsEnabled="{x:Bind mtu:Converters.InvertBoolean(Appearance.UseDesktopBGImage), Mode=OneWay}"
+                                    Style="{StaticResource BrowseButtonStyle}" />
+                        </StackPanel>
                         <CheckBox x:Name="UseDesktopImageCheckBox"
                                   x:Uid="Profile_UseDesktopImage"
-                                  Margin="0,5,0,0"
+                                  Margin="0,4,0,0"
                                   IsChecked="{x:Bind Appearance.UseDesktopBGImage, Mode=TwoWay}" />
                     </StackPanel>
-                </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 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>
-
-                    <!--  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>
-
-                    <!--  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>
+                </local:SettingsExpander.Content>
+                <local:SettingsExpander.Items>
+                    <!--  Background Image Stretch Mode  -->
+                    <local:SettingsCard x:Name="BackgroundImageStretchMode"
+                                        x:Uid="Profile_BackgroundImageStretchMode"
+                                        IsEnabled="{x:Bind Appearance.BackgroundImageSettingsEnabled, 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:SettingsCard>
+
+                    <!--  Background Image Alignment  -->
+                    <local:SettingsCard x:Name="BackgroundImageAlignment"
+                                        x:Uid="Profile_BackgroundImageAlignment"
+                                        IsEnabled="{x:Bind Appearance.BackgroundImageSettingsEnabled, 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>
+
+                            <!--  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>
+
+                            <!--  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:SettingsCard>
+
+                    <!--  Background Image Opacity  -->
+                    <local:SettingsCard x:Name="BackgroundImageOpacity"
+                                        x:Uid="Profile_BackgroundImageOpacity"
+                                        IsEnabled="{x:Bind Appearance.BackgroundImageSettingsEnabled, 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:SettingsCard>
+                </local:SettingsExpander.Items>
+            </local:SettingsExpander>
         </StackPanel>
 
         <!--  Grouping: Text Formatting  -->
-        <StackPanel Style="{StaticResource PivotStackStyle}">
-            <TextBlock x:Uid="Appearance_TextFormattingHeader"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-
+        <TextBlock x:Uid="Appearance_TextFormattingHeader"
+                   Style="{StaticResource TextBlockSubHeaderStyle}" />
+        <StackPanel Spacing="2"
+                    Style="{StaticResource PivotStackStyle}">
             <!--  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}">
+            <local:SettingsCard x:Name="IntenseTextStyle"
+                                x:Uid="Appearance_IntenseTextStyle">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind IntenseTextStyleList, Mode=OneWay}"
                           SelectedItem="{x:Bind CurrentIntenseTextStyle, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
         </StackPanel>
 
     </StackPanel>
diff --git a/src/cascadia/TerminalSettingsEditor/CommonResources.xaml b/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
index b18ebd40155..2b290a31679 100644
--- a/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
+++ b/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
@@ -8,8 +8,9 @@
                     xmlns:mtu="using:Microsoft.Terminal.UI"
                     xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
 
-    <!--  Merge SettingContainerStyle here to give every page access to the SettingContainer  -->
+    <!--  Merge SettingsControls and SettingContainer styles here to give every page access to them  -->
     <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="SettingsControlsStyle.xaml" />
         <ResourceDictionary Source="SettingContainerStyle.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
@@ -139,7 +140,11 @@
         <Setter Property="MinWidth" Value="{StaticResource StandardBoxMinWidth}" />
         <Setter Property="MaxWidth" Value="400" />
         <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="TextWrapping" Value="NoWrap" />
+        <!--  Value is set below to appease the compiler. The localized resource is used instead.  -->
+        <Setter x:Uid="TextBoxSettingStyle_PlaceholderText"
+                Property="PlaceholderText"
+                Value="None" />
     </Style>
 
     <!--  Text Block  -->
@@ -209,7 +214,6 @@
     <Style x:Key="BrowseButtonStyle"
            BasedOn="{StaticResource BaseButtonStyle}"
            TargetType="Button">
-        <Setter Property="Margin" Value="8,0,0,0" />
         <Setter Property="MinHeight" Value="32" />
     </Style>
 
@@ -1200,87 +1204,6 @@
         </Setter>
     </Style>
 
-    <Style x:Key="NavigatorButtonStyle"
-           TargetType="Button">
-        <Setter Property="Background" Value="{ThemeResource ExpanderHeaderBackground}" />
-        <Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
-        <Setter Property="MinHeight" Value="64" />
-        <Setter Property="BorderThickness" Value="{ThemeResource ExpanderHeaderBorderThickness}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
-        <Setter Property="Padding" Value="16,0,8,0" />
-        <Setter Property="Margin" Value="0,4,0,0" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Grid x:Name="Grid"
-                          Padding="{TemplateBinding Padding}"
-                          AutomationProperties.AccessibilityView="Raw"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <ContentPresenter x:Name="ContentPresenter"
-                                          Grid.Column="0"
-                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          Content="{TemplateBinding Content}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          ContentTransitions="{TemplateBinding ContentTransitions}" />
-                        <FontIcon Grid.Column="1"
-                                  Margin="20,0,8,0"
-                                  HorizontalAlignment="Right"
-                                  FontSize="10"
-                                  FontWeight="Black"
-                                  Glyph="&#xE76C;" />
-
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="PointerOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid"
-                                                                       Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource ToggleButtonBackgroundPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid"
-                                                                       Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource ToggleButtonBorderBrushPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid"
-                                                                       Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource ToggleButtonBackgroundPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid"
-                                                                       Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource ToggleButtonBorderBrushPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
     <Style x:Key="NewInfoBadge"
            TargetType="muxc:InfoBadge">
         <Setter Property="Padding" Value="5,1,5,2" />
diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
index 2180322638c..c05f1324021 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
@@ -24,45 +24,46 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <StackPanel Style="{StaticResource SettingsStackStyle}">
+    <StackPanel Spacing="2"
+                Style="{StaticResource SettingsStackStyle}">
         <!--  Allow Headless  -->
-        <local:SettingContainer x:Name="AllowHeadless"
-                                x:Uid="Globals_AllowHeadless">
+        <local:SettingsCard x:Name="AllowHeadless"
+                            x:Uid="Globals_AllowHeadless">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AllowHeadless, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Text Measurement  -->
-        <local:SettingContainer x:Name="TextMeasurement"
-                                x:Uid="Globals_TextMeasurement">
+        <local:SettingsCard 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>
+        </local:SettingsCard>
 
         <!--  Ambiguous Width  -->
-        <local:SettingContainer x:Name="AmbiguousWidth"
-                                x:Uid="Globals_AmbiguousWidth">
+        <local:SettingsCard 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>
+        </local:SettingsCard>
 
         <!--  Debug Features  -->
-        <local:SettingContainer x:Name="DebugFeaturesEnabled"
-                                x:Uid="Globals_DebugFeaturesEnabled"
-                                Visibility="{x:Bind ViewModel.DebugFeaturesAvailable}">
+        <local:SettingsCard 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>
+        </local:SettingsCard>
 
         <!--  Reset Application State  -->
-        <local:SettingContainer x:Name="ResetApplicationState"
-                                x:Uid="Settings_ResetApplicationState">
+        <local:SettingsCard x:Name="ResetApplicationState"
+                            x:Uid="Settings_ResetApplicationState">
             <Button x:Uid="Settings_ResetApplicationStateButton"
                     Style="{StaticResource DeleteButtonStyle}">
                 <Button.Flyout>
@@ -80,11 +81,11 @@
                     </Flyout>
                 </Button.Flyout>
             </Button>
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Reset to Default Settings  -->
-        <local:SettingContainer x:Name="ResetToDefaultSettings"
-                                x:Uid="Settings_ResetToDefaultSettings">
+        <local:SettingsCard x:Name="ResetToDefaultSettings"
+                            x:Uid="Settings_ResetToDefaultSettings">
             <Button x:Uid="Settings_ResetToDefaultSettingsButton"
                     Style="{StaticResource DeleteButtonStyle}">
                 <Button.Flyout>
@@ -101,7 +102,7 @@
                     </Flyout>
                 </Button.Flyout>
             </Button>
-        </local:SettingContainer>
+        </local:SettingsCard>
 
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/ControlSizeTrigger.cpp b/src/cascadia/TerminalSettingsEditor/ControlSizeTrigger.cpp
new file mode 100644
index 00000000000..52ba58d0c58
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/ControlSizeTrigger.cpp
@@ -0,0 +1,139 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "ControlSizeTrigger.h"
+#include "ControlSizeTrigger.g.cpp"
+
+#include <limits>
+
+using namespace winrt::Windows::Foundation;
+using namespace winrt::Windows::UI::Xaml;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    DependencyProperty ControlSizeTrigger::_CanTriggerProperty{ nullptr };
+    DependencyProperty ControlSizeTrigger::_MinWidthProperty{ nullptr };
+    DependencyProperty ControlSizeTrigger::_MaxWidthProperty{ nullptr };
+    DependencyProperty ControlSizeTrigger::_MinHeightProperty{ nullptr };
+    DependencyProperty ControlSizeTrigger::_MaxHeightProperty{ nullptr };
+    DependencyProperty ControlSizeTrigger::_TargetElementProperty{ nullptr };
+
+    ControlSizeTrigger::ControlSizeTrigger()
+    {
+        _InitializeProperties();
+    }
+
+    void ControlSizeTrigger::_InitializeProperties()
+    {
+        // Defaults mirror the toolkit: trigger is always evaluatable, bounds
+        // are wide open, no target element until one is bound.
+        if (!_CanTriggerProperty)
+        {
+            _CanTriggerProperty = DependencyProperty::Register(
+                L"CanTrigger",
+                xaml_typename<bool>(),
+                xaml_typename<Editor::ControlSizeTrigger>(),
+                PropertyMetadata{ box_value(true), PropertyChangedCallback{ &ControlSizeTrigger::_OnTriggerInputChanged } });
+        }
+        if (!_MinWidthProperty)
+        {
+            _MinWidthProperty = DependencyProperty::Register(
+                L"MinWidth",
+                xaml_typename<double>(),
+                xaml_typename<Editor::ControlSizeTrigger>(),
+                PropertyMetadata{ box_value(0.0), PropertyChangedCallback{ &ControlSizeTrigger::_OnTriggerInputChanged } });
+        }
+        if (!_MaxWidthProperty)
+        {
+            _MaxWidthProperty = DependencyProperty::Register(
+                L"MaxWidth",
+                xaml_typename<double>(),
+                xaml_typename<Editor::ControlSizeTrigger>(),
+                PropertyMetadata{ box_value(std::numeric_limits<double>::infinity()), PropertyChangedCallback{ &ControlSizeTrigger::_OnTriggerInputChanged } });
+        }
+        if (!_MinHeightProperty)
+        {
+            _MinHeightProperty = DependencyProperty::Register(
+                L"MinHeight",
+                xaml_typename<double>(),
+                xaml_typename<Editor::ControlSizeTrigger>(),
+                PropertyMetadata{ box_value(0.0), PropertyChangedCallback{ &ControlSizeTrigger::_OnTriggerInputChanged } });
+        }
+        if (!_MaxHeightProperty)
+        {
+            _MaxHeightProperty = DependencyProperty::Register(
+                L"MaxHeight",
+                xaml_typename<double>(),
+                xaml_typename<Editor::ControlSizeTrigger>(),
+                PropertyMetadata{ box_value(std::numeric_limits<double>::infinity()), PropertyChangedCallback{ &ControlSizeTrigger::_OnTriggerInputChanged } });
+        }
+        if (!_TargetElementProperty)
+        {
+            _TargetElementProperty = DependencyProperty::Register(
+                L"TargetElement",
+                xaml_typename<FrameworkElement>(),
+                xaml_typename<Editor::ControlSizeTrigger>(),
+                PropertyMetadata{ nullptr, PropertyChangedCallback{ &ControlSizeTrigger::_OnTargetElementChanged } });
+        }
+    }
+
+    void ControlSizeTrigger::_OnTriggerInputChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)
+    {
+        if (const auto obj{ d.try_as<Editor::ControlSizeTrigger>() })
+        {
+            get_self<ControlSizeTrigger>(obj)->_UpdateTrigger();
+        }
+    }
+
+    void ControlSizeTrigger::_OnTargetElementChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& e)
+    {
+        const auto obj{ d.try_as<Editor::ControlSizeTrigger>() };
+        if (!obj)
+        {
+            return;
+        }
+        const auto oldElement = e.OldValue().try_as<FrameworkElement>();
+        const auto newElement = e.NewValue().try_as<FrameworkElement>();
+        get_self<ControlSizeTrigger>(obj)->_UpdateTargetElement(oldElement, newElement);
+    }
+
+    void ControlSizeTrigger::_UpdateTargetElement(const FrameworkElement& /*oldValue*/, const FrameworkElement& newValue)
+    {
+        // Revoking handles both unhooking the previous element and a null `newValue`.
+        _sizeChangedRevoker.revoke();
+        if (newValue)
+        {
+            _sizeChangedRevoker = newValue.SizeChanged(winrt::auto_revoke, [weakThis = get_weak()](auto&&, auto&&) {
+                if (const auto strongThis = weakThis.get())
+                {
+                    strongThis->_UpdateTrigger();
+                }
+            });
+        }
+        _UpdateTrigger();
+    }
+
+    void ControlSizeTrigger::_UpdateTrigger()
+    {
+        const auto target = TargetElement();
+        if (!target || !CanTrigger())
+        {
+            _isActive = false;
+            SetActive(false);
+            return;
+        }
+
+        const auto width = target.ActualWidth();
+        const auto height = target.ActualHeight();
+
+        const bool activate =
+            MinWidth() <= width &&
+            width < MaxWidth() &&
+            MinHeight() <= height &&
+            height < MaxHeight();
+
+        _isActive = activate;
+        SetActive(activate);
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/ControlSizeTrigger.h b/src/cascadia/TerminalSettingsEditor/ControlSizeTrigger.h
new file mode 100644
index 00000000000..49e6a561f1b
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/ControlSizeTrigger.h
@@ -0,0 +1,64 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- ControlSizeTrigger
+
+Abstract:
+- A conditional state trigger that activates based on the size (width and/or
+  height) of a target FrameworkElement. Lets XAML visual states swap based on
+  the live size of a templated part. Ported from the Windows Community Toolkit
+  primitive `CommunityToolkit.WinUI.ControlSizeTrigger`.
+
+  The trigger is "active" when:
+    MinWidth  <= TargetElement.ActualWidth  < MaxWidth   AND
+    MinHeight <= TargetElement.ActualHeight < MaxHeight
+
+  Defaults: MinWidth = MinHeight = 0; MaxWidth = MaxHeight = +inf, which makes
+  the trigger always active unless `CanTrigger` is false or `TargetElement` is
+  null.
+
+Author(s):
+- Carlos Zamora - May 2026 (port from CommunityToolkit.WinUI.ControlSizeTrigger)
+
+--*/
+
+#pragma once
+
+#include "ControlSizeTrigger.g.h"
+#include "Utils.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct ControlSizeTrigger : ControlSizeTriggerT<ControlSizeTrigger>
+    {
+    public:
+        ControlSizeTrigger();
+
+        bool IsActive() const { return _isActive; }
+
+        DEPENDENCY_PROPERTY(bool, CanTrigger);
+        DEPENDENCY_PROPERTY(double, MinWidth);
+        DEPENDENCY_PROPERTY(double, MaxWidth);
+        DEPENDENCY_PROPERTY(double, MinHeight);
+        DEPENDENCY_PROPERTY(double, MaxHeight);
+        DEPENDENCY_PROPERTY(Windows::UI::Xaml::FrameworkElement, TargetElement);
+
+    private:
+        static void _InitializeProperties();
+        static void _OnTriggerInputChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
+        static void _OnTargetElementChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
+
+        void _UpdateTargetElement(const Windows::UI::Xaml::FrameworkElement& oldValue, const Windows::UI::Xaml::FrameworkElement& newValue);
+        void _UpdateTrigger();
+
+        Windows::UI::Xaml::FrameworkElement::SizeChanged_revoker _sizeChangedRevoker;
+        bool _isActive{ false };
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
+{
+    BASIC_FACTORY(ControlSizeTrigger);
+}
diff --git a/src/cascadia/TerminalSettingsEditor/ControlSizeTrigger.idl b/src/cascadia/TerminalSettingsEditor/ControlSizeTrigger.idl
new file mode 100644
index 00000000000..7bfabbc5aec
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/ControlSizeTrigger.idl
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    [default_interface] runtimeclass ControlSizeTrigger : Windows.UI.Xaml.StateTriggerBase
+    {
+        ControlSizeTrigger();
+
+        Boolean CanTrigger;
+        static Windows.UI.Xaml.DependencyProperty CanTriggerProperty { get; };
+
+        Double MinWidth;
+        static Windows.UI.Xaml.DependencyProperty MinWidthProperty { get; };
+
+        Double MaxWidth;
+        static Windows.UI.Xaml.DependencyProperty MaxWidthProperty { get; };
+
+        Double MinHeight;
+        static Windows.UI.Xaml.DependencyProperty MinHeightProperty { get; };
+
+        Double MaxHeight;
+        static Windows.UI.Xaml.DependencyProperty MaxHeightProperty { get; };
+
+        Windows.UI.Xaml.FrameworkElement TargetElement;
+        static Windows.UI.Xaml.DependencyProperty TargetElementProperty { get; };
+
+        Boolean IsActive { get; };
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/CornerRadiusFilterConverters.cpp b/src/cascadia/TerminalSettingsEditor/CornerRadiusFilterConverters.cpp
new file mode 100644
index 00000000000..0d9b9168b61
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/CornerRadiusFilterConverters.cpp
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "CornerRadiusFilterConverters.h"
+#include "CornerRadiusConverter.g.cpp"
+#include "TopCornerRadiusFilterConverter.g.cpp"
+#include "BottomCornerRadiusFilterConverter.g.cpp"
+
+using namespace winrt::Windows::UI::Xaml;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    winrt::Windows::Foundation::IInspectable CornerRadiusConverter::Convert(const winrt::Windows::Foundation::IInspectable& value, const Interop::TypeName& /*targetType*/, const winrt::Windows::Foundation::IInspectable& /*parameter*/, const hstring& /*language*/)
+    {
+        if (!value)
+        {
+            return value;
+        }
+        const auto cr = unbox_value_or<CornerRadius>(value, CornerRadius{ 0, 0, 0, 0 });
+        return box_value(CornerRadius{ 0, 0, cr.BottomRight, cr.BottomLeft });
+    }
+
+    winrt::Windows::Foundation::IInspectable CornerRadiusConverter::ConvertBack(const winrt::Windows::Foundation::IInspectable& value, const Interop::TypeName& /*targetType*/, const winrt::Windows::Foundation::IInspectable& /*parameter*/, const hstring& /*language*/)
+    {
+        return value;
+    }
+
+    winrt::Windows::Foundation::IInspectable TopCornerRadiusFilterConverter::Convert(const winrt::Windows::Foundation::IInspectable& value, const Interop::TypeName& /*targetType*/, const winrt::Windows::Foundation::IInspectable& /*parameter*/, const hstring& /*language*/)
+    {
+        if (!value)
+        {
+            return value;
+        }
+        const auto cr = unbox_value_or<CornerRadius>(value, CornerRadius{ 0, 0, 0, 0 });
+        return box_value(CornerRadius{ cr.TopLeft, cr.TopRight, 0, 0 });
+    }
+
+    winrt::Windows::Foundation::IInspectable TopCornerRadiusFilterConverter::ConvertBack(const winrt::Windows::Foundation::IInspectable& value, const Interop::TypeName& /*targetType*/, const winrt::Windows::Foundation::IInspectable& /*parameter*/, const hstring& /*language*/)
+    {
+        return value;
+    }
+
+    winrt::Windows::Foundation::IInspectable BottomCornerRadiusFilterConverter::Convert(const winrt::Windows::Foundation::IInspectable& value, const Interop::TypeName& /*targetType*/, const winrt::Windows::Foundation::IInspectable& /*parameter*/, const hstring& /*language*/)
+    {
+        if (!value)
+        {
+            return value;
+        }
+        const auto cr = unbox_value_or<CornerRadius>(value, CornerRadius{ 0, 0, 0, 0 });
+        return box_value(CornerRadius{ 0, 0, cr.BottomRight, cr.BottomLeft });
+    }
+
+    winrt::Windows::Foundation::IInspectable BottomCornerRadiusFilterConverter::ConvertBack(const winrt::Windows::Foundation::IInspectable& value, const Interop::TypeName& /*targetType*/, const winrt::Windows::Foundation::IInspectable& /*parameter*/, const hstring& /*language*/)
+    {
+        return value;
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/CornerRadiusFilterConverters.h b/src/cascadia/TerminalSettingsEditor/CornerRadiusFilterConverters.h
new file mode 100644
index 00000000000..bd7b9b01c1b
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/CornerRadiusFilterConverters.h
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "CornerRadiusConverter.g.h"
+#include "TopCornerRadiusFilterConverter.g.h"
+#include "BottomCornerRadiusFilterConverter.g.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct CornerRadiusConverter : CornerRadiusConverterT<CornerRadiusConverter>
+    {
+        CornerRadiusConverter() = default;
+
+        Windows::Foundation::IInspectable Convert(const Windows::Foundation::IInspectable& value, const Windows::UI::Xaml::Interop::TypeName& targetType, const Windows::Foundation::IInspectable& parameter, const hstring& language);
+        Windows::Foundation::IInspectable ConvertBack(const Windows::Foundation::IInspectable& value, const Windows::UI::Xaml::Interop::TypeName& targetType, const Windows::Foundation::IInspectable& parameter, const hstring& language);
+    };
+
+    struct TopCornerRadiusFilterConverter : TopCornerRadiusFilterConverterT<TopCornerRadiusFilterConverter>
+    {
+        TopCornerRadiusFilterConverter() = default;
+
+        Windows::Foundation::IInspectable Convert(const Windows::Foundation::IInspectable& value, const Windows::UI::Xaml::Interop::TypeName& targetType, const Windows::Foundation::IInspectable& parameter, const hstring& language);
+        Windows::Foundation::IInspectable ConvertBack(const Windows::Foundation::IInspectable& value, const Windows::UI::Xaml::Interop::TypeName& targetType, const Windows::Foundation::IInspectable& parameter, const hstring& language);
+    };
+
+    struct BottomCornerRadiusFilterConverter : BottomCornerRadiusFilterConverterT<BottomCornerRadiusFilterConverter>
+    {
+        BottomCornerRadiusFilterConverter() = default;
+
+        Windows::Foundation::IInspectable Convert(const Windows::Foundation::IInspectable& value, const Windows::UI::Xaml::Interop::TypeName& targetType, const Windows::Foundation::IInspectable& parameter, const hstring& language);
+        Windows::Foundation::IInspectable ConvertBack(const Windows::Foundation::IInspectable& value, const Windows::UI::Xaml::Interop::TypeName& targetType, const Windows::Foundation::IInspectable& parameter, const hstring& language);
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
+{
+    BASIC_FACTORY(CornerRadiusConverter);
+    BASIC_FACTORY(TopCornerRadiusFilterConverter);
+    BASIC_FACTORY(BottomCornerRadiusFilterConverter);
+}
diff --git a/src/cascadia/TerminalSettingsEditor/CornerRadiusFilterConverters.idl b/src/cascadia/TerminalSettingsEditor/CornerRadiusFilterConverters.idl
new file mode 100644
index 00000000000..83b5a87a4c5
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/CornerRadiusFilterConverters.idl
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    [default_interface] runtimeclass CornerRadiusConverter : Windows.UI.Xaml.Data.IValueConverter
+    {
+        CornerRadiusConverter();
+    }
+
+    [default_interface] runtimeclass TopCornerRadiusFilterConverter : Windows.UI.Xaml.Data.IValueConverter
+    {
+        TopCornerRadiusFilterConverter();
+    }
+
+    [default_interface] runtimeclass BottomCornerRadiusFilterConverter : Windows.UI.Xaml.Data.IValueConverter
+    {
+        BottomCornerRadiusFilterConverter();
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml b/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
index ab3798b8578..3421a3380df 100644
--- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
+++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
@@ -200,277 +200,283 @@
             </Grid>
         </Border>
 
-        <local:SettingContainer x:Name="InboxSchemeDuplicate"
-                                x:Uid="ColorScheme_InboxSchemeDuplicate"
-                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.IsEditable), Mode=OneWay}">
+        <local:SettingsCard x:Name="InboxSchemeDuplicate"
+                            x:Uid="ColorScheme_InboxSchemeDuplicate"
+                            Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.IsEditable), Mode=OneWay}">
             <Button x:Name="DuplicateSchemeButton"
                     x:Uid="ColorScheme_DuplicateButton"
                     Click="{x:Bind ViewModel.Duplicate_Click}"
                     Style="{StaticResource BrowseButtonStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
-        <local:SettingContainer x:Name="ColorsHeader"
+        <local:SettingsExpander x:Name="ColorsHeader"
                                 x:Uid="ColorScheme_ColorsHeader"
-                                StartExpanded="True"
-                                Style="{StaticResource ExpanderSettingContainerStyle}"
+                                IsExpanded="True"
                                 Visibility="{x:Bind ViewModel.IsEditable, Mode=OneWay}">
-            <Grid x:Name="ColorTableGrid"
-                  Style="{StaticResource ColorTableGridStyle}"
-                  XYFocusKeyboardNavigation="Enabled">
-                <Grid.ColumnDefinitions>
-                    <!--  Labels  -->
-                    <ColumnDefinition Width="Auto" />
+            <local:SettingsExpander.ItemsHeader>
+                <ContentPresenter Padding="16,12,16,16">
+                    <Grid x:Name="ColorTableGrid"
+                          Style="{StaticResource ColorTableGridStyle}"
+                          XYFocusKeyboardNavigation="Enabled">
+                        <Grid.ColumnDefinitions>
+                            <!--  Labels  -->
+                            <ColumnDefinition Width="Auto" />
 
-                    <!--  Regular Colors  -->
-                    <ColumnDefinition Width="Auto" />
+                            <!--  Regular Colors  -->
+                            <ColumnDefinition Width="Auto" />
 
-                    <!--  Bright Colors  -->
-                    <ColumnDefinition Width="Auto" />
+                            <!--  Bright Colors  -->
+                            <ColumnDefinition Width="Auto" />
 
-                    <ColumnDefinition Width="50" />
+                            <ColumnDefinition Width="50" />
 
-                    <!--  Labels  -->
-                    <ColumnDefinition Width="Auto" />
+                            <!--  Labels  -->
+                            <ColumnDefinition Width="Auto" />
 
-                    <!--  Regular Colors  -->
-                    <ColumnDefinition Width="Auto" />
+                            <!--  Regular Colors  -->
+                            <ColumnDefinition Width="Auto" />
 
-                    <!--  Bright Colors  -->
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
+                            <!--  Bright Colors  -->
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
 
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <TextBlock x:Uid="ColorScheme_Black"
-                           Grid.Row="0"
-                           Grid.Column="0"
-                           Style="{StaticResource ColorLabelStyle}" />
-                <ContentControl x:Name="NonBrightBlack"
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Content="{x:Bind ViewModel.ColorEntryAt(0), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <TextBlock x:Uid="ColorScheme_Red"
-                           Grid.Row="1"
-                           Grid.Column="0"
-                           Style="{StaticResource ColorLabelStyle}" />
-                <ContentControl x:Name="NonBrightRed"
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Content="{x:Bind ViewModel.ColorEntryAt(1), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <TextBlock x:Uid="ColorScheme_Green"
-                           Grid.Row="2"
-                           Grid.Column="0"
-                           Style="{StaticResource ColorLabelStyle}" />
-                <ContentControl x:Name="NonBrightGreen"
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                Content="{x:Bind ViewModel.ColorEntryAt(2), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <TextBlock x:Uid="ColorScheme_Yellow"
-                           Grid.Row="3"
-                           Grid.Column="0"
-                           Style="{StaticResource ColorLabelStyle}" />
-                <ContentControl x:Name="NonBrightYellow"
-                                Grid.Row="3"
-                                Grid.Column="1"
-                                Content="{x:Bind ViewModel.ColorEntryAt(3), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <TextBlock x:Uid="ColorScheme_Blue"
-                           Grid.Row="4"
-                           Grid.Column="0"
-                           Style="{StaticResource ColorLabelStyle}" />
-                <ContentControl x:Name="NonBrightBlue"
-                                Grid.Row="4"
-                                Grid.Column="1"
-                                Content="{x:Bind ViewModel.ColorEntryAt(4), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <TextBlock x:Uid="ColorScheme_Purple"
-                           Grid.Row="5"
-                           Grid.Column="0"
-                           Style="{StaticResource ColorLabelStyle}" />
-                <ContentControl x:Name="NonBrightPurple"
-                                Grid.Row="5"
-                                Grid.Column="1"
-                                Content="{x:Bind ViewModel.ColorEntryAt(5), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <TextBlock x:Uid="ColorScheme_Cyan"
-                           Grid.Row="6"
-                           Grid.Column="0"
-                           Style="{StaticResource ColorLabelStyle}" />
-                <ContentControl x:Name="NonBrightCyan"
-                                Grid.Row="6"
-                                Grid.Column="1"
-                                Content="{x:Bind ViewModel.ColorEntryAt(6), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <TextBlock x:Uid="ColorScheme_White"
-                           Grid.Row="7"
-                           Grid.Column="0"
-                           Style="{StaticResource ColorLabelStyle}" />
-                <ContentControl x:Name="NonBrightWhite"
-                                Grid.Row="7"
-                                Grid.Column="1"
-                                Content="{x:Bind ViewModel.ColorEntryAt(7), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <ContentControl x:Name="BrightBlack"
-                                Grid.Row="0"
-                                Grid.Column="2"
-                                Content="{x:Bind ViewModel.ColorEntryAt(8), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <ContentControl x:Name="BrightRed"
-                                Grid.Row="1"
-                                Grid.Column="2"
-                                Content="{x:Bind ViewModel.ColorEntryAt(9), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <ContentControl x:Name="BrightGreen"
-                                Grid.Row="2"
-                                Grid.Column="2"
-                                Content="{x:Bind ViewModel.ColorEntryAt(10), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <ContentControl x:Name="BrightYellow"
-                                Grid.Row="3"
-                                Grid.Column="2"
-                                Content="{x:Bind ViewModel.ColorEntryAt(11), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <ContentControl x:Name="BrightBlue"
-                                Grid.Row="4"
-                                Grid.Column="2"
-                                Content="{x:Bind ViewModel.ColorEntryAt(12), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <ContentControl x:Name="BrightPurple"
-                                Grid.Row="5"
-                                Grid.Column="2"
-                                Content="{x:Bind ViewModel.ColorEntryAt(13), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <ContentControl x:Name="BrightCyan"
-                                Grid.Row="6"
-                                Grid.Column="2"
-                                Content="{x:Bind ViewModel.ColorEntryAt(14), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-                <ContentControl x:Name="BrightWhite"
-                                Grid.Row="7"
-                                Grid.Column="2"
-                                Content="{x:Bind ViewModel.ColorEntryAt(15), Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <TextBlock x:Uid="ColorScheme_Black"
+                                   Grid.Row="0"
+                                   Grid.Column="0"
+                                   Style="{StaticResource ColorLabelStyle}" />
+                        <ContentControl x:Name="NonBrightBlack"
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(0), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <TextBlock x:Uid="ColorScheme_Red"
+                                   Grid.Row="1"
+                                   Grid.Column="0"
+                                   Style="{StaticResource ColorLabelStyle}" />
+                        <ContentControl x:Name="NonBrightRed"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(1), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <TextBlock x:Uid="ColorScheme_Green"
+                                   Grid.Row="2"
+                                   Grid.Column="0"
+                                   Style="{StaticResource ColorLabelStyle}" />
+                        <ContentControl x:Name="NonBrightGreen"
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(2), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <TextBlock x:Uid="ColorScheme_Yellow"
+                                   Grid.Row="3"
+                                   Grid.Column="0"
+                                   Style="{StaticResource ColorLabelStyle}" />
+                        <ContentControl x:Name="NonBrightYellow"
+                                        Grid.Row="3"
+                                        Grid.Column="1"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(3), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <TextBlock x:Uid="ColorScheme_Blue"
+                                   Grid.Row="4"
+                                   Grid.Column="0"
+                                   Style="{StaticResource ColorLabelStyle}" />
+                        <ContentControl x:Name="NonBrightBlue"
+                                        Grid.Row="4"
+                                        Grid.Column="1"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(4), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <TextBlock x:Uid="ColorScheme_Purple"
+                                   Grid.Row="5"
+                                   Grid.Column="0"
+                                   Style="{StaticResource ColorLabelStyle}" />
+                        <ContentControl x:Name="NonBrightPurple"
+                                        Grid.Row="5"
+                                        Grid.Column="1"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(5), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <TextBlock x:Uid="ColorScheme_Cyan"
+                                   Grid.Row="6"
+                                   Grid.Column="0"
+                                   Style="{StaticResource ColorLabelStyle}" />
+                        <ContentControl x:Name="NonBrightCyan"
+                                        Grid.Row="6"
+                                        Grid.Column="1"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(6), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <TextBlock x:Uid="ColorScheme_White"
+                                   Grid.Row="7"
+                                   Grid.Column="0"
+                                   Style="{StaticResource ColorLabelStyle}" />
+                        <ContentControl x:Name="NonBrightWhite"
+                                        Grid.Row="7"
+                                        Grid.Column="1"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(7), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <ContentControl x:Name="BrightBlack"
+                                        Grid.Row="0"
+                                        Grid.Column="2"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(8), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <ContentControl x:Name="BrightRed"
+                                        Grid.Row="1"
+                                        Grid.Column="2"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(9), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <ContentControl x:Name="BrightGreen"
+                                        Grid.Row="2"
+                                        Grid.Column="2"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(10), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <ContentControl x:Name="BrightYellow"
+                                        Grid.Row="3"
+                                        Grid.Column="2"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(11), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <ContentControl x:Name="BrightBlue"
+                                        Grid.Row="4"
+                                        Grid.Column="2"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(12), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <ContentControl x:Name="BrightPurple"
+                                        Grid.Row="5"
+                                        Grid.Column="2"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(13), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <ContentControl x:Name="BrightCyan"
+                                        Grid.Row="6"
+                                        Grid.Column="2"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(14), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                        <ContentControl x:Name="BrightWhite"
+                                        Grid.Row="7"
+                                        Grid.Column="2"
+                                        Content="{x:Bind ViewModel.ColorEntryAt(15), Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
 
-                <!--  Foreground  -->
-                <TextBlock x:Uid="ColorScheme_Foreground"
-                           Grid.Row="0"
-                           Grid.Column="4"
-                           Style="{StaticResource ColorLabelStyle}" />
-                <ContentControl x:Name="ForegroundButton"
-                                Grid.Row="0"
-                                Grid.Column="5"
-                                Content="{x:Bind ViewModel.ForegroundColor, Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
+                        <!--  Foreground  -->
+                        <TextBlock x:Uid="ColorScheme_Foreground"
+                                   Grid.Row="0"
+                                   Grid.Column="4"
+                                   Style="{StaticResource ColorLabelStyle}" />
+                        <ContentControl x:Name="ForegroundButton"
+                                        Grid.Row="0"
+                                        Grid.Column="5"
+                                        Content="{x:Bind ViewModel.ForegroundColor, Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
 
-                <!--  Background  -->
-                <TextBlock x:Uid="ColorScheme_Background"
-                           Grid.Row="1"
-                           Grid.Column="4"
-                           Style="{StaticResource ColorLabelStyle}" />
-                <ContentControl x:Name="BackgroundButton"
-                                Grid.Row="1"
-                                Grid.Column="5"
-                                Content="{x:Bind ViewModel.BackgroundColor, Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
+                        <!--  Background  -->
+                        <TextBlock x:Uid="ColorScheme_Background"
+                                   Grid.Row="1"
+                                   Grid.Column="4"
+                                   Style="{StaticResource ColorLabelStyle}" />
+                        <ContentControl x:Name="BackgroundButton"
+                                        Grid.Row="1"
+                                        Grid.Column="5"
+                                        Content="{x:Bind ViewModel.BackgroundColor, Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
 
-                <!--  Cursor Color  -->
-                <TextBlock x:Uid="ColorScheme_CursorColor"
-                           Grid.Row="2"
-                           Grid.Column="4"
-                           Style="{StaticResource ColorLabelStyle}" />
-                <ContentControl x:Name="CursorColorButton"
-                                Grid.Row="2"
-                                Grid.Column="5"
-                                Content="{x:Bind ViewModel.CursorColor, Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
+                        <!--  Cursor Color  -->
+                        <TextBlock x:Uid="ColorScheme_CursorColor"
+                                   Grid.Row="2"
+                                   Grid.Column="4"
+                                   Style="{StaticResource ColorLabelStyle}" />
+                        <ContentControl x:Name="CursorColorButton"
+                                        Grid.Row="2"
+                                        Grid.Column="5"
+                                        Content="{x:Bind ViewModel.CursorColor, Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
 
-                <!--  Selection Background  -->
-                <TextBlock x:Uid="ColorScheme_SelectionBackground"
-                           Grid.Row="3"
-                           Grid.Column="4"
-                           Style="{StaticResource ColorLabelStyle}" />
-                <ContentControl x:Name="SelectionBackgroundButton"
-                                Grid.Row="3"
-                                Grid.Column="5"
-                                Content="{x:Bind ViewModel.SelectionBackgroundColor, Mode=OneWay}"
-                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                Style="{StaticResource ColorControlStyle}" />
-            </Grid>
-        </local:SettingContainer>
+                        <!--  Selection Background  -->
+                        <TextBlock x:Uid="ColorScheme_SelectionBackground"
+                                   Grid.Row="3"
+                                   Grid.Column="4"
+                                   Style="{StaticResource ColorLabelStyle}" />
+                        <ContentControl x:Name="SelectionBackgroundButton"
+                                        Grid.Row="3"
+                                        Grid.Column="5"
+                                        Content="{x:Bind ViewModel.SelectionBackgroundColor, Mode=OneWay}"
+                                        ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                        Style="{StaticResource ColorControlStyle}" />
+                    </Grid>
+                </ContentPresenter>
+            </local:SettingsExpander.ItemsHeader>
+        </local:SettingsExpander>
 
-        <local:SettingContainer x:Name="SetAsDefaultContainer"
-                                x:Uid="ColorScheme_SetAsDefault">
+        <local:SettingsCard x:Name="SetAsDefaultContainer"
+                            x:Uid="ColorScheme_SetAsDefault">
             <Button x:Name="SetAsDefaultButton"
                     x:Uid="ColorScheme_SetAsDefaultButton"
                     Click="{x:Bind ViewModel.SetAsDefault_Click}"
                     Style="{StaticResource BrowseButtonStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
-        <local:SettingContainer x:Name="RenameContainer"
+        <local:SettingsExpander x:Name="RenameContainer"
                                 x:Uid="ColorScheme_Rename"
-                                Style="{StaticResource ExpanderSettingContainerStyle}"
                                 Visibility="{x:Bind ViewModel.IsEditable, Mode=OneWay}">
-            <StackPanel Orientation="Horizontal"
-                        XYFocusKeyboardNavigation="Enabled">
-                <!--  Shown when color scheme name is already in use  -->
-                <muxc:TeachingTip x:Name="RenameErrorTip"
-                                  x:Uid="ColorScheme_RenameErrorTip" />
-                <!--  Name text box  -->
-                <TextBox x:Name="NameBox"
-                         PreviewKeyDown="NameBox_PreviewKeyDown"
-                         Style="{StaticResource TextBoxSettingStyle}" />
-                <!--  Accept rename button  -->
-                <Button x:Name="RenameAcceptButton"
-                        x:Uid="RenameAccept"
-                        Click="RenameAccept_Click"
-                        Style="{StaticResource AccentSmallButtonStyle}">
-                    <StackPanel Orientation="Horizontal">
-                        <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                  Glyph="&#xE8FB;" />
-                    </StackPanel>
-                </Button>
-                <!--  Cancel rename button  -->
-                <Button x:Name="RenameCancelButton"
-                        x:Uid="RenameCancel"
-                        Click="RenameCancel_Click"
-                        Style="{StaticResource SmallButtonStyle}">
-                    <StackPanel Orientation="Horizontal">
-                        <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                  Glyph="&#xE711;" />
+            <local:SettingsExpander.ItemsHeader>
+                <ContentPresenter Padding="16,12,16,16">
+                    <StackPanel Orientation="Horizontal"
+                                XYFocusKeyboardNavigation="Enabled">
+                        <!--  Shown when color scheme name is already in use  -->
+                        <muxc:TeachingTip x:Name="RenameErrorTip"
+                                          x:Uid="ColorScheme_RenameErrorTip" />
+                        <!--  Name text box  -->
+                        <TextBox x:Name="NameBox"
+                                 PreviewKeyDown="NameBox_PreviewKeyDown"
+                                 Style="{StaticResource TextBoxSettingStyle}" />
+                        <!--  Accept rename button  -->
+                        <Button x:Name="RenameAcceptButton"
+                                x:Uid="RenameAccept"
+                                Click="RenameAccept_Click"
+                                Style="{StaticResource AccentSmallButtonStyle}">
+                            <StackPanel Orientation="Horizontal">
+                                <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                          Glyph="&#xE8FB;" />
+                            </StackPanel>
+                        </Button>
+                        <!--  Cancel rename button  -->
+                        <Button x:Name="RenameCancelButton"
+                                x:Uid="RenameCancel"
+                                Click="RenameCancel_Click"
+                                Style="{StaticResource SmallButtonStyle}">
+                            <StackPanel Orientation="Horizontal">
+                                <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                          Glyph="&#xE711;" />
+                            </StackPanel>
+                        </Button>
                     </StackPanel>
-                </Button>
-            </StackPanel>
-        </local:SettingContainer>
+                </ContentPresenter>
+            </local:SettingsExpander.ItemsHeader>
+        </local:SettingsExpander>
 
         <Grid Margin="2,6,0,0"
               ColumnSpacing="4"
diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.cpp b/src/cascadia/TerminalSettingsEditor/Extensions.cpp
index 40b0988c9ed..f6a7d726b65 100644
--- a/src/cascadia/TerminalSettingsEditor/Extensions.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.cpp
@@ -79,19 +79,21 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Extensions::ExtensionNavigator_Click(const IInspectable& sender, const RoutedEventArgs& /*args*/)
     {
-        const auto extPkgVM = sender.as<Controls::Button>().Tag().as<Editor::ExtensionPackageViewModel>();
+        const auto extPkgVM = sender.as<FrameworkElement>().Tag().as<Editor::ExtensionPackageViewModel>();
         _ViewModel.CurrentExtensionPackage(extPkgVM);
     }
 
     void Extensions::NavigateToProfile_Click(const IInspectable& sender, const RoutedEventArgs& /*args*/)
     {
-        const auto& profileGuid = sender.as<Controls::Button>().Tag().as<guid>();
+        const auto element = sender.as<FrameworkElement>();
+        const auto profileGuid = winrt::unbox_value<winrt::guid>(element.Tag());
         get_self<ExtensionsViewModel>(_ViewModel)->NavigateToProfile(profileGuid);
     }
 
     void Extensions::NavigateToColorScheme_Click(const IInspectable& sender, const RoutedEventArgs& /*args*/)
     {
-        const auto& schemeVM = sender.as<Controls::Button>().Tag().as<Editor::ColorSchemeViewModel>();
+        const auto element = sender.as<FrameworkElement>();
+        const auto schemeVM = element.Tag().as<Editor::ColorSchemeViewModel>();
         get_self<ExtensionsViewModel>(_ViewModel)->NavigateToColorScheme(schemeVM);
     }
 
diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.xaml b/src/cascadia/TerminalSettingsEditor/Extensions.xaml
index 9659f8f467a..22d03d88329 100644
--- a/src/cascadia/TerminalSettingsEditor/Extensions.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Extensions.xaml
@@ -127,122 +127,78 @@
 
             <DataTemplate x:Key="DefaultExtensionNavigatorTemplate"
                           x:DataType="local:ExtensionPackageViewModel">
-                <Button AutomationProperties.Name="{x:Bind AccessibleName}"
-                        Click="ExtensionNavigator_Click"
-                        Style="{StaticResource NavigatorButtonStyle}"
-                        Tag="{x:Bind}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <ContentPresenter Content="{x:Bind}"
-                                          ContentTemplate="{StaticResource DefaultExtensionIdentifierTemplate}" />
-
-                        <ToggleSwitch Grid.Column="1"
-                                      HorizontalAlignment="Right"
-                                      VerticalAlignment="Center"
-                                      AutomationProperties.Name="{x:Bind AccessibleName}"
-                                      IsOn="{x:Bind Enabled, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-
-                    </Grid>
-                </Button>
+                <local:SettingsCard AutomationProperties.Name="{x:Bind AccessibleName}"
+                                    Click="ExtensionNavigator_Click"
+                                    Header="{x:Bind Package.Source}"
+                                    IsClickEnabled="True"
+                                    Tag="{x:Bind}">
+                    <local:SettingsCard.HeaderIcon>
+                        <FontIcon Glyph="&#xE74C;" />
+                    </local:SettingsCard.HeaderIcon>
+                    <ToggleSwitch HorizontalAlignment="Right"
+                                  VerticalAlignment="Center"
+                                  AutomationProperties.Name="{x:Bind AccessibleName}"
+                                  IsOn="{x:Bind Enabled, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </local:SettingsCard>
             </DataTemplate>
 
             <DataTemplate x:Key="ComplexExtensionNavigatorTemplate"
                           x:DataType="local:ExtensionPackageViewModel">
-                <Button AutomationProperties.Name="{x:Bind AccessibleName}"
-                        Click="ExtensionNavigator_Click"
-                        Style="{StaticResource NavigatorButtonStyle}"
-                        Tag="{x:Bind}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <ContentPresenter Content="{x:Bind}"
-                                          ContentTemplate="{StaticResource ComplexExtensionIdentifierTemplate}" />
-
-                        <ToggleSwitch Grid.Column="1"
-                                      HorizontalAlignment="Right"
-                                      VerticalAlignment="Center"
-                                      AutomationProperties.Name="{x:Bind AccessibleName}"
-                                      IsOn="{x:Bind Enabled, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </Grid>
-                </Button>
+                <local:SettingsCard AutomationProperties.Name="{x:Bind AccessibleName}"
+                                    Click="ExtensionNavigator_Click"
+                                    Description="{x:Bind Package.Source}"
+                                    Header="{x:Bind Package.DisplayName}"
+                                    IsClickEnabled="True"
+                                    Tag="{x:Bind}">
+                    <local:SettingsCard.HeaderIcon>
+                        <IconSourceElement IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Package.Icon)}" />
+                    </local:SettingsCard.HeaderIcon>
+                    <ToggleSwitch HorizontalAlignment="Right"
+                                  VerticalAlignment="Center"
+                                  AutomationProperties.Name="{x:Bind AccessibleName}"
+                                  IsOn="{x:Bind Enabled, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </local:SettingsCard>
             </DataTemplate>
 
             <DataTemplate x:Key="ComplexExtensionNavigatorTemplateWithFontIcon"
                           x:DataType="local:ExtensionPackageViewModel">
-                <Button AutomationProperties.Name="{x:Bind AccessibleName}"
-                        Click="ExtensionNavigator_Click"
-                        Style="{StaticResource NavigatorButtonStyle}"
-                        Tag="{x:Bind}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <ContentPresenter Content="{x:Bind}"
-                                          ContentTemplate="{StaticResource ComplexExtensionIdentifierTemplateWithFontIcon}" />
-
-                        <ToggleSwitch Grid.Column="1"
-                                      HorizontalAlignment="Right"
-                                      VerticalAlignment="Center"
-                                      AutomationProperties.Name="{x:Bind AccessibleName}"
-                                      IsOn="{x:Bind Enabled, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </Grid>
-                </Button>
+                <local:SettingsCard AutomationProperties.Name="{x:Bind AccessibleName}"
+                                    Click="ExtensionNavigator_Click"
+                                    Description="{x:Bind Package.Source}"
+                                    Header="{x:Bind Package.DisplayName}"
+                                    IsClickEnabled="True"
+                                    Tag="{x:Bind}">
+                    <local:SettingsCard.HeaderIcon>
+                        <FontIcon Glyph="{x:Bind Package.Icon}" />
+                    </local:SettingsCard.HeaderIcon>
+                    <ToggleSwitch HorizontalAlignment="Right"
+                                  VerticalAlignment="Center"
+                                  AutomationProperties.Name="{x:Bind AccessibleName}"
+                                  IsOn="{x:Bind Enabled, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </local:SettingsCard>
             </DataTemplate>
 
             <DataTemplate x:Key="FragmentProfileViewModelTemplate"
                           x:DataType="local:FragmentProfileViewModel">
-                <muxc:Expander AutomationProperties.Name="{x:Bind AccessibleName}"
-                               Style="{StaticResource ExpanderStyle}">
-                    <muxc:Expander.Header>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-
-                            <StackPanel Grid.Column="0"
-                                        Orientation="Horizontal">
-                                <IconSourceElement Width="16"
-                                                   Height="16"
-                                                   Margin="0,0,12,0"
-                                                   IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Profile.Icon.Resolved), Mode=OneWay}" />
-
-                                <TextBlock Text="{x:Bind Profile.Name, Mode=OneWay}" />
-
-                                <Button x:Name="NavigateToProfileButton"
-                                        x:Uid="Extensions_NavigateToProfileButton"
-                                        Click="NavigateToProfile_Click"
-                                        Style="{StaticResource SettingContainerResetButtonStyle}"
-                                        Tag="{x:Bind Profile.Guid}">
-                                    <FontIcon Glyph="&#xE8A7;"
-                                              Style="{StaticResource SettingContainerFontIconStyle}" />
-                                </Button>
-                            </StackPanel>
-
-                            <TextBlock Grid.Column="1"
-                                       Style="{StaticResource SettingContainerCurrentValueTextBlockStyle}"
-                                       Text="{x:Bind SourceName}" />
-                        </Grid>
-                    </muxc:Expander.Header>
-                    <muxc:Expander.Content>
-                        <ScrollViewer Style="{StaticResource CodeBlockScrollViewerStyle}">
-                            <TextBlock Style="{StaticResource CodeBlockStyle}"
-                                       Text="{x:Bind Json, Mode=OneWay}" />
-                        </ScrollViewer>
-                    </muxc:Expander.Content>
-                </muxc:Expander>
+                <local:SettingsCard AutomationProperties.Name="{x:Bind AccessibleName}"
+                                    Click="NavigateToProfile_Click"
+                                    IsClickEnabled="True"
+                                    Tag="{x:Bind Profile.Guid}">
+                    <local:SettingsCard.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <IconSourceElement Width="16"
+                                               Height="16"
+                                               Margin="0,0,12,0"
+                                               IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Profile.Icon.Resolved), Mode=OneWay}" />
+                            <TextBlock Text="{x:Bind Profile.Name, Mode=OneWay}" />
+                        </StackPanel>
+                    </local:SettingsCard.Header>
+                    <TextBlock Style="{StaticResource SettingContainerCurrentValueTextBlockStyle}"
+                               Text="{x:Bind SourceName}" />
+                </local:SettingsCard>
             </DataTemplate>
 
             <!--  This styling matches that of ExpanderSettingContainerStyle for consistency  -->
@@ -403,41 +359,17 @@
 
             <DataTemplate x:Key="FragmentColorSchemeViewModelTemplate"
                           x:DataType="local:FragmentColorSchemeViewModel">
-                <muxc:Expander AutomationProperties.Name="{x:Bind AccessibleName}"
-                               Style="{StaticResource ExpanderStyle}">
-                    <muxc:Expander.Header>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-
-                            <StackPanel Grid.Column="0"
-                                        Orientation="Horizontal">
-                                <ContentPresenter Content="{x:Bind ColorSchemeVM, Mode=OneWay}"
-                                                  ContentTemplate="{StaticResource ColorSchemeVMTemplate}" />
-                                <Button x:Name="NavigateToColorSchemeButton"
-                                        x:Uid="Extensions_NavigateToColorSchemeButton"
-                                        Click="NavigateToColorScheme_Click"
-                                        Style="{StaticResource SettingContainerResetButtonStyle}"
-                                        Tag="{x:Bind ColorSchemeVM}">
-                                    <FontIcon Glyph="&#xE8A7;"
-                                              Style="{StaticResource SettingContainerFontIconStyle}" />
-                                </Button>
-                            </StackPanel>
-
-                            <TextBlock Grid.Column="1"
-                                       Style="{StaticResource SettingContainerCurrentValueTextBlockStyle}"
-                                       Text="{x:Bind SourceName}" />
-                        </Grid>
-                    </muxc:Expander.Header>
-                    <muxc:Expander.Content>
-                        <ScrollViewer Style="{StaticResource CodeBlockScrollViewerStyle}">
-                            <TextBlock Style="{StaticResource CodeBlockStyle}"
-                                       Text="{x:Bind Json, Mode=OneWay}" />
-                        </ScrollViewer>
-                    </muxc:Expander.Content>
-                </muxc:Expander>
+                <local:SettingsCard AutomationProperties.Name="{x:Bind AccessibleName}"
+                                    Click="NavigateToColorScheme_Click"
+                                    IsClickEnabled="True"
+                                    Tag="{x:Bind ColorSchemeVM}">
+                    <local:SettingsCard.Header>
+                        <ContentPresenter Content="{x:Bind ColorSchemeVM, Mode=OneWay}"
+                                          ContentTemplate="{StaticResource ColorSchemeVMTemplate}" />
+                    </local:SettingsCard.Header>
+                    <TextBlock Style="{StaticResource SettingContainerCurrentValueTextBlockStyle}"
+                               Text="{x:Bind SourceName}" />
+                </local:SettingsCard>
             </DataTemplate>
         </ResourceDictionary>
     </Page.Resources>
@@ -500,11 +432,13 @@
                 <muxc:Expander.Content>
                     <StackPanel>
                         <!--  Scope  -->
-                        <local:SettingContainer x:Name="Scope"
-                                                x:Uid="Extensions_Scope"
-                                                Content="{x:Bind ViewModel.CurrentExtensionPackage.Scope, Mode=OneWay}"
-                                                IsTabStop="False"
-                                                Style="{StaticResource SettingContainerWithTextContent}" />
+                        <local:SettingsCard x:Name="Scope"
+                                            x:Uid="Extensions_Scope"
+                                            IsTabStop="False">
+                            <TextBlock VerticalAlignment="Center"
+                                       Style="{ThemeResource SecondaryTextBlockStyle}"
+                                       Text="{x:Bind ViewModel.CurrentExtensionPackage.Scope, Mode=OneWay}" />
+                        </local:SettingsCard>
                         <!--  JSON  -->
                         <ItemsControl IsTabStop="False"
                                       ItemTemplate="{StaticResource JsonTemplate}"
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
index 70fc972a534..1c60d920155 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
@@ -26,10 +26,11 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <StackPanel Style="{StaticResource SettingsStackStyle}">
+    <StackPanel Spacing="2"
+                Style="{StaticResource SettingsStackStyle}">
         <!--  Theme  -->
-        <local:SettingContainer x:Name="Theme"
-                                x:Uid="Globals_Theme">
+        <local:SettingsCard 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}"
@@ -40,113 +41,113 @@
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Position of new tab  -->
-        <local:SettingContainer x:Name="NewTabPosition"
-                                x:Uid="Globals_NewTabPosition">
+        <local:SettingsCard 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>
+        </local:SettingsCard>
 
         <!--  Show Titlebar  -->
-        <local:SettingContainer x:Name="ShowTitlebar"
-                                x:Uid="Globals_ShowTitlebar">
+        <local:SettingsCard 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>
+        </local:SettingsCard>
 
         <!--  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}"
+        <local:SettingsCard x:Name="AlwaysShowTabs"
+                            x:Uid="Globals_AlwaysShowTabs"
+                            IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.ShowTabsInTitlebar), Mode=OneWay}">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowTabs, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Show tabs in full screen  -->
-        <local:SettingContainer x:Name="ShowTabsFullscreen"
-                                x:Uid="Globals_ShowTabsFullscreen">
+        <local:SettingsCard x:Name="ShowTabsFullscreen"
+                            x:Uid="Globals_ShowTabsFullscreen">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsFullscreen, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Show Acrylic in Tab Row  -->
-        <local:SettingContainer x:Name="AcrylicTabRow"
-                                x:Uid="Globals_AcrylicTabRow">
+        <local:SettingsCard x:Name="AcrylicTabRow"
+                            x:Uid="Globals_AcrylicTabRow">
             <ToggleSwitch IsOn="{x:Bind ViewModel.UseAcrylicInTabRow, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Show Title in Titlebar  -->
-        <local:SettingContainer x:Name="ShowTitleInTitlebar"
-                                x:Uid="Globals_ShowTitleInTitlebar">
+        <local:SettingsCard x:Name="ShowTitleInTitlebar"
+                            x:Uid="Globals_ShowTitleInTitlebar">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTitleInTitlebar, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Always on Top  -->
-        <local:SettingContainer x:Name="AlwaysOnTop"
-                                x:Uid="Globals_AlwaysOnTop">
+        <local:SettingsCard x:Name="AlwaysOnTop"
+                            x:Uid="Globals_AlwaysOnTop">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Tab Width Mode  -->
-        <local:SettingContainer x:Name="TabWidthMode"
-                                x:Uid="Globals_TabWidthMode">
+        <local:SettingsCard 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>
+        </local:SettingsCard>
 
         <!--  Disable Animations  -->
         <!--  NOTE: the UID is "DisablePaneAnimationsReversed" not "DisablePaneAnimations". See GH#9124 for more details.  -->
-        <local:SettingContainer x:Name="DisableAnimations"
-                                x:Uid="Globals_DisableAnimationsReversed">
+        <local:SettingsCard x:Name="DisableAnimations"
+                            x:Uid="Globals_DisableAnimationsReversed">
             <ToggleSwitch IsOn="{x:Bind ViewModel.InvertedDisableAnimations, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Always Show Notification Icon  -->
-        <local:SettingContainer x:Name="AlwaysShowNotificationIcon"
-                                x:Uid="Globals_AlwaysShowNotificationIcon">
+        <local:SettingsCard x:Name="AlwaysShowNotificationIcon"
+                            x:Uid="Globals_AlwaysShowNotificationIcon">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowNotificationIcon, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Minimize To Notification Area  -->
-        <local:SettingContainer x:Name="MinimizeToNotificationArea"
-                                x:Uid="Globals_MinimizeToNotificationArea">
+        <local:SettingsCard x:Name="MinimizeToNotificationArea"
+                            x:Uid="Globals_MinimizeToNotificationArea">
             <ToggleSwitch IsOn="{x:Bind ViewModel.MinimizeToNotificationArea, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Automatically hide window  -->
-        <local:SettingContainer x:Name="AutoHideWindow"
-                                x:Uid="Globals_AutoHideWindow">
+        <local:SettingsCard x:Name="AutoHideWindow"
+                            x:Uid="Globals_AutoHideWindow">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AutoHideWindow, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Show Admin Shield  -->
-        <local:SettingContainer x:Name="ShowAdminShield"
-                                x:Uid="Globals_ShowAdminShield">
+        <local:SettingsCard x:Name="ShowAdminShield"
+                            x:Uid="Globals_ShowAdminShield">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowAdminShield, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
         <!--  Enable Unfocused Acrylic  -->
-        <local:SettingContainer x:Name="EnableUnfocusedAcrylic"
-                                x:Uid="Globals_EnableUnfocusedAcrylic">
+        <local:SettingsCard x:Name="EnableUnfocusedAcrylic"
+                            x:Uid="Globals_EnableUnfocusedAcrylic">
             <ToggleSwitch IsOn="{x:Bind ViewModel.EnableUnfocusedAcrylic, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
index f3a24a36a7e..b6093d337b2 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -25,109 +25,106 @@
     </Page.Resources>
 
     <StackPanel>
-        <StackPanel Style="{StaticResource SettingsStackStyle}">
+        <StackPanel Spacing="2"
+                    Style="{StaticResource SettingsStackStyle}">
             <!--  Copy On Select  -->
-            <local:SettingContainer x:Name="CopyOnSelect"
-                                    x:Uid="Globals_CopyOnSelect">
+            <local:SettingsCard x:Name="CopyOnSelect"
+                                x:Uid="Globals_CopyOnSelect">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Copy Format  -->
-            <local:SettingContainer x:Name="CopyFormat"
-                                    x:Uid="Globals_CopyFormat">
+            <local:SettingsCard 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>
+            </local:SettingsCard>
 
             <!--  Trim Block Selection  -->
-            <local:SettingContainer x:Name="TrimBlockSelection"
-                                    x:Uid="Globals_TrimBlockSelection">
+            <local:SettingsCard x:Name="TrimBlockSelection"
+                                x:Uid="Globals_TrimBlockSelection">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.TrimBlockSelection, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Trim Paste  -->
-            <local:SettingContainer x:Name="TrimPaste"
-                                    x:Uid="Globals_TrimPaste">
+            <local:SettingsCard x:Name="TrimPaste"
+                                x:Uid="Globals_TrimPaste">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Word Delimiters  -->
-            <local:SettingContainer x:Name="WordDelimiters"
-                                    x:Uid="Globals_WordDelimiters"
-                                    CurrentValue="{x:Bind ViewModel.WordDelimiters, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+            <local:SettingsCard x:Name="WordDelimiters"
+                                x:Uid="Globals_WordDelimiters">
                 <TextBox IsSpellCheckEnabled="False"
                          Style="{StaticResource TextBoxSettingStyle}"
                          Text="{x:Bind ViewModel.WordDelimiters, Mode=TwoWay}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Snap On Resize  -->
-            <local:SettingContainer x:Name="SnapToGridOnResize"
-                                    x:Uid="Globals_SnapToGridOnResize">
+            <local:SettingsCard x:Name="SnapToGridOnResize"
+                                x:Uid="Globals_SnapToGridOnResize">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.SnapToGridOnResize, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Tab Switcher Mode  -->
-            <local:SettingContainer x:Name="TabSwitcherMode"
-                                    x:Uid="Globals_TabSwitcherMode">
+            <local:SettingsCard 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>
+            </local:SettingsCard>
 
             <!--  Focus Follow Mouse Mode  -->
-            <local:SettingContainer x:Name="FocusFollowMouse"
-                                    x:Uid="Globals_FocusFollowMouse">
+            <local:SettingsCard x:Name="FocusFollowMouse"
+                                x:Uid="Globals_FocusFollowMouse">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Enable Font Size Changes with Scrolling  -->
-            <local:SettingContainer x:Name="ScrollToZoom"
-                                    x:Uid="Globals_ScrollToZoom">
+            <local:SettingsCard x:Name="ScrollToZoom"
+                                x:Uid="Globals_ScrollToZoom">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToZoom, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Enable Window Opacity Changes with Scrolling  -->
-            <local:SettingContainer x:Name="ScrollToChangeOpacity"
-                                    x:Uid="Globals_ScrollToChangeOpacity">
+            <local:SettingsCard x:Name="ScrollToChangeOpacity"
+                                x:Uid="Globals_ScrollToChangeOpacity">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.ScrollToChangeOpacity, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Detect URLs  -->
-            <local:SettingContainer x:Name="DetectURLs"
-                                    x:Uid="Globals_DetectURLs">
+            <local:SettingsCard x:Name="DetectURLs"
+                                x:Uid="Globals_DetectURLs">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Search Web Default Query URL  -->
-            <local:SettingContainer x:Name="SearchWebDefaultQueryUrl"
-                                    x:Uid="Globals_SearchWebDefaultQueryUrl"
-                                    CurrentValue="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+            <local:SettingsCard x:Name="SearchWebDefaultQueryUrl"
+                                x:Uid="Globals_SearchWebDefaultQueryUrl">
                 <TextBox IsSpellCheckEnabled="False"
                          Style="{StaticResource TextBoxSettingStyle}"
                          Text="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=TwoWay}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Enable Color Selection  -->
-            <local:SettingContainer x:Name="EnableColorSelection"
-                                    x:Uid="Globals_EnableColorSelection">
+            <local:SettingsCard x:Name="EnableColorSelection"
+                                x:Uid="Globals_EnableColorSelection">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.EnableColorSelection, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
         </StackPanel>
 
         <StackPanel Style="{StaticResource SettingsStackStyle}">
@@ -136,38 +133,38 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
 
             <!--  Confirm Close On  -->
-            <local:SettingContainer x:Name="ConfirmOnClose"
-                                    x:Uid="Globals_ConfirmOnClose">
+            <local:SettingsCard 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>
+            </local:SettingsCard>
 
             <!--  Input Service Warning  -->
-            <local:SettingContainer x:Name="InputServiceWarning"
-                                    x:Uid="Globals_InputServiceWarning">
+            <local:SettingsCard x:Name="InputServiceWarning"
+                                x:Uid="Globals_InputServiceWarning">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.InputServiceWarning, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Large Paste Warning  -->
-            <local:SettingContainer x:Name="WarnAboutLargePaste"
-                                    x:Uid="Globals_WarnAboutLargePaste">
+            <local:SettingsCard x:Name="WarnAboutLargePaste"
+                                x:Uid="Globals_WarnAboutLargePaste">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.WarnAboutLargePaste, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Multi Line Paste Warning  -->
-            <local:SettingContainer x:Name="WarnAboutMultiLinePaste"
-                                    x:Uid="Globals_WarnAboutMultiLinePaste">
+            <local:SettingsCard 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>
+            </local:SettingsCard>
 
         </StackPanel>
     </StackPanel>
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.cpp b/src/cascadia/TerminalSettingsEditor/Launch.cpp
index 1da7795baa3..c94e90112b8 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Launch.cpp
@@ -27,13 +27,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             FindName(L"DefaultTerminalDropdown");
         }
 
-        Automation::AutomationProperties::SetName(LaunchModeComboBox(), RS_(L"Globals_LaunchModeSetting/Text"));
-        Automation::AutomationProperties::SetHelpText(LaunchModeComboBox(), RS_(L"Globals_LaunchModeSetting/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"));
         Automation::AutomationProperties::SetHelpText(PosXBox(), RS_(L"Globals_InitialPosXBox/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"));
         Automation::AutomationProperties::SetHelpText(PosYBox(), RS_(L"Globals_InitialPosYBox/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"));
         Automation::AutomationProperties::SetHelpText(UseDefaultLaunchPositionCheckbox(), RS_(L"Globals_DefaultLaunchPositionCheckbox/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"));
-        Automation::AutomationProperties::SetName(CenterOnLaunchToggle(), RS_(L"Globals_CenterOnLaunch/Text"));
-        Automation::AutomationProperties::SetHelpText(CenterOnLaunchToggle(), RS_(L"Globals_CenterOnLaunch/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip"));
     }
 
     void Launch::OnNavigatedTo(const NavigationEventArgs& e)
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.xaml b/src/cascadia/TerminalSettingsEditor/Launch.xaml
index e202feef33f..6f816fbbb1d 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Launch.xaml
@@ -42,10 +42,11 @@
     </Page.Resources>
 
     <StackPanel>
-        <StackPanel Style="{StaticResource SettingsStackStyle}">
+        <StackPanel Spacing="2"
+                    Style="{StaticResource SettingsStackStyle}">
             <!--  Default Profile  -->
-            <local:SettingContainer x:Name="DefaultProfile"
-                                    x:Uid="Globals_DefaultProfile">
+            <local:SettingsCard x:Name="DefaultProfile"
+                                x:Uid="Globals_DefaultProfile">
                 <ComboBox ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
                           SelectedItem="{x:Bind ViewModel.CurrentDefaultProfile, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}">
@@ -73,12 +74,12 @@
                         </DataTemplate>
                     </ComboBox.ItemTemplate>
                 </ComboBox>
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Default Terminal  -->
-            <local:SettingContainer x:Name="DefaultTerminalDropdown"
-                                    x:Uid="Globals_DefaultTerminal"
-                                    x:Load="false">
+            <local:SettingsCard 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}"
@@ -138,11 +139,11 @@
                         </DataTemplate>
                     </ComboBox.ItemTemplate>
                 </ComboBox>
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Language  -->
-            <local:SettingContainer x:Name="Language"
-                                    x:Uid="Globals_Language">
+            <local:SettingsCard x:Name="Language"
+                                x:Uid="Globals_Language">
                 <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}"
                           SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}">
@@ -152,170 +153,119 @@
                         </DataTemplate>
                     </ComboBox.ItemTemplate>
                 </ComboBox>
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Language  -->
-            <local:SettingContainer x:Name="DefaultInputScope"
-                                    x:Uid="Globals_DefaultInputScope">
+            <local:SettingsCard 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>
+            </local:SettingsCard>
 
             <!--  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}">
+            <local:SettingsCard x:Name="StartOnUserLogin"
+                                x:Uid="Globals_StartOnUserLogin"
+                                Description="{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>
+            </local:SettingsCard>
 
             <!--  First Window Behavior  -->
-            <local:SettingContainer x:Name="FirstWindowPreference"
-                                    x:Uid="Globals_FirstWindowPreference">
+            <local:SettingsCard 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>
+            </local:SettingsCard>
 
             <!--  Windowing Behavior  -->
-            <local:SettingContainer x:Name="WindowingBehavior"
-                                    x:Uid="Globals_WindowingBehavior">
+            <local:SettingsCard 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>
+            </local:SettingsCard>
 
             <!--  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>
+            <local:SettingsExpander x:Name="LaunchSize"
+                                    x:Uid="Globals_LaunchSize">
+                <local:SettingsExpander.Content>
+                    <TextBlock Style="{StaticResource SettingContainerCurrentValueTextBlockStyle}"
+                               Text="{x:Bind ViewModel.LaunchSizeCurrentValue, Mode=OneWay}" />
+                </local:SettingsExpander.Content>
+                <local:SettingsExpander.Items>
+                    <local:SettingsCard x:Uid="Globals_InitialCols">
+                        <muxc:NumberBox x:Uid="Globals_InitialColsBox"
+                                        Maximum="999"
+                                        Minimum="1"
+                                        Style="{StaticResource LaunchSizeNumberBoxStyle}"
+                                        Value="{x:Bind ViewModel.InitialCols, Mode=TwoWay}" />
+                    </local:SettingsCard>
+                    <local:SettingsCard x:Uid="Globals_InitialRows">
+                        <muxc:NumberBox x:Uid="Globals_InitialRowsBox"
+                                        Maximum="999"
+                                        Minimum="1"
+                                        Style="{StaticResource LaunchSizeNumberBoxStyle}"
+                                        Value="{x:Bind ViewModel.InitialRows, Mode=TwoWay}" />
+                    </local:SettingsCard>
+                </local:SettingsExpander.Items>
+            </local:SettingsExpander>
 
             <!--  Launch Parameters  -->
-            <local:SettingContainer x:Name="LaunchParameters"
-                                    x:Uid="Globals_LaunchParameters"
-                                    CurrentValue="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <Grid RowSpacing="8">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock x:Uid="Globals_LaunchModeSetting"
-                               Grid.Row="0"
-                               Grid.Column="0"
-                               VerticalAlignment="Center" />
-                    <ComboBox x:Name="LaunchModeComboBox"
-                              Grid.Row="0"
-                              Grid.Column="1"
-                              MinWidth="240"
-                              AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.LaunchModeList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentLaunchMode, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                    <TextBlock x:Uid="Globals_LaunchPosition"
-                               Grid.Row="1"
-                               Grid.Column="0"
-                               VerticalAlignment="Center" />
-                    <Grid Grid.Row="1"
-                          Grid.Column="1"
-                          ColumnSpacing="4">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <!--  Match the width of these NumberBoxes to the Width of the LaunchModeComboBox above minus the Grid's ColumnSpacing  -->
-                        <muxc:NumberBox x:Name="PosXBox"
-                                        x:Uid="Globals_InitialPosXBox"
-                                        Grid.Row="0"
-                                        Grid.Column="0"
-                                        Width="118"
-                                        IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
-                                        Style="{StaticResource LaunchPositionNumberBoxStyle}"
-                                        Value="{x:Bind ViewModel.InitialPosX, Mode=TwoWay}" />
-                        <muxc:NumberBox x:Name="PosYBox"
-                                        x:Uid="Globals_InitialPosYBox"
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Width="118"
-                                        IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
-                                        Style="{StaticResource LaunchPositionNumberBoxStyle}"
-                                        Value="{x:Bind ViewModel.InitialPosY, Mode=TwoWay}" />
-                        <CheckBox x:Name="UseDefaultLaunchPositionCheckbox"
-                                  x:Uid="Globals_DefaultLaunchPositionCheckbox"
-                                  Grid.Row="1"
-                                  Grid.Column="0"
-                                  Grid.ColumnSpan="2"
-                                  IsChecked="{x:Bind ViewModel.UseDefaultLaunchPosition, Mode=TwoWay}" />
-                    </Grid>
-                    <TextBlock x:Uid="Globals_CenterOnLaunch"
-                               Grid.Row="2"
-                               Grid.Column="0"
-                               VerticalAlignment="Center" />
-                    <ToggleSwitch x:Name="CenterOnLaunchToggle"
-                                  Grid.Row="2"
-                                  Grid.Column="1"
-                                  IsOn="{x:Bind ViewModel.CenterOnLaunch, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </Grid>
-            </local:SettingContainer>
+            <local:SettingsExpander x:Name="LaunchParameters"
+                                    x:Uid="Globals_LaunchParameters">
+                <local:SettingsExpander.Content>
+                    <TextBlock Style="{StaticResource SettingContainerCurrentValueTextBlockStyle}"
+                               Text="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}" />
+                </local:SettingsExpander.Content>
+                <local:SettingsExpander.Items>
+                    <local:SettingsCard x:Uid="Globals_LaunchModeSetting">
+                        <ComboBox x:Name="LaunchModeComboBox"
+                                  AutomationProperties.AccessibilityView="Content"
+                                  ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                                  ItemsSource="{x:Bind ViewModel.LaunchModeList}"
+                                  SelectedItem="{x:Bind ViewModel.CurrentLaunchMode, Mode=TwoWay}"
+                                  Style="{StaticResource ComboBoxSettingStyle}" />
+                    </local:SettingsCard>
+                    <local:SettingsCard x:Uid="Globals_LaunchPosition">
+                        <StackPanel Orientation="Vertical"
+                                    Spacing="4">
+                            <StackPanel Orientation="Horizontal"
+                                        Spacing="4">
+                                <muxc:NumberBox x:Name="PosXBox"
+                                                x:Uid="Globals_InitialPosXBox"
+                                                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"
+                                                Width="118"
+                                                IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
+                                                Style="{StaticResource LaunchPositionNumberBoxStyle}"
+                                                Value="{x:Bind ViewModel.InitialPosY, Mode=TwoWay}" />
+                            </StackPanel>
+                            <CheckBox x:Name="UseDefaultLaunchPositionCheckbox"
+                                      x:Uid="Globals_DefaultLaunchPositionCheckbox"
+                                      IsChecked="{x:Bind ViewModel.UseDefaultLaunchPosition, Mode=TwoWay}" />
+                        </StackPanel>
+                    </local:SettingsCard>
+                    <local:SettingsCard x:Uid="Globals_CenterOnLaunch">
+                        <ToggleSwitch x:Name="CenterOnLaunchToggle"
+                                      IsOn="{x:Bind ViewModel.CenterOnLaunch, Mode=TwoWay}"
+                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                    </local:SettingsCard>
+                </local:SettingsExpander.Items>
+            </local:SettingsExpander>
         </StackPanel>
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp b/src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp
index d02acddf9c9..e7f146900d2 100644
--- a/src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp
@@ -406,7 +406,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 break; // fall through to the common case (no task, not configured, etc.)
             }
         }
-        return RS_(L"Globals_StartOnUserLogin/HelpText");
+        return RS_(L"Globals_StartOnUserLogin/Description");
     }
 
     bool LaunchViewModel::StartOnUserLogin()
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
index 611e0885eb7..e103653f006 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
@@ -170,8 +170,23 @@
     <ClInclude Include="Rendering.h">
       <DependentUpon>Rendering.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="SettingContainer.h">
-      <DependentUpon>SettingContainer.idl</DependentUpon>
+    <ClInclude Include="SettingsCard.h">
+      <DependentUpon>SettingsCard.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="SettingsExpander.h">
+      <DependentUpon>SettingsExpander.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="StyleExtensions.h">
+      <DependentUpon>StyleExtensions.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="ControlSizeTrigger.h">
+      <DependentUpon>ControlSizeTrigger.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="CornerRadiusFilterConverters.h">
+      <DependentUpon>CornerRadiusFilterConverters.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="StringDefaultTemplateSelector.h">
+      <DependentUpon>StringDefaultTemplateSelector.idl</DependentUpon>
     </ClInclude>
     <ClInclude Include="Utils.h" />
     <ClInclude Include="PreviewConnection.h" />
@@ -252,6 +267,12 @@
     <Page Include="SettingContainerStyle.xaml">
       <Type>DefaultStyle</Type>
     </Page>
+    <Page Include="SettingsControlsStyle.xaml">
+      <Type>DefaultStyle</Type>
+    </Page>
+    <Page Include="SettingsControlsImplicitStyles.xaml">
+      <Type>DefaultStyle</Type>
+    </Page>
   </ItemGroup>
   <!-- ========================= Cpp Files ======================== -->
   <ItemGroup>
@@ -382,8 +403,23 @@
     <ClCompile Include="Rendering.cpp">
       <DependentUpon>Rendering.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="SettingContainer.cpp">
-      <DependentUpon>SettingContainer.idl</DependentUpon>
+    <ClCompile Include="SettingsCard.cpp">
+      <DependentUpon>SettingsCard.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="SettingsExpander.cpp">
+      <DependentUpon>SettingsExpander.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="StyleExtensions.cpp">
+      <DependentUpon>StyleExtensions.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="ControlSizeTrigger.cpp">
+      <DependentUpon>ControlSizeTrigger.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="CornerRadiusFilterConverters.cpp">
+      <DependentUpon>CornerRadiusFilterConverters.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="StringDefaultTemplateSelector.cpp">
+      <DependentUpon>StringDefaultTemplateSelector.idl</DependentUpon>
     </ClCompile>
     <ClCompile Include="Utils.cpp" />
     <ClCompile Include="PreviewConnection.cpp">
@@ -489,7 +525,22 @@
       <DependentUpon>Appearances.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="SettingContainer.idl">
+    <Midl Include="SettingsCard.idl">
+      <SubType>Code</SubType>
+    </Midl>
+    <Midl Include="SettingsExpander.idl">
+      <SubType>Code</SubType>
+    </Midl>
+    <Midl Include="StyleExtensions.idl">
+      <SubType>Code</SubType>
+    </Midl>
+    <Midl Include="ControlSizeTrigger.idl">
+      <SubType>Code</SubType>
+    </Midl>
+    <Midl Include="CornerRadiusFilterConverters.idl">
+      <SubType>Code</SubType>
+    </Midl>
+    <Midl Include="StringDefaultTemplateSelector.idl">
       <SubType>Code</SubType>
     </Midl>
   </ItemGroup>
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
index deb05f24504..ab5829dd221 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
@@ -29,7 +29,12 @@
     <Midl Include="GlobalAppearanceViewModel.idl" />
     <Midl Include="LaunchViewModel.idl" />
     <Midl Include="EnumEntry.idl" />
-    <Midl Include="SettingContainer.idl" />
+    <Midl Include="SettingsCard.idl" />
+    <Midl Include="SettingsExpander.idl" />
+    <Midl Include="StyleExtensions.idl" />
+    <Midl Include="ControlSizeTrigger.idl" />
+    <Midl Include="CornerRadiusFilterConverters.idl" />
+    <Midl Include="StringDefaultTemplateSelector.idl" />
     <Midl Include="TerminalColorConverters.idl" />
     <Midl Include="NewTabMenuViewModel.idl" />
   </ItemGroup>
@@ -52,6 +57,8 @@
     <Page Include="Actions.xaml" />
     <Page Include="EditAction.xaml" />
     <Page Include="SettingContainerStyle.xaml" />
+    <Page Include="SettingsControlsStyle.xaml" />
+    <Page Include="SettingsControlsImplicitStyles.xaml" />
     <Page Include="AddProfile.xaml" />
     <Page Include="KeyChordListener.xaml" />
     <Page Include="NullableColorPicker.xaml" />
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml b/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
index e182408434e..a5656d0e1e8 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
@@ -320,20 +320,25 @@
             <TextBlock x:Uid="NewTabMenu_CurrentFolderTextBlock"
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
             <!--  Name  -->
-            <local:SettingContainer x:Name="CurrentFolderName"
-                                    x:Uid="NewTabMenu_CurrentFolderName"
-                                    CurrentValue="{x:Bind ViewModel.CurrentFolderName, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                         Text="{x:Bind ViewModel.CurrentFolderName, Mode=TwoWay}" />
-            </local:SettingContainer>
+            <local:SettingsExpander x:Name="CurrentFolderName"
+                                    x:Uid="NewTabMenu_CurrentFolderName">
+                <local:SettingsExpander.Content>
+                    <TextBlock Style="{StaticResource SettingContainerCurrentValueTextBlockStyle}"
+                               Text="{x:Bind ViewModel.CurrentFolderName, Mode=OneWay}" />
+                </local:SettingsExpander.Content>
+                <local:SettingsExpander.ItemsHeader>
+                    <ContentPresenter Padding="16,12,16,16">
+                        <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                                 Text="{x:Bind ViewModel.CurrentFolderName, Mode=TwoWay}" />
+                    </ContentPresenter>
+                </local:SettingsExpander.ItemsHeader>
+            </local:SettingsExpander>
 
             <!--  Icon  -->
-            <local:SettingContainer x:Name="CurrentFolderIcon"
+            <local:SettingsExpander x:Name="CurrentFolderIcon"
                                     x:Uid="NewTabMenu_CurrentFolderIcon"
-                                    CurrentValueAccessibleName="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
-                <local:SettingContainer.CurrentValue>
+                                    AutomationProperties.Name="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}">
+                <local:SettingsExpander.Content>
                     <Grid>
                         <ContentControl Width="16"
                                         Height="16"
@@ -348,38 +353,42 @@
                                    Text="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}"
                                    Visibility="{x:Bind ViewModel.CurrentFolderUsingNoIcon, Mode=OneWay}" />
                     </Grid>
-                </local:SettingContainer.CurrentValue>
-                <local:SettingContainer.Content>
-                    <local:IconPicker CurrentIconPath="{x:Bind ViewModel.CurrentFolderIconPath, Mode=TwoWay}"
-                                      WindowRoot="{x:Bind WindowRoot, Mode=OneWay}" />
-                </local:SettingContainer.Content>
-            </local:SettingContainer>
+                </local:SettingsExpander.Content>
+                <local:SettingsExpander.ItemsHeader>
+                    <ContentPresenter Padding="16,12,16,16">
+                        <local:IconPicker CurrentIconPath="{x:Bind ViewModel.CurrentFolderIconPath, Mode=TwoWay}"
+                                          WindowRoot="{x:Bind WindowRoot, Mode=OneWay}" />
+                    </ContentPresenter>
+                </local:SettingsExpander.ItemsHeader>
+            </local:SettingsExpander>
 
             <!--  Inlining  -->
-            <local:SettingContainer x:Name="CurrentFolderInlining"
-                                    x:Uid="NewTabMenu_CurrentFolderInlining">
+            <local:SettingsCard x:Name="CurrentFolderInlining"
+                                x:Uid="NewTabMenu_CurrentFolderInlining">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderInlining, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Allow Empty  -->
-            <local:SettingContainer x:Name="CurrentFolderAllowEmpty"
-                                    x:Uid="NewTabMenu_CurrentFolderAllowEmpty">
+            <local:SettingsCard x:Name="CurrentFolderAllowEmpty"
+                                x:Uid="NewTabMenu_CurrentFolderAllowEmpty">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.CurrentFolderAllowEmpty, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
         </StackPanel>
 
         <!--  Add Entries  -->
-        <StackPanel Grid.Row="2">
+        <StackPanel Grid.Row="2"
+                    MaxWidth="{StaticResource StandardControlMaxWidth}">
             <TextBlock x:Uid="NewTabMenu_AddEntriesTextBlock"
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
 
             <!--  Add Profile  -->
-            <local:SettingContainer x:Name="AddProfile"
-                                    x:Uid="NewTabMenu_AddProfile"
-                                    FontIconGlyph="&#xE756;"
-                                    Style="{StaticResource SettingContainerWithIcon}">
+            <local:SettingsCard x:Name="AddProfile"
+                                x:Uid="NewTabMenu_AddProfile">
+                <local:SettingsCard.HeaderIcon>
+                    <FontIcon Glyph="&#xE756;" />
+                </local:SettingsCard.HeaderIcon>
 
                 <StackPanel Orientation="Horizontal"
                             Spacing="4">
@@ -423,13 +432,14 @@
                         </Button.Content>
                     </Button>
                 </StackPanel>
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Add Separator  -->
-            <local:SettingContainer x:Name="AddSeparator"
-                                    x:Uid="NewTabMenu_AddSeparator"
-                                    FontIconGlyph="&#xE76f;"
-                                    Style="{StaticResource SettingContainerWithIcon}">
+            <local:SettingsCard x:Name="AddSeparator"
+                                x:Uid="NewTabMenu_AddSeparator">
+                <local:SettingsCard.HeaderIcon>
+                    <FontIcon Glyph="&#xE76f;" />
+                </local:SettingsCard.HeaderIcon>
                 <Button x:Name="AddSeparatorButton"
                         x:Uid="NewTabMenu_AddSeparatorButton"
                         HorizontalAlignment="Stretch"
@@ -440,13 +450,14 @@
                                   Glyph="&#xE710;" />
                     </Button.Content>
                 </Button>
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Add Folder  -->
-            <local:SettingContainer x:Name="AddFolder"
-                                    x:Uid="NewTabMenu_AddFolder"
-                                    FontIconGlyph="&#xF12B;"
-                                    Style="{StaticResource SettingContainerWithIcon}">
+            <local:SettingsCard x:Name="AddFolder"
+                                x:Uid="NewTabMenu_AddFolder">
+                <local:SettingsCard.HeaderIcon>
+                    <FontIcon Glyph="&#xF12B;" />
+                </local:SettingsCard.HeaderIcon>
                 <StackPanel Orientation="Horizontal"
                             Spacing="5">
                     <TextBox x:Name="FolderNameTextBox"
@@ -467,41 +478,47 @@
                         </Button.Content>
                     </Button>
                 </StackPanel>
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Add Match Profiles  -->
-            <local:SettingContainer x:Name="AddMatchProfiles"
-                                    x:Uid="NewTabMenu_AddMatchProfiles"
-                                    FontIconGlyph="&#xE748;"
-                                    Style="{StaticResource ExpanderSettingContainerStyleWithIcon}">
-                <StackPanel Spacing="8">
-                    <HyperlinkButton x:Uid="NewTabMenu_AddMatchProfiles_Help"
-                                     NavigateUri="https://learn.microsoft.com/en-us/dotnet/standard/base-types/regular-expression-language-quick-reference" />
-                    <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Name"
-                             Text="{x:Bind ViewModel.ProfileMatcherName, Mode=TwoWay}" />
-                    <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Source"
-                             Text="{x:Bind ViewModel.ProfileMatcherSource, Mode=TwoWay}" />
-                    <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Commandline"
-                             Text="{x:Bind ViewModel.ProfileMatcherCommandline, Mode=TwoWay}" />
-                    <Button x:Name="AddMatchProfilesButton"
-                            Click="AddMatchProfilesButton_Clicked">
-                        <Button.Content>
-                            <StackPanel Orientation="Horizontal">
-                                <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                          Glyph="&#xE710;" />
-                                <TextBlock x:Uid="NewTabMenu_AddMatchProfilesTextBlock"
-                                           Style="{StaticResource IconButtonTextBlockStyle}" />
-                            </StackPanel>
-                        </Button.Content>
-                    </Button>
-                </StackPanel>
-            </local:SettingContainer>
+            <local:SettingsExpander x:Name="AddMatchProfiles"
+                                    x:Uid="NewTabMenu_AddMatchProfiles">
+                <local:SettingsExpander.HeaderIcon>
+                    <FontIcon Glyph="&#xE748;" />
+                </local:SettingsExpander.HeaderIcon>
+                <local:SettingsExpander.ItemsHeader>
+                    <ContentPresenter Padding="16,12,16,16">
+                        <StackPanel Spacing="8">
+                            <HyperlinkButton x:Uid="NewTabMenu_AddMatchProfiles_Help"
+                                             NavigateUri="https://learn.microsoft.com/en-us/dotnet/standard/base-types/regular-expression-language-quick-reference" />
+                            <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Name"
+                                     Text="{x:Bind ViewModel.ProfileMatcherName, Mode=TwoWay}" />
+                            <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Source"
+                                     Text="{x:Bind ViewModel.ProfileMatcherSource, Mode=TwoWay}" />
+                            <TextBox x:Uid="NewTabMenu_AddMatchProfiles_Commandline"
+                                     Text="{x:Bind ViewModel.ProfileMatcherCommandline, Mode=TwoWay}" />
+                            <Button x:Name="AddMatchProfilesButton"
+                                    Click="AddMatchProfilesButton_Clicked">
+                                <Button.Content>
+                                    <StackPanel Orientation="Horizontal">
+                                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                                  Glyph="&#xE710;" />
+                                        <TextBlock x:Uid="NewTabMenu_AddMatchProfilesTextBlock"
+                                                   Style="{StaticResource IconButtonTextBlockStyle}" />
+                                    </StackPanel>
+                                </Button.Content>
+                            </Button>
+                        </StackPanel>
+                    </ContentPresenter>
+                </local:SettingsExpander.ItemsHeader>
+            </local:SettingsExpander>
 
             <!--  Add Remaining Profiles  -->
-            <local:SettingContainer x:Name="AddRemainingProfiles"
-                                    x:Uid="NewTabMenu_AddRemainingProfiles"
-                                    FontIconGlyph="&#xE902;"
-                                    Style="{StaticResource SettingContainerWithIcon}">
+            <local:SettingsCard x:Name="AddRemainingProfiles"
+                                x:Uid="NewTabMenu_AddRemainingProfiles">
+                <local:SettingsCard.HeaderIcon>
+                    <FontIcon Glyph="&#xE902;" />
+                </local:SettingsCard.HeaderIcon>
                 <Button x:Name="AddRemainingProfilesButton"
                         x:Uid="NewTabMenu_AddRemainingProfilesButton"
                         HorizontalAlignment="Stretch"
@@ -513,7 +530,7 @@
                                   Glyph="&#xE710;" />
                     </Button.Content>
                 </Button>
-            </local:SettingContainer>
+            </local:SettingsCard>
         </StackPanel>
     </Grid>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
index d7e1df4a83c..5243c6fca1d 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
@@ -1,806 +1,901 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "ProfileViewModel.h"
-#include "ProfileViewModel.g.cpp"
-#include "Appearances.h"
-#include "EnumEntry.h"
-#include "IconPicker.h"
-
-#include "../WinRTUtils/inc/Utils.h"
-#include "../../renderer/base/FontCache.h"
-#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
-
-using namespace winrt::Windows::UI::Text;
-using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::UI::Xaml::Data;
-using namespace winrt::Windows::UI::Xaml::Navigation;
-using namespace winrt::Windows::Foundation;
-using namespace winrt::Windows::Foundation::Collections;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    static Editor::Font fontObjectForDWriteFont(IDWriteFontFamily* family, const wchar_t* locale);
-
-    Windows::Foundation::Collections::IObservableVector<Editor::Font> ProfileViewModel::_MonospaceFontList{ nullptr };
-    Windows::Foundation::Collections::IObservableVector<Editor::Font> ProfileViewModel::_FontList{ nullptr };
-
-    ProfileViewModel::ProfileViewModel(const Model::Profile& profile, const Model::CascadiaSettings& appSettings, const Windows::UI::Core::CoreDispatcher& dispatcher) :
-        _profile{ profile },
-        _defaultAppearanceViewModel{ winrt::make<implementation::AppearanceViewModel>(profile.DefaultAppearance().try_as<AppearanceConfig>()) },
-        _originalProfileGuid{ profile.Guid() },
-        _appSettings{ appSettings },
-        _unfocusedAppearanceViewModel{ nullptr },
-        _dispatcher{ dispatcher }
-    {
-        INITIALIZE_BINDABLE_ENUM_SETTING(AntiAliasingMode, TextAntialiasingMode, winrt::Microsoft::Terminal::Control::TextAntialiasingMode, L"Profile_AntialiasingMode", L"Content");
-        INITIALIZE_BINDABLE_ENUM_SETTING_REVERSE_ORDER(CloseOnExitMode, CloseOnExitMode, winrt::Microsoft::Terminal::Settings::Model::CloseOnExitMode, L"Profile_CloseOnExit", L"Content");
-        INITIALIZE_BINDABLE_ENUM_SETTING(ScrollState, ScrollbarState, winrt::Microsoft::Terminal::Control::ScrollbarState, L"Profile_ScrollbarVisibility", L"Content");
-        INITIALIZE_BINDABLE_ENUM_SETTING(PathTranslationStyle, PathTranslationStyle, winrt::Microsoft::Terminal::Control::PathTranslationStyle, L"Profile_PathTranslationStyle", L"Content");
-
-        _InitializeCurrentBellSounds();
-
-        // Add a property changed handler to our own property changed event.
-        // This propagates changes from the settings model to anybody listening to our
-        //  unique view model members.
-        PropertyChanged([this](auto&&, const PropertyChangedEventArgs& args) {
-            const auto viewModelProperty{ args.PropertyName() };
-            if (viewModelProperty == L"IsBaseLayer")
-            {
-                // we _always_ want to show the background image settings in base layer
-                _NotifyChanges(L"BackgroundImageSettingsVisible");
-            }
-            else if (viewModelProperty == L"StartingDirectory")
-            {
-                // notify listener that all starting directory related values might have changed
-                // NOTE: this is similar to what is done with BackgroundImagePath above
-                _NotifyChanges(L"UseParentProcessDirectory", L"CurrentStartingDirectoryPreview");
-            }
-            else if (viewModelProperty == L"AntialiasingMode")
-            {
-                _NotifyChanges(L"CurrentAntiAliasingMode");
-            }
-            else if (viewModelProperty == L"CloseOnExit")
-            {
-                _NotifyChanges(L"CurrentCloseOnExitMode");
-            }
-            else if (viewModelProperty == L"BellStyle")
-            {
-                _NotifyChanges(L"IsBellStyleFlagSet", L"BellStylePreview");
-            }
-            else if (viewModelProperty == L"ScrollState")
-            {
-                _NotifyChanges(L"CurrentScrollState");
-            }
-            else if (viewModelProperty == L"Icon")
-            {
-                // The icon changed; let's re-evaluate it with its new context.
-                _appSettings.ResolveMediaResources();
-
-                // Propagate the rendered icon into a preview (i.e. nav view, container item)
-                _NotifyChanges(L"LocalizedIcon",
-                               L"IconPreview",
-                               L"IconPath",
-                               L"EvaluatedIcon",
-                               L"UsingNoIcon");
-            }
-            else if (viewModelProperty == L"CurrentBellSounds")
-            {
-                // we already have infrastructure in place to
-                // propagate changes from the CurrentBellSounds
-                // to the model. Refer to...
-                // - _InitializeCurrentBellSounds() --> _CurrentBellSounds.VectorChanged()
-                // - RequestAddBellSound()
-                // - RequestDeleteBellSound()
-                _MarkDuplicateBellSoundDirectories();
-                _NotifyChanges(L"BellSoundPreview", L"HasBellSound");
-            }
-            else if (viewModelProperty == L"BellSound")
-            {
-                _InitializeCurrentBellSounds();
-            }
-            else if (viewModelProperty == L"PathTranslationStyle")
-            {
-                _NotifyChanges(L"CurrentPathTranslationStyle");
-            }
-            else if (viewModelProperty == L"Padding")
-            {
-                _parsedPadding = StringToXamlThickness(_profile.Padding());
-                _NotifyChanges(L"LeftPadding", L"TopPadding", L"RightPadding", L"BottomPadding");
-            }
-            else if (viewModelProperty == L"TabTitle")
-            {
-                _NotifyChanges(L"TabTitlePreview");
-            }
-            else if (viewModelProperty == L"AnswerbackMessage")
-            {
-                _NotifyChanges(L"AnswerbackMessagePreview");
-            }
-            else if (viewModelProperty == L"TabColor")
-            {
-                _NotifyChanges(L"TabColorPreview");
-            }
-            else if (viewModelProperty == L"TabThemeColorPreview")
-            {
-                _NotifyChanges(L"TabColorPreview");
-            }
-        });
-
-        _defaultAppearanceViewModel.PropertyChanged([this](auto&&, const PropertyChangedEventArgs& args) {
-            const auto viewModelProperty{ args.PropertyName() };
-            if (viewModelProperty == L"DarkColorSchemeName" || viewModelProperty == L"LightColorSchemeName")
-            {
-                _NotifyChanges(L"TabThemeColorPreview");
-            }
-        });
-
-        // Do the same for the starting directory
-        if (!StartingDirectory().empty())
-        {
-            _lastStartingDirectoryPath = StartingDirectory();
-        }
-
-        // generate the font list, if we don't have one
-        if (!_FontList || !_MonospaceFontList)
-        {
-            UpdateFontList();
-        }
-
-        if (profile.HasUnfocusedAppearance())
-        {
-            _unfocusedAppearanceViewModel = winrt::make<implementation::AppearanceViewModel>(profile.UnfocusedAppearance().try_as<AppearanceConfig>());
-        }
-
-        _parsedPadding = StringToXamlThickness(_profile.Padding());
-        _defaultAppearanceViewModel.IsDefault(true);
-    }
-
-    void ProfileViewModel::LeftPadding(double value) noexcept
-    {
-        if (std::abs(_parsedPadding.Left - value) >= .0001)
-        {
-            _parsedPadding.Left = value;
-            Padding(XamlThicknessToOptimalString(_parsedPadding));
-        }
-    }
-
-    double ProfileViewModel::LeftPadding() const noexcept
-    {
-        return _parsedPadding.Left;
-    }
-
-    void ProfileViewModel::TopPadding(double value) noexcept
-    {
-        if (std::abs(_parsedPadding.Top - value) >= .0001)
-        {
-            _parsedPadding.Top = value;
-            Padding(XamlThicknessToOptimalString(_parsedPadding));
-        }
-    }
-
-    double ProfileViewModel::TopPadding() const noexcept
-    {
-        return _parsedPadding.Top;
-    }
-
-    void ProfileViewModel::RightPadding(double value) noexcept
-    {
-        if (std::abs(_parsedPadding.Right - value) >= .0001)
-        {
-            _parsedPadding.Right = value;
-            Padding(XamlThicknessToOptimalString(_parsedPadding));
-        }
-    }
-
-    double ProfileViewModel::RightPadding() const noexcept
-    {
-        return _parsedPadding.Right;
-    }
-
-    void ProfileViewModel::BottomPadding(double value) noexcept
-    {
-        if (std::abs(_parsedPadding.Bottom - value) >= .0001)
-        {
-            _parsedPadding.Bottom = value;
-            Padding(XamlThicknessToOptimalString(_parsedPadding));
-        }
-    }
-
-    double ProfileViewModel::BottomPadding() const noexcept
-    {
-        return _parsedPadding.Bottom;
-    }
-    Control::IControlSettings ProfileViewModel::TermSettings() const
-    {
-        // This may look pricey, but it only resolves resources that have not been visited
-        // and the preview update is debounced.
-        _appSettings.ResolveMediaResources();
-        return *Settings::TerminalSettings::CreateForPreview(_appSettings, _profile);
-    }
-
-    // Method Description:
-    // - Updates the lists of fonts and sorts them alphabetically
-    void ProfileViewModel::UpdateFontList() noexcept
-    try
-    {
-        // initialize font list
-        std::vector<Editor::Font> fontList;
-        std::vector<Editor::Font> monospaceFontList;
-
-        // get the font collection; subscribe to updates
-        wil::com_ptr<IDWriteFactory> factory;
-        THROW_IF_FAILED(DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(factory), reinterpret_cast<::IUnknown**>(factory.addressof())));
-
-        wil::com_ptr<IDWriteFontCollection> fontCollection;
-        THROW_IF_FAILED(factory->GetSystemFontCollection(fontCollection.addressof(), TRUE));
-
-        wchar_t localeName[LOCALE_NAME_MAX_LENGTH];
-        if (!GetUserDefaultLocaleName(&localeName[0], LOCALE_NAME_MAX_LENGTH))
-        {
-            memcpy(&localeName[0], L"en-US", 12);
-        }
-
-        for (UINT32 i = 0; i < fontCollection->GetFontFamilyCount(); ++i)
-        {
-            try
-            {
-                // get the font family
-                com_ptr<IDWriteFontFamily> fontFamily;
-                THROW_IF_FAILED(fontCollection->GetFontFamily(i, fontFamily.put()));
-
-                // construct a font entry for tracking
-                if (const auto fontEntry{ fontObjectForDWriteFont(fontFamily.get(), &localeName[0]) })
-                {
-                    // check if the font is monospaced
-                    try
-                    {
-                        com_ptr<IDWriteFont> font;
-                        THROW_IF_FAILED(fontFamily->GetFirstMatchingFont(DWRITE_FONT_WEIGHT::DWRITE_FONT_WEIGHT_NORMAL,
-                                                                         DWRITE_FONT_STRETCH::DWRITE_FONT_STRETCH_NORMAL,
-                                                                         DWRITE_FONT_STYLE::DWRITE_FONT_STYLE_NORMAL,
-                                                                         font.put()));
-
-                        // add the font name to our list of monospace fonts
-                        const auto castedFont{ font.try_as<IDWriteFont1>() };
-                        if (castedFont && castedFont->IsMonospacedFont())
-                        {
-                            monospaceFontList.emplace_back(fontEntry);
-                        }
-                    }
-                    CATCH_LOG();
-
-                    // add the font name to our list of all fonts
-                    fontList.emplace_back(std::move(fontEntry));
-                }
-            }
-            CATCH_LOG();
-        }
-
-        const auto comparator = [&](const Editor::Font& lhs, const Editor::Font& rhs) {
-            const auto a = lhs.LocalizedName();
-            const auto b = rhs.LocalizedName();
-            return til::compare_linguistic_insensitive(a, b) < 0;
-        };
-
-        // sort and save the lists
-        std::sort(begin(fontList), end(fontList), comparator);
-        _FontList = single_threaded_observable_vector<Editor::Font>(std::move(fontList));
-
-        std::sort(begin(monospaceFontList), end(monospaceFontList), comparator);
-        _MonospaceFontList = single_threaded_observable_vector<Editor::Font>(std::move(monospaceFontList));
-    }
-    CATCH_LOG();
-
-    static winrt::hstring getLocalizedStringByIndex(IDWriteLocalizedStrings* strings, UINT32 index)
-    {
-        UINT32 length = 0;
-        THROW_IF_FAILED(strings->GetStringLength(index, &length));
-
-        winrt::impl::hstring_builder builder{ length };
-        THROW_IF_FAILED(strings->GetString(index, builder.data(), length + 1));
-
-        return builder.to_hstring();
-    }
-
-    static UINT32 getLocalizedStringIndex(IDWriteLocalizedStrings* strings, const wchar_t* locale, UINT32 fallback)
-    {
-        UINT32 index;
-        BOOL exists;
-        if (FAILED(strings->FindLocaleName(locale, &index, &exists)) || !exists)
-        {
-            index = fallback;
-        }
-        return index;
-    }
-
-    static Editor::Font fontObjectForDWriteFont(IDWriteFontFamily* family, const wchar_t* locale)
-    {
-        wil::com_ptr<IDWriteLocalizedStrings> familyNames;
-        THROW_IF_FAILED(family->GetFamilyNames(familyNames.addressof()));
-
-        // If en-us is missing we fall back to whatever is at index 0.
-        const auto ci = getLocalizedStringIndex(familyNames.get(), L"en-US", 0);
-        // If our locale is missing we fall back to en-us.
-        const auto li = getLocalizedStringIndex(familyNames.get(), locale, ci);
-
-        auto canonical = getLocalizedStringByIndex(familyNames.get(), ci);
-        // If the canonical/localized indices are the same, there's no need to get the other string.
-        auto localized = ci == li ? canonical : getLocalizedStringByIndex(familyNames.get(), li);
-
-        return make<Font>(std::move(canonical), std::move(localized));
-    }
-
-    winrt::guid ProfileViewModel::OriginalProfileGuid() const noexcept
-    {
-        return _originalProfileGuid;
-    }
-
-    bool ProfileViewModel::CanDeleteProfile() const
-    {
-        return !IsBaseLayer();
-    }
-
-    bool ProfileViewModel::Orphaned() const
-    {
-        return _profile.Orphaned();
-    }
-
-    hstring ProfileViewModel::TabTitlePreview() const
-    {
-        if (const auto tabTitle{ TabTitle() }; !tabTitle.empty())
-        {
-            return tabTitle;
-        }
-        return RS_(L"Profile_TabTitleNone");
-    }
-
-    hstring ProfileViewModel::AnswerbackMessagePreview() const
-    {
-        if (const auto answerbackMessage{ AnswerbackMessage() }; !answerbackMessage.empty())
-        {
-            return answerbackMessage;
-        }
-        return RS_(L"Profile_AnswerbackMessageNone");
-    }
-
-    Windows::UI::Color ProfileViewModel::TabColorPreview() const
-    {
-        if (const auto modelVal = _profile.TabColor())
-        {
-            const auto color = modelVal.Value();
-            // user defined an override value
-            return Windows::UI::Color{
-                .A = 255,
-                .R = color.R,
-                .G = color.G,
-                .B = color.B
-            };
-        }
-        // set to null --> deduce value from theme
-        return TabThemeColorPreview();
-    }
-
-    Windows::UI::Color ProfileViewModel::TabThemeColorPreview() const
-    {
-        const auto currentTheme = _appSettings.GlobalSettings().CurrentTheme();
-        if (const auto tabTheme = currentTheme.Tab())
-        {
-            // theme.tab.background: theme color must be evaluated
-            if (const auto tabBackground = tabTheme.Background())
-            {
-                const auto& tabBrush = tabBackground.Evaluate(Application::Current().Resources(),
-                                                              Windows::UI::Xaml::Media::SolidColorBrush{ DefaultAppearance().CurrentColorScheme().BackgroundColor().Color() },
-                                                              false);
-                if (const auto& tabColorBrush = tabBrush.try_as<Windows::UI::Xaml::Media::SolidColorBrush>())
-                {
-                    const auto brushColor = tabColorBrush.Color();
-                    return brushColor;
-                }
-            }
-        }
-        else if (const auto windowTheme = currentTheme.Window())
-        {
-            // theme.window.applicationTheme: evaluate light/dark to XAML default tab color
-            // Can also be "Default", in which case we fall through below
-            const auto appTheme = windowTheme.RequestedTheme();
-            if (appTheme == ElementTheme::Dark)
-            {
-                return Windows::UI::Color{
-                    .A = 0xFF,
-                    .R = 0x28,
-                    .G = 0x28,
-                    .B = 0x28
-                };
-            }
-            else if (appTheme == ElementTheme::Light)
-            {
-                return Windows::UI::Color{
-                    .A = 0xFF,
-                    .R = 0xF9,
-                    .G = 0xF9,
-                    .B = 0xF9
-                };
-            }
-        }
-
-        // XAML default tab color
-        if (Model::Theme::IsSystemInDarkTheme())
-        {
-            return Windows::UI::Color{
-                .A = 0xFF,
-                .R = 0x28,
-                .G = 0x28,
-                .B = 0x28
-            };
-        }
-        return Windows::UI::Color{
-            .A = 0xFF,
-            .R = 0xF9,
-            .G = 0xF9,
-            .B = 0xF9
-        };
-    }
-
-    Editor::AppearanceViewModel ProfileViewModel::DefaultAppearance() const
-    {
-        return _defaultAppearanceViewModel;
-    }
-
-    bool ProfileViewModel::HasUnfocusedAppearance()
-    {
-        return _profile.HasUnfocusedAppearance();
-    }
-
-    bool ProfileViewModel::EditableUnfocusedAppearance() const noexcept
-    {
-        return Feature_EditableUnfocusedAppearance::IsEnabled();
-    }
-
-    bool ProfileViewModel::ShowUnfocusedAppearance()
-    {
-        return EditableUnfocusedAppearance() && HasUnfocusedAppearance();
-    }
-
-    void ProfileViewModel::CreateUnfocusedAppearance()
-    {
-        _profile.CreateUnfocusedAppearance();
-
-        _unfocusedAppearanceViewModel = winrt::make<implementation::AppearanceViewModel>(_profile.UnfocusedAppearance().try_as<AppearanceConfig>());
-        _unfocusedAppearanceViewModel.SchemesList(DefaultAppearance().SchemesList());
-
-        _NotifyChanges(L"UnfocusedAppearance", L"HasUnfocusedAppearance", L"ShowUnfocusedAppearance");
-    }
-
-    void ProfileViewModel::DeleteUnfocusedAppearance()
-    {
-        _profile.DeleteUnfocusedAppearance();
-
-        _unfocusedAppearanceViewModel = nullptr;
-
-        _NotifyChanges(L"UnfocusedAppearance", L"HasUnfocusedAppearance", L"ShowUnfocusedAppearance");
-    }
-
-    Editor::AppearanceViewModel ProfileViewModel::UnfocusedAppearance() const
-    {
-        return _unfocusedAppearanceViewModel;
-    }
-
-    bool ProfileViewModel::ShowMarksAvailable() const noexcept
-    {
-        return Feature_ScrollbarMarks::IsEnabled();
-    }
-    bool ProfileViewModel::AutoMarkPromptsAvailable() const noexcept
-    {
-        return Feature_ScrollbarMarks::IsEnabled();
-    }
-    bool ProfileViewModel::RepositionCursorWithMouseAvailable() const noexcept
-    {
-        return Feature_ScrollbarMarks::IsEnabled();
-    }
-
-    hstring ProfileViewModel::CurrentStartingDirectoryPreview() const
-    {
-        if (UseParentProcessDirectory())
-        {
-            return RS_(L"Profile_StartingDirectoryUseParentCheckbox/Content");
-        }
-        return StartingDirectory();
-    }
-
-    bool ProfileViewModel::UseParentProcessDirectory() const
-    {
-        return StartingDirectory().empty();
-    }
-
-    void ProfileViewModel::UseParentProcessDirectory(const bool useParent)
-    {
-        if (useParent)
-        {
-            // Stash the current value of StartingDirectory. If the user
-            // checks and un-checks the "Use parent process directory" button, we want
-            // the path that we display in the text box to remain unchanged.
-            //
-            // Only stash this value if it's not empty
-            if (!StartingDirectory().empty())
-            {
-                _lastStartingDirectoryPath = StartingDirectory();
-            }
-            StartingDirectory(L"");
-        }
-        else
-        {
-            // Restore the path we had previously cached as long as it wasn't empty
-            // If it was empty, set the starting directory to %USERPROFILE%
-            // (we need to set it to something non-empty otherwise we will automatically
-            // disable the text box)
-            if (_lastStartingDirectoryPath.empty())
-            {
-                StartingDirectory(L"%USERPROFILE%");
-            }
-            else
-            {
-                StartingDirectory(_lastStartingDirectoryPath);
-            }
-        }
-    }
-
-    winrt::hstring ProfileViewModel::LocalizedIcon() const
-    {
-        if (UsingNoIcon())
-        {
-            return RS_(L"IconPicker_IconTypeNone");
-        }
-        return IconPath(); // For display as a string
-    }
-
-    Windows::UI::Xaml::Controls::IconElement ProfileViewModel::IconPreview() const
-    {
-        // IconWUX sets the icon width/height to 32 by default
-        auto icon = Microsoft::Terminal::UI::IconPathConverter::IconWUX(EvaluatedIcon());
-        icon.Width(16);
-        icon.Height(16);
-        return icon;
-    }
-
-    bool ProfileViewModel::UsingNoIcon() const noexcept
-    {
-        const auto iconPath{ IconPath() };
-        return iconPath.empty() || iconPath == IconPicker::HideIconValue;
-    }
-
-    hstring ProfileViewModel::BellStylePreview() const
-    {
-        const auto bellStyle = BellStyle();
-        if (WI_AreAllFlagsSet(bellStyle, BellStyle::Audible | BellStyle::Window | BellStyle::Taskbar | BellStyle::Notification))
-        {
-            return RS_(L"Profile_BellStyleAll/Content");
-        }
-        else if (bellStyle == static_cast<Model::BellStyle>(0))
-        {
-            return RS_(L"Profile_BellStyleNone/Content");
-        }
-
-        std::vector<hstring> resultList;
-        resultList.reserve(4);
-        if (WI_IsFlagSet(bellStyle, BellStyle::Audible))
-        {
-            resultList.emplace_back(RS_(L"Profile_BellStyleAudible/Content"));
-        }
-        if (WI_IsFlagSet(bellStyle, BellStyle::Window))
-        {
-            resultList.emplace_back(RS_(L"Profile_BellStyleWindow/Content"));
-        }
-        if (WI_IsFlagSet(bellStyle, BellStyle::Taskbar))
-        {
-            resultList.emplace_back(RS_(L"Profile_BellStyleTaskbar/Content"));
-        }
-        if (WI_IsFlagSet(bellStyle, BellStyle::Notification))
-        {
-            resultList.emplace_back(RS_(L"Profile_BellStyleNotification/Content"));
-        }
-
-        // add in the commas
-        hstring result{};
-        for (auto&& entry : resultList)
-        {
-            if (result.empty())
-            {
-                result = entry;
-            }
-            else
-            {
-                result = result + L", " + entry;
-            }
-        }
-        return result;
-    }
-
-    bool ProfileViewModel::IsBellStyleFlagSet(const uint32_t flag)
-    {
-        return (WI_EnumValue(BellStyle()) & flag) == flag;
-    }
-
-    void ProfileViewModel::SetBellStyleAudible(winrt::Windows::Foundation::IReference<bool> on)
-    {
-        auto currentStyle = BellStyle();
-        WI_UpdateFlag(currentStyle, Model::BellStyle::Audible, winrt::unbox_value<bool>(on));
-        BellStyle(currentStyle);
-    }
-
-    void ProfileViewModel::SetBellStyleWindow(winrt::Windows::Foundation::IReference<bool> on)
-    {
-        auto currentStyle = BellStyle();
-        WI_UpdateFlag(currentStyle, Model::BellStyle::Window, winrt::unbox_value<bool>(on));
-        BellStyle(currentStyle);
-    }
-
-    void ProfileViewModel::SetBellStyleTaskbar(winrt::Windows::Foundation::IReference<bool> on)
-    {
-        auto currentStyle = BellStyle();
-        WI_UpdateFlag(currentStyle, Model::BellStyle::Taskbar, winrt::unbox_value<bool>(on));
-        BellStyle(currentStyle);
-    }
-
-    void ProfileViewModel::SetBellStyleNotification(winrt::Windows::Foundation::IReference<bool> on)
-    {
-        auto currentStyle = BellStyle();
-        WI_UpdateFlag(currentStyle, Model::BellStyle::Notification, winrt::unbox_value<bool>(on));
-        BellStyle(currentStyle);
-    }
-
-    // Method Description:
-    // - Construct _CurrentBellSounds by importing the _inherited_ value from the model
-    // - Adds a PropertyChanged handler to each BellSoundViewModel to propagate changes to the model
-    void ProfileViewModel::_InitializeCurrentBellSounds()
-    {
-        _CurrentBellSounds = winrt::single_threaded_observable_vector<Editor::BellSoundViewModel>();
-        if (const auto soundList = _profile.BellSound())
-        {
-            for (const auto&& bellSound : soundList)
-            {
-                _CurrentBellSounds.Append(winrt::make<BellSoundViewModel>(bellSound));
-            }
-        }
-        _MarkDuplicateBellSoundDirectories();
-        _NotifyChanges(L"CurrentBellSounds");
-    }
-
-    // Method Description:
-    // - If the current layer is inheriting the bell sound from its parent,
-    //   we need to copy the _inherited_ bell sound list to the current layer
-    //   so that we can then apply modifications to it
-    void ProfileViewModel::_PrepareModelForBellSoundModification()
-    {
-        if (!_profile.HasBellSound())
-        {
-            std::vector<IMediaResource> newSounds;
-            if (const auto inheritedSounds = _profile.BellSound())
-            {
-                newSounds = wil::to_vector(inheritedSounds);
-            }
-            // if we didn't inherit any bell sounds,
-            // we should still set the bell sound to an empty list (instead of null)
-            _profile.BellSound(winrt::single_threaded_vector(std::move(newSounds)));
-        }
-    }
-
-    // Method Description:
-    // - Check if any bell sounds share the same name.
-    //   If they do, mark them so that they show the directory path in the UI
-    void ProfileViewModel::_MarkDuplicateBellSoundDirectories()
-    {
-        for (uint32_t i = 0; i < _CurrentBellSounds.Size(); i++)
-        {
-            auto soundA = _CurrentBellSounds.GetAt(i);
-            for (uint32_t j = i + 1; j < _CurrentBellSounds.Size(); j++)
-            {
-                auto soundB = _CurrentBellSounds.GetAt(j);
-                if (soundA.DisplayPath() == soundB.DisplayPath())
-                {
-                    get_self<BellSoundViewModel>(soundA)->ShowDirectory(true);
-                    get_self<BellSoundViewModel>(soundB)->ShowDirectory(true);
-                }
-            }
-        }
-    }
-
-    BellSoundViewModel::BellSoundViewModel(const Model::IMediaResource& resource) :
-        _resource{ resource }
-    {
-        if (_resource.Ok() && _resource.Path() != _resource.Resolved())
-        {
-            // If the resource was resolved to something other than its path, show the path!
-            _ShowDirectory = true;
-        }
-    }
-
-    hstring BellSoundViewModel::DisplayPath() const
-    {
-        if (_resource.Ok())
-        {
-            // filename; start from the resolved path to show where it actually landed
-            auto resolvedPath{ _resource.Resolved() };
-            const std::filesystem::path filePath{ std::wstring_view{ resolvedPath } };
-            return hstring{ filePath.filename().wstring() };
-        }
-        return _resource.Path();
-    }
-
-    hstring BellSoundViewModel::SubText() const
-    {
-        if (_resource.Ok())
-        {
-            // Directory
-            auto resolvedPath{ _resource.Resolved() };
-            const std::filesystem::path filePath{ std::wstring_view{ resolvedPath } };
-            return hstring{ filePath.parent_path().wstring() };
-        }
-        return RS_(L"Profile_BellSoundNotFound");
-    }
-
-    hstring ProfileViewModel::BellSoundPreview()
-    {
-        if (!_CurrentBellSounds || _CurrentBellSounds.Size() == 0)
-        {
-            return RS_(L"Profile_BellSoundPreviewDefault");
-        }
-        if (_CurrentBellSounds.Size() > 1)
-        {
-            return RS_(L"Profile_BellSoundPreviewMultiple");
-        }
-
-        const auto currentBellSound = _CurrentBellSounds.GetAt(0);
-        if (currentBellSound.FileExists())
-        {
-            return currentBellSound.DisplayPath();
-        }
-
-        return RS_(L"Profile_BellSoundNotFound");
-    }
-
-    void ProfileViewModel::RequestAddBellSound(hstring path)
-    {
-        // If we were inheriting our bell sound,
-        // copy it over to the current layer and apply modifications
-        _PrepareModelForBellSoundModification();
-
-        auto bellResource{ MediaResourceHelper::FromString(path) };
-        bellResource.Resolve(path); // No need to check if the file exists. We came from the FilePicker. That's good enough.
-        _CurrentBellSounds.Append(winrt::make<BellSoundViewModel>(bellResource));
-        _profile.BellSound().Append(bellResource);
-        _NotifyChanges(L"CurrentBellSounds");
-    }
-
-    void ProfileViewModel::RequestDeleteBellSound(const Editor::BellSoundViewModel& vm)
-    {
-        uint32_t index;
-        if (_CurrentBellSounds.IndexOf(vm, index))
-        {
-            // If we were inheriting our bell sound,
-            // copy it over to the current layer and apply modifications
-            _PrepareModelForBellSoundModification();
-
-            _CurrentBellSounds.RemoveAt(index);
-            _profile.BellSound().RemoveAt(index);
-            _NotifyChanges(L"CurrentBellSounds");
-        }
-    }
-
-    void ProfileViewModel::DeleteProfile()
-    {
-        const auto deleteProfileArgs{ winrt::make_self<DeleteProfileEventArgs>(Guid()) };
-        DeleteProfileRequested.raise(*this, *deleteProfileArgs);
-    }
-
-    void ProfileViewModel::SetupAppearances(Windows::Foundation::Collections::IObservableVector<Editor::ColorSchemeViewModel> schemesList)
-    {
-        DefaultAppearance().SchemesList(schemesList);
-        if (UnfocusedAppearance())
-        {
-            UnfocusedAppearance().SchemesList(schemesList);
-        }
-    }
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "ProfileViewModel.h"
+#include "ProfileViewModel.g.cpp"
+#include "Appearances.h"
+#include "EnumEntry.h"
+#include "IconPicker.h"
+
+#include "../WinRTUtils/inc/Utils.h"
+#include "../../renderer/base/FontCache.h"
+#include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
+
+using namespace winrt::Windows::UI::Text;
+using namespace winrt::Windows::UI::Xaml;
+using namespace winrt::Windows::UI::Xaml::Controls;
+using namespace winrt::Windows::UI::Xaml::Data;
+using namespace winrt::Windows::UI::Xaml::Navigation;
+using namespace winrt::Windows::Foundation;
+using namespace winrt::Windows::Foundation::Collections;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    static Editor::Font fontObjectForDWriteFont(IDWriteFontFamily* family, const wchar_t* locale);
+
+    Windows::Foundation::Collections::IObservableVector<Editor::Font> ProfileViewModel::_MonospaceFontList{ nullptr };
+    Windows::Foundation::Collections::IObservableVector<Editor::Font> ProfileViewModel::_FontList{ nullptr };
+
+    ProfileViewModel::ProfileViewModel(const Model::Profile& profile, const Model::CascadiaSettings& appSettings, const Windows::UI::Core::CoreDispatcher& dispatcher) :
+        _profile{ profile },
+        _defaultAppearanceViewModel{ nullptr },
+        _originalProfileGuid{ profile.Guid() },
+        _appSettings{ appSettings },
+        _unfocusedAppearanceViewModel{ nullptr },
+        _dispatcher{ dispatcher }
+    {
+        INITIALIZE_BINDABLE_ENUM_SETTING(AntiAliasingMode, TextAntialiasingMode, winrt::Microsoft::Terminal::Control::TextAntialiasingMode, L"Profile_AntialiasingMode", L"Content");
+        INITIALIZE_BINDABLE_ENUM_SETTING_REVERSE_ORDER(CloseOnExitMode, CloseOnExitMode, winrt::Microsoft::Terminal::Settings::Model::CloseOnExitMode, L"Profile_CloseOnExit", L"Content");
+        INITIALIZE_BINDABLE_ENUM_SETTING(ScrollState, ScrollbarState, winrt::Microsoft::Terminal::Control::ScrollbarState, L"Profile_ScrollbarVisibility", L"Content");
+        INITIALIZE_BINDABLE_ENUM_SETTING(PathTranslationStyle, PathTranslationStyle, winrt::Microsoft::Terminal::Control::PathTranslationStyle, L"Profile_PathTranslationStyle", L"Content");
+
+        _RefreshDefaultAppearanceViewModel();
+        _InitializeCurrentBellSounds();
+
+        // Add a property changed handler to our own property changed event.
+        // This propagates changes from the settings model to anybody listening to our
+        //  unique view model members.
+        PropertyChanged([this](auto&&, const PropertyChangedEventArgs& args) {
+            const auto viewModelProperty{ args.PropertyName() };
+            if (viewModelProperty == L"IsBaseLayer")
+            {
+                // we _always_ want to show the background image settings in base layer
+                _NotifyChanges(L"BackgroundImageSettingsEnabled");
+            }
+            else if (viewModelProperty == L"StartingDirectory")
+            {
+                // notify listener that all starting directory related values might have changed
+                // NOTE: this is similar to what is done with BackgroundImagePath above
+                _NotifyChanges(L"UseParentProcessDirectory", L"CurrentStartingDirectoryPreview");
+            }
+            else if (viewModelProperty == L"AntialiasingMode")
+            {
+                _NotifyChanges(L"CurrentAntiAliasingMode");
+            }
+            else if (viewModelProperty == L"CloseOnExit")
+            {
+                _NotifyChanges(L"CurrentCloseOnExitMode");
+            }
+            else if (viewModelProperty == L"BellStyle")
+            {
+                _NotifyChanges(L"IsBellStyleFlagSet", L"BellStylePreview");
+            }
+            else if (viewModelProperty == L"ScrollState")
+            {
+                _NotifyChanges(L"CurrentScrollState");
+            }
+            else if (viewModelProperty == L"Icon")
+            {
+                // The icon changed; let's re-evaluate it with its new context.
+                _appSettings.ResolveMediaResources();
+
+                // Propagate the rendered icon into a preview (i.e. nav view, container item)
+                _NotifyChanges(L"LocalizedIcon",
+                               L"IconPreview",
+                               L"IconPath",
+                               L"EvaluatedIcon",
+                               L"UsingNoIcon");
+            }
+            else if (viewModelProperty == L"CurrentBellSounds")
+            {
+                // we already have infrastructure in place to
+                // propagate changes from the CurrentBellSounds
+                // to the model. Refer to...
+                // - _InitializeCurrentBellSounds() --> _CurrentBellSounds.VectorChanged()
+                // - RequestAddBellSound()
+                // - RequestDeleteBellSound()
+                _MarkDuplicateBellSoundDirectories();
+                _NotifyChanges(L"BellSoundPreview", L"HasBellSound");
+            }
+            else if (viewModelProperty == L"BellSound")
+            {
+                _InitializeCurrentBellSounds();
+            }
+            else if (viewModelProperty == L"PathTranslationStyle")
+            {
+                _NotifyChanges(L"CurrentPathTranslationStyle");
+            }
+            else if (viewModelProperty == L"Padding")
+            {
+                _parsedPadding = StringToXamlThickness(_profile.Padding());
+                _NotifyChanges(L"LeftPadding", L"TopPadding", L"RightPadding", L"BottomPadding");
+            }
+            else if (viewModelProperty == L"TabTitle")
+            {
+                _NotifyChanges(L"TabTitlePreview");
+            }
+            else if (viewModelProperty == L"AnswerbackMessage")
+            {
+                _NotifyChanges(L"AnswerbackMessagePreview");
+            }
+            else if (viewModelProperty == L"TabColor")
+            {
+                _NotifyChanges(L"TabColorPreview");
+            }
+            else if (viewModelProperty == L"TabThemeColorPreview")
+            {
+                _NotifyChanges(L"TabColorPreview");
+            }
+        });
+
+        // Do the same for the starting directory
+        if (!StartingDirectory().empty())
+        {
+            _lastStartingDirectoryPath = StartingDirectory();
+        }
+
+        // generate the font list, if we don't have one
+        if (!_FontList || !_MonospaceFontList)
+        {
+            UpdateFontList();
+        }
+
+        if (profile.HasUnfocusedAppearance())
+        {
+            _unfocusedAppearanceViewModel = winrt::make<implementation::AppearanceViewModel>(profile.UnfocusedAppearance().try_as<AppearanceConfig>());
+        }
+
+        _parsedPadding = StringToXamlThickness(_profile.Padding());
+    }
+
+    void ProfileViewModel::LeftPadding(double value) noexcept
+    {
+        if (std::abs(_parsedPadding.Left - value) >= .0001)
+        {
+            _parsedPadding.Left = value;
+            Padding(XamlThicknessToOptimalString(_parsedPadding));
+        }
+    }
+
+    double ProfileViewModel::LeftPadding() const noexcept
+    {
+        return _parsedPadding.Left;
+    }
+
+    void ProfileViewModel::TopPadding(double value) noexcept
+    {
+        if (std::abs(_parsedPadding.Top - value) >= .0001)
+        {
+            _parsedPadding.Top = value;
+            Padding(XamlThicknessToOptimalString(_parsedPadding));
+        }
+    }
+
+    double ProfileViewModel::TopPadding() const noexcept
+    {
+        return _parsedPadding.Top;
+    }
+
+    void ProfileViewModel::RightPadding(double value) noexcept
+    {
+        if (std::abs(_parsedPadding.Right - value) >= .0001)
+        {
+            _parsedPadding.Right = value;
+            Padding(XamlThicknessToOptimalString(_parsedPadding));
+        }
+    }
+
+    double ProfileViewModel::RightPadding() const noexcept
+    {
+        return _parsedPadding.Right;
+    }
+
+    void ProfileViewModel::BottomPadding(double value) noexcept
+    {
+        if (std::abs(_parsedPadding.Bottom - value) >= .0001)
+        {
+            _parsedPadding.Bottom = value;
+            Padding(XamlThicknessToOptimalString(_parsedPadding));
+        }
+    }
+
+    double ProfileViewModel::BottomPadding() const noexcept
+    {
+        return _parsedPadding.Bottom;
+    }
+    Control::IControlSettings ProfileViewModel::TermSettings() const
+    {
+        // This may look pricey, but it only resolves resources that have not been visited
+        // and the preview update is debounced.
+        _appSettings.ResolveMediaResources();
+        return *Settings::TerminalSettings::CreateForPreview(_appSettings, _profile);
+    }
+
+    // Method Description:
+    // - Updates the lists of fonts and sorts them alphabetically
+    void ProfileViewModel::UpdateFontList() noexcept
+    try
+    {
+        // initialize font list
+        std::vector<Editor::Font> fontList;
+        std::vector<Editor::Font> monospaceFontList;
+
+        // get the font collection; subscribe to updates
+        wil::com_ptr<IDWriteFactory> factory;
+        THROW_IF_FAILED(DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(factory), reinterpret_cast<::IUnknown**>(factory.addressof())));
+
+        wil::com_ptr<IDWriteFontCollection> fontCollection;
+        THROW_IF_FAILED(factory->GetSystemFontCollection(fontCollection.addressof(), TRUE));
+
+        wchar_t localeName[LOCALE_NAME_MAX_LENGTH];
+        if (!GetUserDefaultLocaleName(&localeName[0], LOCALE_NAME_MAX_LENGTH))
+        {
+            memcpy(&localeName[0], L"en-US", 12);
+        }
+
+        for (UINT32 i = 0; i < fontCollection->GetFontFamilyCount(); ++i)
+        {
+            try
+            {
+                // get the font family
+                com_ptr<IDWriteFontFamily> fontFamily;
+                THROW_IF_FAILED(fontCollection->GetFontFamily(i, fontFamily.put()));
+
+                // construct a font entry for tracking
+                if (const auto fontEntry{ fontObjectForDWriteFont(fontFamily.get(), &localeName[0]) })
+                {
+                    // check if the font is monospaced
+                    try
+                    {
+                        com_ptr<IDWriteFont> font;
+                        THROW_IF_FAILED(fontFamily->GetFirstMatchingFont(DWRITE_FONT_WEIGHT::DWRITE_FONT_WEIGHT_NORMAL,
+                                                                         DWRITE_FONT_STRETCH::DWRITE_FONT_STRETCH_NORMAL,
+                                                                         DWRITE_FONT_STYLE::DWRITE_FONT_STYLE_NORMAL,
+                                                                         font.put()));
+
+                        // add the font name to our list of monospace fonts
+                        const auto castedFont{ font.try_as<IDWriteFont1>() };
+                        if (castedFont && castedFont->IsMonospacedFont())
+                        {
+                            monospaceFontList.emplace_back(fontEntry);
+                        }
+                    }
+                    CATCH_LOG();
+
+                    // add the font name to our list of all fonts
+                    fontList.emplace_back(std::move(fontEntry));
+                }
+            }
+            CATCH_LOG();
+        }
+
+        const auto comparator = [&](const Editor::Font& lhs, const Editor::Font& rhs) {
+            const auto a = lhs.LocalizedName();
+            const auto b = rhs.LocalizedName();
+            return til::compare_linguistic_insensitive(a, b) < 0;
+        };
+
+        // sort and save the lists
+        std::sort(begin(fontList), end(fontList), comparator);
+        _FontList = single_threaded_observable_vector<Editor::Font>(std::move(fontList));
+
+        std::sort(begin(monospaceFontList), end(monospaceFontList), comparator);
+        _MonospaceFontList = single_threaded_observable_vector<Editor::Font>(std::move(monospaceFontList));
+    }
+    CATCH_LOG();
+
+    static winrt::hstring getLocalizedStringByIndex(IDWriteLocalizedStrings* strings, UINT32 index)
+    {
+        UINT32 length = 0;
+        THROW_IF_FAILED(strings->GetStringLength(index, &length));
+
+        winrt::impl::hstring_builder builder{ length };
+        THROW_IF_FAILED(strings->GetString(index, builder.data(), length + 1));
+
+        return builder.to_hstring();
+    }
+
+    static UINT32 getLocalizedStringIndex(IDWriteLocalizedStrings* strings, const wchar_t* locale, UINT32 fallback)
+    {
+        UINT32 index;
+        BOOL exists;
+        if (FAILED(strings->FindLocaleName(locale, &index, &exists)) || !exists)
+        {
+            index = fallback;
+        }
+        return index;
+    }
+
+    static Editor::Font fontObjectForDWriteFont(IDWriteFontFamily* family, const wchar_t* locale)
+    {
+        wil::com_ptr<IDWriteLocalizedStrings> familyNames;
+        THROW_IF_FAILED(family->GetFamilyNames(familyNames.addressof()));
+
+        // If en-us is missing we fall back to whatever is at index 0.
+        const auto ci = getLocalizedStringIndex(familyNames.get(), L"en-US", 0);
+        // If our locale is missing we fall back to en-us.
+        const auto li = getLocalizedStringIndex(familyNames.get(), locale, ci);
+
+        auto canonical = getLocalizedStringByIndex(familyNames.get(), ci);
+        // If the canonical/localized indices are the same, there's no need to get the other string.
+        auto localized = ci == li ? canonical : getLocalizedStringByIndex(familyNames.get(), li);
+
+        return make<Font>(std::move(canonical), std::move(localized));
+    }
+
+    winrt::guid ProfileViewModel::OriginalProfileGuid() const noexcept
+    {
+        return _originalProfileGuid;
+    }
+
+    bool ProfileViewModel::CanDeleteProfile() const
+    {
+        return !IsBaseLayer();
+    }
+
+    bool ProfileViewModel::Orphaned() const
+    {
+        return _profile.Orphaned();
+    }
+
+    hstring ProfileViewModel::TabTitlePreview() const
+    {
+        if (const auto tabTitle{ TabTitle() }; !tabTitle.empty())
+        {
+            return tabTitle;
+        }
+        return RS_(L"Profile_TabTitleNone");
+    }
+
+    hstring ProfileViewModel::AnswerbackMessagePreview() const
+    {
+        if (const auto answerbackMessage{ AnswerbackMessage() }; !answerbackMessage.empty())
+        {
+            return answerbackMessage;
+        }
+        return RS_(L"Profile_AnswerbackMessageNone");
+    }
+
+    Windows::UI::Color ProfileViewModel::TabColorPreview() const
+    {
+        if (const auto modelVal = _profile.TabColor())
+        {
+            const auto color = modelVal.Value();
+            // user defined an override value
+            return Windows::UI::Color{
+                .A = 255,
+                .R = color.R,
+                .G = color.G,
+                .B = color.B
+            };
+        }
+        // set to null --> deduce value from theme
+        return TabThemeColorPreview();
+    }
+
+    Windows::UI::Color ProfileViewModel::TabThemeColorPreview() const
+    {
+        const auto currentTheme = _appSettings.GlobalSettings().CurrentTheme();
+        if (const auto tabTheme = currentTheme.Tab())
+        {
+            // theme.tab.background: theme color must be evaluated
+            if (const auto tabBackground = tabTheme.Background())
+            {
+                const auto& tabBrush = tabBackground.Evaluate(Application::Current().Resources(),
+                                                              Windows::UI::Xaml::Media::SolidColorBrush{ DefaultAppearance().CurrentColorScheme().BackgroundColor().Color() },
+                                                              false);
+                if (const auto& tabColorBrush = tabBrush.try_as<Windows::UI::Xaml::Media::SolidColorBrush>())
+                {
+                    const auto brushColor = tabColorBrush.Color();
+                    return brushColor;
+                }
+            }
+        }
+        else if (const auto windowTheme = currentTheme.Window())
+        {
+            // theme.window.applicationTheme: evaluate light/dark to XAML default tab color
+            // Can also be "Default", in which case we fall through below
+            const auto appTheme = windowTheme.RequestedTheme();
+            if (appTheme == ElementTheme::Dark)
+            {
+                return Windows::UI::Color{
+                    .A = 0xFF,
+                    .R = 0x28,
+                    .G = 0x28,
+                    .B = 0x28
+                };
+            }
+            else if (appTheme == ElementTheme::Light)
+            {
+                return Windows::UI::Color{
+                    .A = 0xFF,
+                    .R = 0xF9,
+                    .G = 0xF9,
+                    .B = 0xF9
+                };
+            }
+        }
+
+        // XAML default tab color
+        if (Model::Theme::IsSystemInDarkTheme())
+        {
+            return Windows::UI::Color{
+                .A = 0xFF,
+                .R = 0x28,
+                .G = 0x28,
+                .B = 0x28
+            };
+        }
+        return Windows::UI::Color{
+            .A = 0xFF,
+            .R = 0xF9,
+            .G = 0xF9,
+            .B = 0xF9
+        };
+    }
+
+    Editor::AppearanceViewModel ProfileViewModel::DefaultAppearance() const
+    {
+        return _defaultAppearanceViewModel;
+    }
+
+    bool ProfileViewModel::HasUnfocusedAppearance()
+    {
+        return _profile.HasUnfocusedAppearance();
+    }
+
+    bool ProfileViewModel::EditableUnfocusedAppearance() const noexcept
+    {
+        return Feature_EditableUnfocusedAppearance::IsEnabled();
+    }
+
+    bool ProfileViewModel::ShowUnfocusedAppearance()
+    {
+        return EditableUnfocusedAppearance() && HasUnfocusedAppearance();
+    }
+
+    void ProfileViewModel::CreateUnfocusedAppearance()
+    {
+        _profile.CreateUnfocusedAppearance();
+
+        _unfocusedAppearanceViewModel = winrt::make<implementation::AppearanceViewModel>(_profile.UnfocusedAppearance().try_as<AppearanceConfig>());
+        _unfocusedAppearanceViewModel.SchemesList(DefaultAppearance().SchemesList());
+
+        _NotifyChanges(L"UnfocusedAppearance", L"HasUnfocusedAppearance", L"ShowUnfocusedAppearance");
+    }
+
+    void ProfileViewModel::DeleteUnfocusedAppearance()
+    {
+        _profile.DeleteUnfocusedAppearance();
+
+        _unfocusedAppearanceViewModel = nullptr;
+
+        _NotifyChanges(L"UnfocusedAppearance", L"HasUnfocusedAppearance", L"ShowUnfocusedAppearance");
+    }
+
+    Editor::AppearanceViewModel ProfileViewModel::UnfocusedAppearance() const
+    {
+        return _unfocusedAppearanceViewModel;
+    }
+
+    bool ProfileViewModel::ShowMarksAvailable() const noexcept
+    {
+        return Feature_ScrollbarMarks::IsEnabled();
+    }
+    bool ProfileViewModel::AutoMarkPromptsAvailable() const noexcept
+    {
+        return Feature_ScrollbarMarks::IsEnabled();
+    }
+    bool ProfileViewModel::RepositionCursorWithMouseAvailable() const noexcept
+    {
+        return Feature_ScrollbarMarks::IsEnabled();
+    }
+
+    hstring ProfileViewModel::CurrentStartingDirectoryPreview() const
+    {
+        if (UseParentProcessDirectory())
+        {
+            return RS_(L"Profile_StartingDirectoryUseParentCheckbox/Content");
+        }
+        return StartingDirectory();
+    }
+
+    bool ProfileViewModel::UseParentProcessDirectory() const
+    {
+        return StartingDirectory().empty();
+    }
+
+    void ProfileViewModel::UseParentProcessDirectory(const bool useParent)
+    {
+        if (useParent)
+        {
+            // Stash the current value of StartingDirectory. If the user
+            // checks and un-checks the "Use parent process directory" button, we want
+            // the path that we display in the text box to remain unchanged.
+            //
+            // Only stash this value if it's not empty
+            if (!StartingDirectory().empty())
+            {
+                _lastStartingDirectoryPath = StartingDirectory();
+            }
+            StartingDirectory(L"");
+        }
+        else
+        {
+            // Restore the path we had previously cached as long as it wasn't empty
+            // If it was empty, set the starting directory to %USERPROFILE%
+            // (we need to set it to something non-empty otherwise we will automatically
+            // disable the text box)
+            if (_lastStartingDirectoryPath.empty())
+            {
+                StartingDirectory(L"%USERPROFILE%");
+            }
+            else
+            {
+                StartingDirectory(_lastStartingDirectoryPath);
+            }
+        }
+    }
+
+    winrt::hstring ProfileViewModel::LocalizedIcon() const
+    {
+        if (UsingNoIcon())
+        {
+            return RS_(L"IconPicker_IconTypeNone");
+        }
+        return IconPath(); // For display as a string
+    }
+
+    Windows::UI::Xaml::Controls::IconElement ProfileViewModel::IconPreview() const
+    {
+        // IconWUX sets the icon width/height to 32 by default
+        auto icon = Microsoft::Terminal::UI::IconPathConverter::IconWUX(EvaluatedIcon());
+        icon.Width(16);
+        icon.Height(16);
+        return icon;
+    }
+
+    bool ProfileViewModel::UsingNoIcon() const noexcept
+    {
+        const auto iconPath{ IconPath() };
+        return iconPath.empty() || iconPath == IconPicker::HideIconValue;
+    }
+
+    hstring ProfileViewModel::BellStylePreview() const
+    {
+        const auto bellStyle = BellStyle();
+        if (WI_AreAllFlagsSet(bellStyle, BellStyle::Audible | BellStyle::Window | BellStyle::Taskbar | BellStyle::Notification))
+        {
+            return RS_(L"Profile_BellStyleAll/Content");
+        }
+        else if (bellStyle == static_cast<Model::BellStyle>(0))
+        {
+            return RS_(L"Profile_BellStyleNone/Content");
+        }
+
+        std::vector<hstring> resultList;
+        resultList.reserve(4);
+        if (WI_IsFlagSet(bellStyle, BellStyle::Audible))
+        {
+            resultList.emplace_back(RS_(L"Profile_BellStyleAudible/Content"));
+        }
+        if (WI_IsFlagSet(bellStyle, BellStyle::Window))
+        {
+            resultList.emplace_back(RS_(L"Profile_BellStyleWindow/Content"));
+        }
+        if (WI_IsFlagSet(bellStyle, BellStyle::Taskbar))
+        {
+            resultList.emplace_back(RS_(L"Profile_BellStyleTaskbar/Content"));
+        }
+        if (WI_IsFlagSet(bellStyle, BellStyle::Notification))
+        {
+            resultList.emplace_back(RS_(L"Profile_BellStyleNotification/Content"));
+        }
+
+        // add in the commas
+        hstring result{};
+        for (auto&& entry : resultList)
+        {
+            if (result.empty())
+            {
+                result = entry;
+            }
+            else
+            {
+                result = result + L", " + entry;
+            }
+        }
+        return result;
+    }
+
+    bool ProfileViewModel::IsBellStyleFlagSet(const uint32_t flag)
+    {
+        return (WI_EnumValue(BellStyle()) & flag) == flag;
+    }
+
+    void ProfileViewModel::SetBellStyleAudible(winrt::Windows::Foundation::IReference<bool> on)
+    {
+        auto currentStyle = BellStyle();
+        WI_UpdateFlag(currentStyle, Model::BellStyle::Audible, winrt::unbox_value<bool>(on));
+        BellStyle(currentStyle);
+    }
+
+    void ProfileViewModel::SetBellStyleWindow(winrt::Windows::Foundation::IReference<bool> on)
+    {
+        auto currentStyle = BellStyle();
+        WI_UpdateFlag(currentStyle, Model::BellStyle::Window, winrt::unbox_value<bool>(on));
+        BellStyle(currentStyle);
+    }
+
+    void ProfileViewModel::SetBellStyleTaskbar(winrt::Windows::Foundation::IReference<bool> on)
+    {
+        auto currentStyle = BellStyle();
+        WI_UpdateFlag(currentStyle, Model::BellStyle::Taskbar, winrt::unbox_value<bool>(on));
+        BellStyle(currentStyle);
+    }
+
+    void ProfileViewModel::SetBellStyleNotification(winrt::Windows::Foundation::IReference<bool> on)
+    {
+        auto currentStyle = BellStyle();
+        WI_UpdateFlag(currentStyle, Model::BellStyle::Notification, winrt::unbox_value<bool>(on));
+        BellStyle(currentStyle);
+    }
+
+    // Method Description:
+    // - Construct _CurrentBellSounds by importing the _inherited_ value from the model
+    // - Adds a PropertyChanged handler to each BellSoundViewModel to propagate changes to the model
+    void ProfileViewModel::_InitializeCurrentBellSounds()
+    {
+        _CurrentBellSounds = winrt::single_threaded_observable_vector<Editor::BellSoundViewModel>();
+        if (const auto soundList = _profile.BellSound())
+        {
+            for (const auto&& bellSound : soundList)
+            {
+                _CurrentBellSounds.Append(winrt::make<BellSoundViewModel>(bellSound));
+            }
+        }
+        _MarkDuplicateBellSoundDirectories();
+        _NotifyChanges(L"CurrentBellSounds");
+    }
+
+    // Method Description:
+    // - If the current layer is inheriting the bell sound from its parent,
+    //   we need to copy the _inherited_ bell sound list to the current layer
+    //   so that we can then apply modifications to it
+    void ProfileViewModel::_PrepareModelForBellSoundModification()
+    {
+        if (!_profile.HasBellSound())
+        {
+            std::vector<IMediaResource> newSounds;
+            if (const auto inheritedSounds = _profile.BellSound())
+            {
+                newSounds = wil::to_vector(inheritedSounds);
+            }
+            // if we didn't inherit any bell sounds,
+            // we should still set the bell sound to an empty list (instead of null)
+            _profile.BellSound(winrt::single_threaded_vector(std::move(newSounds)));
+        }
+    }
+
+    // Method Description:
+    // - Check if any bell sounds share the same name.
+    //   If they do, mark them so that they show the directory path in the UI
+    void ProfileViewModel::_MarkDuplicateBellSoundDirectories()
+    {
+        for (uint32_t i = 0; i < _CurrentBellSounds.Size(); i++)
+        {
+            auto soundA = _CurrentBellSounds.GetAt(i);
+            for (uint32_t j = i + 1; j < _CurrentBellSounds.Size(); j++)
+            {
+                auto soundB = _CurrentBellSounds.GetAt(j);
+                if (soundA.DisplayPath() == soundB.DisplayPath())
+                {
+                    get_self<BellSoundViewModel>(soundA)->ShowDirectory(true);
+                    get_self<BellSoundViewModel>(soundB)->ShowDirectory(true);
+                }
+            }
+        }
+    }
+
+    BellSoundViewModel::BellSoundViewModel(const Model::IMediaResource& resource) :
+        _resource{ resource }
+    {
+        if (_resource.Ok() && _resource.Path() != _resource.Resolved())
+        {
+            // If the resource was resolved to something other than its path, show the path!
+            _ShowDirectory = true;
+        }
+    }
+
+    hstring BellSoundViewModel::DisplayPath() const
+    {
+        if (_resource.Ok())
+        {
+            // filename; start from the resolved path to show where it actually landed
+            auto resolvedPath{ _resource.Resolved() };
+            const std::filesystem::path filePath{ std::wstring_view{ resolvedPath } };
+            return hstring{ filePath.filename().wstring() };
+        }
+        return _resource.Path();
+    }
+
+    hstring BellSoundViewModel::SubText() const
+    {
+        if (_resource.Ok())
+        {
+            // Directory
+            auto resolvedPath{ _resource.Resolved() };
+            const std::filesystem::path filePath{ std::wstring_view{ resolvedPath } };
+            return hstring{ filePath.parent_path().wstring() };
+        }
+        return RS_(L"Profile_BellSoundNotFound");
+    }
+
+    hstring ProfileViewModel::BellSoundPreview()
+    {
+        if (!_CurrentBellSounds || _CurrentBellSounds.Size() == 0)
+        {
+            return RS_(L"Profile_BellSoundPreviewDefault");
+        }
+        if (_CurrentBellSounds.Size() > 1)
+        {
+            return RS_(L"Profile_BellSoundPreviewMultiple");
+        }
+
+        const auto currentBellSound = _CurrentBellSounds.GetAt(0);
+        if (currentBellSound.FileExists())
+        {
+            return currentBellSound.DisplayPath();
+        }
+
+        return RS_(L"Profile_BellSoundNotFound");
+    }
+
+    void ProfileViewModel::RequestAddBellSound(hstring path)
+    {
+        // If we were inheriting our bell sound,
+        // copy it over to the current layer and apply modifications
+        _PrepareModelForBellSoundModification();
+
+        auto bellResource{ MediaResourceHelper::FromString(path) };
+        bellResource.Resolve(path); // No need to check if the file exists. We came from the FilePicker. That's good enough.
+        _CurrentBellSounds.Append(winrt::make<BellSoundViewModel>(bellResource));
+        _profile.BellSound().Append(bellResource);
+        _NotifyChanges(L"CurrentBellSounds");
+    }
+
+    void ProfileViewModel::RequestDeleteBellSound(const Editor::BellSoundViewModel& vm)
+    {
+        uint32_t index;
+        if (_CurrentBellSounds.IndexOf(vm, index))
+        {
+            // If we were inheriting our bell sound,
+            // copy it over to the current layer and apply modifications
+            _PrepareModelForBellSoundModification();
+
+            _CurrentBellSounds.RemoveAt(index);
+            _profile.BellSound().RemoveAt(index);
+            _NotifyChanges(L"CurrentBellSounds");
+        }
+    }
+
+    void ProfileViewModel::_RefreshDefaultAppearanceViewModel()
+    {
+        Windows::Foundation::Collections::IObservableVector<Editor::ColorSchemeViewModel> schemesList{ nullptr };
+        if (_defaultAppearanceViewModel)
+        {
+            schemesList = _defaultAppearanceViewModel.SchemesList();
+        }
+
+        _defaultAppearanceViewModel = winrt::make<implementation::AppearanceViewModel>(_profile.DefaultAppearance().try_as<AppearanceConfig>());
+        _defaultAppearanceViewModel.IsDefault(true);
+        if (schemesList)
+        {
+            _defaultAppearanceViewModel.SchemesList(schemesList);
+        }
+
+        _defaultAppearanceViewModel.PropertyChanged([this](auto&&, const PropertyChangedEventArgs& args) {
+            const auto viewModelProperty{ args.PropertyName() };
+            if (viewModelProperty == L"DarkColorSchemeName" || viewModelProperty == L"LightColorSchemeName")
+            {
+                _NotifyChanges(L"TabThemeColorPreview");
+            }
+        });
+    }
+
+    void ProfileViewModel::DeleteProfile()
+    {
+        const auto deleteProfileArgs{ winrt::make_self<DeleteProfileEventArgs>(Guid()) };
+        DeleteProfileRequested.raise(*this, *deleteProfileArgs);
+    }
+
+    void ProfileViewModel::ResetSettings()
+    {
+        // Clear all profile-level settings (not Guid/ConnectionType which are permanent)
+        // NOTE: When adding a new OBSERVABLE_PROJECTED_SETTING to ProfileViewModel,
+        //       also add the corresponding ClearX() call here.
+        ClearName();
+        ClearSource();
+        ClearHidden();
+        ClearIcon();
+        ClearCloseOnExit();
+        ClearTabTitle();
+        ClearTabColor();
+        ClearSuppressApplicationTitle();
+        ClearScrollState();
+        ClearPadding();
+        ClearCommandline();
+        ClearStartingDirectory();
+        _lastStartingDirectoryPath.clear();
+        ClearAntialiasingMode();
+        ClearOpacity();
+        ClearUseAcrylic();
+        ClearHistorySize();
+        ClearSnapOnInput();
+        ClearAltGrAliasing();
+        ClearBellStyle();
+        ClearBellSound();
+        ClearElevate();
+        ClearReloadEnvironmentVariables();
+        ClearRightClickContextMenu();
+        ClearShowMarks();
+        ClearAutoMarkPrompts();
+        ClearRepositionCursorWithMouse();
+        ClearForceVTInput();
+        ClearAllowKittyKeyboardMode();
+        ClearAllowVtChecksumReport();
+        ClearAllowVtClipboardWrite();
+        ClearAnswerbackMessage();
+        ClearRainbowSuggestions();
+        ClearPathTranslationStyle();
+        ClearDragDropDelimiter();
+
+        // Clear appearance settings on the underlying models.
+        const auto defaultAppearance = _profile.DefaultAppearance();
+        defaultAppearance.ClearDarkColorSchemeName();
+        defaultAppearance.ClearLightColorSchemeName();
+        defaultAppearance.ClearRetroTerminalEffect();
+        defaultAppearance.ClearCursorShape();
+        defaultAppearance.ClearCursorHeight();
+        defaultAppearance.ClearBackgroundImagePath();
+        defaultAppearance.ClearBackgroundImageOpacity();
+        defaultAppearance.ClearBackgroundImageStretchMode();
+        defaultAppearance.ClearBackgroundImageAlignment();
+        defaultAppearance.ClearIntenseTextStyle();
+        defaultAppearance.ClearAdjustIndistinguishableColors();
+        defaultAppearance.ClearForeground();
+        defaultAppearance.ClearBackground();
+        defaultAppearance.ClearSelectionBackground();
+        defaultAppearance.ClearCursorColor();
+
+        const auto fontConfig = _profile.FontInfo();
+        fontConfig.ClearFontFace();
+        fontConfig.ClearFontSize();
+        fontConfig.ClearCellHeight();
+        fontConfig.ClearCellWidth();
+        fontConfig.ClearFontWeight();
+        fontConfig.ClearEnableBuiltinGlyphs();
+        fontConfig.ClearEnableColorGlyphs();
+        fontConfig.ClearFontAxes();
+        fontConfig.ClearFontFeatures();
+
+        if (HasUnfocusedAppearance())
+        {
+            DeleteUnfocusedAppearance();
+        }
+
+        _RefreshDefaultAppearanceViewModel();
+        _NotifyChanges(L"DefaultAppearance", L"TabThemeColorPreview", L"TabColorPreview");
+    }
+
+    void ProfileViewModel::SetupAppearances(Windows::Foundation::Collections::IObservableVector<Editor::ColorSchemeViewModel> schemesList)
+    {
+        DefaultAppearance().SchemesList(schemesList);
+        if (UnfocusedAppearance())
+        {
+            UnfocusedAppearance().SchemesList(schemesList);
+        }
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
index fa403952e5a..1bfea9861ef 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.h
@@ -1,190 +1,192 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "DeleteProfileEventArgs.g.h"
-#include "BellSoundViewModel.g.h"
-#include "ProfileViewModel.g.h"
-#include "Utils.h"
-#include "ViewModelHelpers.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct BellSoundViewModel : BellSoundViewModelT<BellSoundViewModel>, ViewModelHelper<BellSoundViewModel>
-    {
-    public:
-        BellSoundViewModel(const Model::IMediaResource& resource);
-
-        hstring Path() const { return _resource.Path(); }
-        bool FileExists() const { return _resource.Ok(); }
-        hstring DisplayPath() const;
-        hstring SubText() const;
-        VIEW_MODEL_OBSERVABLE_PROPERTY(bool, ShowDirectory);
-
-    private:
-        Model::IMediaResource _resource;
-    };
-
-    struct ProfileViewModel : ProfileViewModelT<ProfileViewModel>, ViewModelHelper<ProfileViewModel>
-    {
-    public:
-        // font face
-        static void UpdateFontList() noexcept;
-        static Windows::Foundation::Collections::IObservableVector<Editor::Font> CompleteFontList() noexcept { return _FontList; };
-        static Windows::Foundation::Collections::IObservableVector<Editor::Font> MonospaceFontList() noexcept { return _MonospaceFontList; };
-
-        ProfileViewModel(const Model::Profile& profile, const Model::CascadiaSettings& settings, const Windows::UI::Core::CoreDispatcher& dispatcher);
-        Control::IControlSettings TermSettings() const;
-        void DeleteProfile();
-
-        void SetupAppearances(Windows::Foundation::Collections::IObservableVector<Editor::ColorSchemeViewModel> schemesList);
-
-        // bell style bits
-        hstring BellStylePreview() const;
-        bool IsBellStyleFlagSet(const uint32_t flag);
-        void SetBellStyleAudible(winrt::Windows::Foundation::IReference<bool> on);
-        void SetBellStyleWindow(winrt::Windows::Foundation::IReference<bool> on);
-        void SetBellStyleTaskbar(winrt::Windows::Foundation::IReference<bool> on);
-        void SetBellStyleNotification(winrt::Windows::Foundation::IReference<bool> on);
-
-        hstring BellSoundPreview();
-        void RequestAddBellSound(hstring path);
-        void RequestDeleteBellSound(const Editor::BellSoundViewModel& vm);
-
-        void SetAcrylicOpacityPercentageValue(double value)
-        {
-            Opacity(static_cast<float>(value) / 100.0f);
-        };
-
-        void LeftPadding(double value) noexcept;
-        double LeftPadding() const noexcept;
-        void TopPadding(double value) noexcept;
-        double TopPadding() const noexcept;
-        void RightPadding(double value) noexcept;
-        double RightPadding() const noexcept;
-        void BottomPadding(double value) noexcept;
-        double BottomPadding() const noexcept;
-
-        winrt::hstring EvaluatedIcon() const
-        {
-            return _profile.Icon().Resolved();
-        }
-        Windows::UI::Xaml::Controls::IconElement IconPreview() const;
-        winrt::hstring LocalizedIcon() const;
-        winrt::hstring IconPath() const { return _profile.Icon().Path(); }
-        void IconPath(const winrt::hstring& path)
-        {
-            Icon(Model::MediaResourceHelper::FromString(path));
-            _NotifyChanges(L"Icon", L"IconPath");
-        }
-        bool UsingNoIcon() const noexcept;
-
-        // starting directory
-        hstring CurrentStartingDirectoryPreview() const;
-        bool UseParentProcessDirectory() const;
-        void UseParentProcessDirectory(const bool useParent);
-
-        // general profile knowledge
-        winrt::guid OriginalProfileGuid() const noexcept;
-        bool CanDeleteProfile() const;
-        Editor::AppearanceViewModel DefaultAppearance() const;
-        Editor::AppearanceViewModel UnfocusedAppearance() const;
-        bool HasUnfocusedAppearance();
-        bool EditableUnfocusedAppearance() const noexcept;
-        bool ShowUnfocusedAppearance();
-        void CreateUnfocusedAppearance();
-        void DeleteUnfocusedAppearance();
-
-        bool ShowMarksAvailable() const noexcept;
-        bool AutoMarkPromptsAvailable() const noexcept;
-        bool RepositionCursorWithMouseAvailable() const noexcept;
-
-        bool Orphaned() const;
-        hstring TabTitlePreview() const;
-        hstring AnswerbackMessagePreview() const;
-        Windows::UI::Color TabColorPreview() const;
-        Windows::UI::Color TabThemeColorPreview() const;
-
-        til::typed_event<Editor::ProfileViewModel, Editor::DeleteProfileEventArgs> DeleteProfileRequested;
-
-        VIEW_MODEL_OBSERVABLE_PROPERTY(ProfileSubPage, CurrentPage);
-        VIEW_MODEL_OBSERVABLE_PROPERTY(Windows::Foundation::Collections::IObservableVector<Editor::BellSoundViewModel>, CurrentBellSounds);
-
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_profile, Guid);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_profile, ConnectionType);
-        OBSERVABLE_PROJECTED_SETTING(_profile, Name);
-        OBSERVABLE_PROJECTED_SETTING(_profile, Source);
-        OBSERVABLE_PROJECTED_SETTING(_profile, Hidden);
-        OBSERVABLE_PROJECTED_SETTING(_profile, Icon);
-        OBSERVABLE_PROJECTED_SETTING(_profile, CloseOnExit);
-        OBSERVABLE_PROJECTED_SETTING(_profile, TabTitle);
-        OBSERVABLE_PROJECTED_SETTING(_profile, TabColor);
-        OBSERVABLE_PROJECTED_SETTING(_profile, SuppressApplicationTitle);
-        OBSERVABLE_PROJECTED_SETTING(_profile, ScrollState);
-        OBSERVABLE_PROJECTED_SETTING(_profile, Padding);
-        OBSERVABLE_PROJECTED_SETTING(_profile, Commandline);
-        OBSERVABLE_PROJECTED_SETTING(_profile, StartingDirectory);
-        OBSERVABLE_PROJECTED_SETTING(_profile, AntialiasingMode);
-        OBSERVABLE_PROJECTED_SETTING(_profile.DefaultAppearance(), Opacity);
-        OBSERVABLE_PROJECTED_SETTING(_profile.DefaultAppearance(), UseAcrylic);
-        OBSERVABLE_PROJECTED_SETTING(_profile, HistorySize);
-        OBSERVABLE_PROJECTED_SETTING(_profile, SnapOnInput);
-        OBSERVABLE_PROJECTED_SETTING(_profile, AltGrAliasing);
-        OBSERVABLE_PROJECTED_SETTING(_profile, BellStyle);
-        OBSERVABLE_PROJECTED_SETTING(_profile, BellSound);
-        OBSERVABLE_PROJECTED_SETTING(_profile, Elevate);
-        OBSERVABLE_PROJECTED_SETTING(_profile, ReloadEnvironmentVariables);
-        OBSERVABLE_PROJECTED_SETTING(_profile, RightClickContextMenu);
-        OBSERVABLE_PROJECTED_SETTING(_profile, ShowMarks);
-        OBSERVABLE_PROJECTED_SETTING(_profile, AutoMarkPrompts);
-        OBSERVABLE_PROJECTED_SETTING(_profile, RepositionCursorWithMouse);
-        OBSERVABLE_PROJECTED_SETTING(_profile, ForceVTInput);
-        OBSERVABLE_PROJECTED_SETTING(_profile, AllowKittyKeyboardMode);
-        OBSERVABLE_PROJECTED_SETTING(_profile, AllowVtChecksumReport);
-        OBSERVABLE_PROJECTED_SETTING(_profile, AllowVtClipboardWrite);
-        OBSERVABLE_PROJECTED_SETTING(_profile, AnswerbackMessage);
-        OBSERVABLE_PROJECTED_SETTING(_profile, RainbowSuggestions);
-        OBSERVABLE_PROJECTED_SETTING(_profile, PathTranslationStyle);
-        OBSERVABLE_PROJECTED_SETTING(_profile, DragDropDelimiter);
-
-        WINRT_PROPERTY(bool, IsBaseLayer, false);
-        WINRT_PROPERTY(bool, FocusDeleteButton, false);
-        GETSET_BINDABLE_ENUM_SETTING(AntiAliasingMode, Microsoft::Terminal::Control::TextAntialiasingMode, AntialiasingMode);
-        GETSET_BINDABLE_ENUM_SETTING(CloseOnExitMode, Microsoft::Terminal::Settings::Model::CloseOnExitMode, CloseOnExit);
-        GETSET_BINDABLE_ENUM_SETTING(ScrollState, Microsoft::Terminal::Control::ScrollbarState, ScrollState);
-        GETSET_BINDABLE_ENUM_SETTING(PathTranslationStyle, Microsoft::Terminal::Control::PathTranslationStyle, PathTranslationStyle);
-
-    private:
-        Model::Profile _profile;
-        winrt::guid _originalProfileGuid{};
-        winrt::hstring _lastBgImagePath;
-        winrt::hstring _lastStartingDirectoryPath;
-        Editor::AppearanceViewModel _defaultAppearanceViewModel;
-        Windows::UI::Core::CoreDispatcher _dispatcher;
-
-        winrt::Windows::UI::Xaml::Thickness _parsedPadding;
-
-        void _InitializeCurrentBellSounds();
-        void _PrepareModelForBellSoundModification();
-        void _MarkDuplicateBellSoundDirectories();
-        static Windows::Foundation::Collections::IObservableVector<Editor::Font> _MonospaceFontList;
-        static Windows::Foundation::Collections::IObservableVector<Editor::Font> _FontList;
-
-        Model::CascadiaSettings _appSettings;
-        Editor::AppearanceViewModel _unfocusedAppearanceViewModel;
-    };
-
-    struct DeleteProfileEventArgs :
-        public DeleteProfileEventArgsT<DeleteProfileEventArgs>
-    {
-    public:
-        DeleteProfileEventArgs(guid profileGuid) :
-            _ProfileGuid(profileGuid) {}
-
-        guid ProfileGuid() const noexcept { return _ProfileGuid; }
-
-    private:
-        guid _ProfileGuid{};
-    };
-};
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "DeleteProfileEventArgs.g.h"
+#include "BellSoundViewModel.g.h"
+#include "ProfileViewModel.g.h"
+#include "Utils.h"
+#include "ViewModelHelpers.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct BellSoundViewModel : BellSoundViewModelT<BellSoundViewModel>, ViewModelHelper<BellSoundViewModel>
+    {
+    public:
+        BellSoundViewModel(const Model::IMediaResource& resource);
+
+        hstring Path() const { return _resource.Path(); }
+        bool FileExists() const { return _resource.Ok(); }
+        hstring DisplayPath() const;
+        hstring SubText() const;
+        VIEW_MODEL_OBSERVABLE_PROPERTY(bool, ShowDirectory);
+
+    private:
+        Model::IMediaResource _resource;
+    };
+
+    struct ProfileViewModel : ProfileViewModelT<ProfileViewModel>, ViewModelHelper<ProfileViewModel>
+    {
+    public:
+        // font face
+        static void UpdateFontList() noexcept;
+        static Windows::Foundation::Collections::IObservableVector<Editor::Font> CompleteFontList() noexcept { return _FontList; };
+        static Windows::Foundation::Collections::IObservableVector<Editor::Font> MonospaceFontList() noexcept { return _MonospaceFontList; };
+
+        ProfileViewModel(const Model::Profile& profile, const Model::CascadiaSettings& settings, const Windows::UI::Core::CoreDispatcher& dispatcher);
+        Control::IControlSettings TermSettings() const;
+        void DeleteProfile();
+
+        void SetupAppearances(Windows::Foundation::Collections::IObservableVector<Editor::ColorSchemeViewModel> schemesList);
+        void ResetSettings();
+
+        // bell style bits
+        hstring BellStylePreview() const;
+        bool IsBellStyleFlagSet(const uint32_t flag);
+        void SetBellStyleAudible(winrt::Windows::Foundation::IReference<bool> on);
+        void SetBellStyleWindow(winrt::Windows::Foundation::IReference<bool> on);
+        void SetBellStyleTaskbar(winrt::Windows::Foundation::IReference<bool> on);
+        void SetBellStyleNotification(winrt::Windows::Foundation::IReference<bool> on);
+
+        hstring BellSoundPreview();
+        void RequestAddBellSound(hstring path);
+        void RequestDeleteBellSound(const Editor::BellSoundViewModel& vm);
+
+        void SetAcrylicOpacityPercentageValue(double value)
+        {
+            Opacity(static_cast<float>(value) / 100.0f);
+        };
+
+        void LeftPadding(double value) noexcept;
+        double LeftPadding() const noexcept;
+        void TopPadding(double value) noexcept;
+        double TopPadding() const noexcept;
+        void RightPadding(double value) noexcept;
+        double RightPadding() const noexcept;
+        void BottomPadding(double value) noexcept;
+        double BottomPadding() const noexcept;
+
+        winrt::hstring EvaluatedIcon() const
+        {
+            return _profile.Icon().Resolved();
+        }
+        Windows::UI::Xaml::Controls::IconElement IconPreview() const;
+        winrt::hstring LocalizedIcon() const;
+        winrt::hstring IconPath() const { return _profile.Icon().Path(); }
+        void IconPath(const winrt::hstring& path)
+        {
+            Icon(Model::MediaResourceHelper::FromString(path));
+            _NotifyChanges(L"Icon", L"IconPath");
+        }
+        bool UsingNoIcon() const noexcept;
+
+        // starting directory
+        hstring CurrentStartingDirectoryPreview() const;
+        bool UseParentProcessDirectory() const;
+        void UseParentProcessDirectory(const bool useParent);
+
+        // general profile knowledge
+        winrt::guid OriginalProfileGuid() const noexcept;
+        bool CanDeleteProfile() const;
+        Editor::AppearanceViewModel DefaultAppearance() const;
+        Editor::AppearanceViewModel UnfocusedAppearance() const;
+        bool HasUnfocusedAppearance();
+        bool EditableUnfocusedAppearance() const noexcept;
+        bool ShowUnfocusedAppearance();
+        void CreateUnfocusedAppearance();
+        void DeleteUnfocusedAppearance();
+
+        bool ShowMarksAvailable() const noexcept;
+        bool AutoMarkPromptsAvailable() const noexcept;
+        bool RepositionCursorWithMouseAvailable() const noexcept;
+
+        bool Orphaned() const;
+        hstring TabTitlePreview() const;
+        hstring AnswerbackMessagePreview() const;
+        Windows::UI::Color TabColorPreview() const;
+        Windows::UI::Color TabThemeColorPreview() const;
+
+        til::typed_event<Editor::ProfileViewModel, Editor::DeleteProfileEventArgs> DeleteProfileRequested;
+
+        VIEW_MODEL_OBSERVABLE_PROPERTY(ProfileSubPage, CurrentPage);
+        VIEW_MODEL_OBSERVABLE_PROPERTY(Windows::Foundation::Collections::IObservableVector<Editor::BellSoundViewModel>, CurrentBellSounds);
+
+        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_profile, Guid);
+        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_profile, ConnectionType);
+        OBSERVABLE_PROJECTED_SETTING(_profile, Name);
+        OBSERVABLE_PROJECTED_SETTING(_profile, Source);
+        OBSERVABLE_PROJECTED_SETTING(_profile, Hidden);
+        OBSERVABLE_PROJECTED_SETTING(_profile, Icon);
+        OBSERVABLE_PROJECTED_SETTING(_profile, CloseOnExit);
+        OBSERVABLE_PROJECTED_SETTING(_profile, TabTitle);
+        OBSERVABLE_PROJECTED_SETTING(_profile, TabColor);
+        OBSERVABLE_PROJECTED_SETTING(_profile, SuppressApplicationTitle);
+        OBSERVABLE_PROJECTED_SETTING(_profile, ScrollState);
+        OBSERVABLE_PROJECTED_SETTING(_profile, Padding);
+        OBSERVABLE_PROJECTED_SETTING(_profile, Commandline);
+        OBSERVABLE_PROJECTED_SETTING(_profile, StartingDirectory);
+        OBSERVABLE_PROJECTED_SETTING(_profile, AntialiasingMode);
+        OBSERVABLE_PROJECTED_SETTING(_profile.DefaultAppearance(), Opacity);
+        OBSERVABLE_PROJECTED_SETTING(_profile.DefaultAppearance(), UseAcrylic);
+        OBSERVABLE_PROJECTED_SETTING(_profile, HistorySize);
+        OBSERVABLE_PROJECTED_SETTING(_profile, SnapOnInput);
+        OBSERVABLE_PROJECTED_SETTING(_profile, AltGrAliasing);
+        OBSERVABLE_PROJECTED_SETTING(_profile, BellStyle);
+        OBSERVABLE_PROJECTED_SETTING(_profile, BellSound);
+        OBSERVABLE_PROJECTED_SETTING(_profile, Elevate);
+        OBSERVABLE_PROJECTED_SETTING(_profile, ReloadEnvironmentVariables);
+        OBSERVABLE_PROJECTED_SETTING(_profile, RightClickContextMenu);
+        OBSERVABLE_PROJECTED_SETTING(_profile, ShowMarks);
+        OBSERVABLE_PROJECTED_SETTING(_profile, AutoMarkPrompts);
+        OBSERVABLE_PROJECTED_SETTING(_profile, RepositionCursorWithMouse);
+        OBSERVABLE_PROJECTED_SETTING(_profile, ForceVTInput);
+        OBSERVABLE_PROJECTED_SETTING(_profile, AllowKittyKeyboardMode);
+        OBSERVABLE_PROJECTED_SETTING(_profile, AllowVtChecksumReport);
+        OBSERVABLE_PROJECTED_SETTING(_profile, AllowVtClipboardWrite);
+        OBSERVABLE_PROJECTED_SETTING(_profile, AnswerbackMessage);
+        OBSERVABLE_PROJECTED_SETTING(_profile, RainbowSuggestions);
+        OBSERVABLE_PROJECTED_SETTING(_profile, PathTranslationStyle);
+        OBSERVABLE_PROJECTED_SETTING(_profile, DragDropDelimiter);
+
+        WINRT_PROPERTY(bool, IsBaseLayer, false);
+        WINRT_PROPERTY(bool, FocusDeleteButton, false);
+        GETSET_BINDABLE_ENUM_SETTING(AntiAliasingMode, Microsoft::Terminal::Control::TextAntialiasingMode, AntialiasingMode);
+        GETSET_BINDABLE_ENUM_SETTING(CloseOnExitMode, Microsoft::Terminal::Settings::Model::CloseOnExitMode, CloseOnExit);
+        GETSET_BINDABLE_ENUM_SETTING(ScrollState, Microsoft::Terminal::Control::ScrollbarState, ScrollState);
+        GETSET_BINDABLE_ENUM_SETTING(PathTranslationStyle, Microsoft::Terminal::Control::PathTranslationStyle, PathTranslationStyle);
+
+    private:
+        Model::Profile _profile;
+        winrt::guid _originalProfileGuid{};
+        winrt::hstring _lastBgImagePath;
+        winrt::hstring _lastStartingDirectoryPath;
+        Editor::AppearanceViewModel _defaultAppearanceViewModel;
+        Windows::UI::Core::CoreDispatcher _dispatcher;
+
+        winrt::Windows::UI::Xaml::Thickness _parsedPadding;
+
+        void _InitializeCurrentBellSounds();
+        void _PrepareModelForBellSoundModification();
+        void _MarkDuplicateBellSoundDirectories();
+        void _RefreshDefaultAppearanceViewModel();
+        static Windows::Foundation::Collections::IObservableVector<Editor::Font> _MonospaceFontList;
+        static Windows::Foundation::Collections::IObservableVector<Editor::Font> _FontList;
+
+        Model::CascadiaSettings _appSettings;
+        Editor::AppearanceViewModel _unfocusedAppearanceViewModel;
+    };
+
+    struct DeleteProfileEventArgs :
+        public DeleteProfileEventArgsT<DeleteProfileEventArgs>
+    {
+    public:
+        DeleteProfileEventArgs(guid profileGuid) :
+            _ProfileGuid(profileGuid) {}
+
+        guid ProfileGuid() const noexcept { return _ProfileGuid; }
+
+    private:
+        guid _ProfileGuid{};
+    };
+};
diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
index c2d99246d02..d5c08da568a 100644
--- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
+++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl
@@ -1,146 +1,147 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import "EnumEntry.idl";
-import "MainPage.idl";
-import "Appearances.idl";
-import "ColorSchemesPageViewModel.idl";
-
-#include "ViewModelHelpers.idl.h"
-
-#define OBSERVABLE_PROJECTED_PROFILE_SETTING(Type, Name) \
-    OBSERVABLE_PROJECTED_SETTING(Type, Name);            \
-    Object Name##OverrideSource { get; }
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    runtimeclass DeleteProfileEventArgs
-    {
-        Guid ProfileGuid { get; };
-    }
-
-    runtimeclass BellSoundViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
-    {
-        String Path { get; };
-        String DisplayPath { get; };
-        String SubText { get; };
-        Boolean ShowDirectory { get; };
-        Boolean FileExists { get; };
-    }
-
-    enum ProfileSubPage
-    {
-        Base = 0,
-        Appearance = 1,
-        Terminal = 2,
-        Advanced = 3
-    };
-
-    runtimeclass ProfileViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
-    {
-        event Windows.Foundation.TypedEventHandler<ProfileViewModel, DeleteProfileEventArgs> DeleteProfileRequested;
-
-        void SetupAppearances(Windows.Foundation.Collections.IObservableVector<ColorSchemeViewModel> schemesList);
-
-        void SetAcrylicOpacityPercentageValue(Double value);
-
-        String BellStylePreview { get; };
-        Boolean IsBellStyleFlagSet(UInt32 flag);
-        void SetBellStyleAudible(Windows.Foundation.IReference<Boolean> on);
-        void SetBellStyleWindow(Windows.Foundation.IReference<Boolean> on);
-        void SetBellStyleTaskbar(Windows.Foundation.IReference<Boolean> on);
-        void SetBellStyleNotification(Windows.Foundation.IReference<Boolean> on);
-
-        String BellSoundPreview { get; };
-        Windows.Foundation.Collections.IObservableVector<BellSoundViewModel> CurrentBellSounds { get; };
-        void RequestAddBellSound(String path);
-        void RequestDeleteBellSound(BellSoundViewModel vm);
-
-        IInspectable CurrentAntiAliasingMode;
-        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> AntiAliasingModeList { get; };
-
-        IInspectable CurrentCloseOnExitMode;
-        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> CloseOnExitModeList { get; };
-
-        IInspectable CurrentScrollState;
-        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> ScrollStateList { get; };
-
-        Double LeftPadding { get; set; };
-        Double TopPadding { get; set; };
-        Double RightPadding { get; set; };
-        Double BottomPadding { get; set; };
-
-        IInspectable CurrentPathTranslationStyle;
-        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> PathTranslationStyleList { get; };
-
-        String CurrentStartingDirectoryPreview { get; };
-        Boolean UseParentProcessDirectory;
-
-        Boolean CanDeleteProfile { get; };
-        Boolean FocusDeleteButton;
-        Boolean IsBaseLayer;
-        ProfileSubPage CurrentPage;
-        AppearanceViewModel DefaultAppearance { get; };
-        Guid OriginalProfileGuid { get; };
-        Boolean HasUnfocusedAppearance { get; };
-        Boolean EditableUnfocusedAppearance { get; };
-        Boolean ShowUnfocusedAppearance { get; };
-        AppearanceViewModel UnfocusedAppearance { get; };
-
-        Boolean ShowMarksAvailable { get; };
-        Boolean AutoMarkPromptsAvailable { get; };
-        Boolean RepositionCursorWithMouseAvailable { get; };
-
-        Windows.UI.Xaml.Controls.IconElement IconPreview { get; };
-        String EvaluatedIcon { get; };
-        String LocalizedIcon { get; };
-        String IconPath;
-        Boolean UsingNoIcon { get; };
-
-        String TabTitlePreview { get; };
-        String AnswerbackMessagePreview { get; };
-        Windows.UI.Color TabColorPreview { get; };
-        Windows.UI.Color TabThemeColorPreview { get; };
-
-        void CreateUnfocusedAppearance();
-        void DeleteUnfocusedAppearance();
-
-        Boolean Orphaned { get; };
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, Name);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Guid, Guid);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, Source);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Guid, ConnectionType);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, Hidden);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Settings.Model.IMediaResource, Icon);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Settings.Model.CloseOnExitMode, CloseOnExit);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, TabTitle);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Windows.Foundation.IReference<Microsoft.Terminal.Core.Color>, TabColor);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, SuppressApplicationTitle);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, UseAcrylic);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Single, Opacity);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.ScrollbarState, ScrollState);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, Padding);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, Commandline);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, StartingDirectory);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.TextAntialiasingMode, AntialiasingMode);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Int32, HistorySize);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, SnapOnInput);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AltGrAliasing);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Settings.Model.BellStyle, BellStyle);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Windows.Foundation.Collections.IVector<Microsoft.Terminal.Settings.Model.IMediaResource>, BellSound);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, Elevate);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, ReloadEnvironmentVariables);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, RightClickContextMenu);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, ShowMarks);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AutoMarkPrompts);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, RepositionCursorWithMouse);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, ForceVTInput);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AllowKittyKeyboardMode);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AllowVtChecksumReport);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, AnswerbackMessage);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, RainbowSuggestions);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.PathTranslationStyle, PathTranslationStyle);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, DragDropDelimiter);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AllowVtClipboardWrite);
-    }
-}
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import "EnumEntry.idl";
+import "MainPage.idl";
+import "Appearances.idl";
+import "ColorSchemesPageViewModel.idl";
+
+#include "ViewModelHelpers.idl.h"
+
+#define OBSERVABLE_PROJECTED_PROFILE_SETTING(Type, Name) \
+    OBSERVABLE_PROJECTED_SETTING(Type, Name);            \
+    Object Name##OverrideSource { get; }
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    runtimeclass DeleteProfileEventArgs
+    {
+        Guid ProfileGuid { get; };
+    }
+
+    runtimeclass BellSoundViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
+    {
+        String Path { get; };
+        String DisplayPath { get; };
+        String SubText { get; };
+        Boolean ShowDirectory { get; };
+        Boolean FileExists { get; };
+    }
+
+    enum ProfileSubPage
+    {
+        Base = 0,
+        Appearance = 1,
+        Terminal = 2,
+        Advanced = 3
+    };
+
+    runtimeclass ProfileViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
+    {
+        event Windows.Foundation.TypedEventHandler<ProfileViewModel, DeleteProfileEventArgs> DeleteProfileRequested;
+
+        void SetupAppearances(Windows.Foundation.Collections.IObservableVector<ColorSchemeViewModel> schemesList);
+        void ResetSettings();
+
+        void SetAcrylicOpacityPercentageValue(Double value);
+
+        String BellStylePreview { get; };
+        Boolean IsBellStyleFlagSet(UInt32 flag);
+        void SetBellStyleAudible(Windows.Foundation.IReference<Boolean> on);
+        void SetBellStyleWindow(Windows.Foundation.IReference<Boolean> on);
+        void SetBellStyleTaskbar(Windows.Foundation.IReference<Boolean> on);
+        void SetBellStyleNotification(Windows.Foundation.IReference<Boolean> on);
+
+        String BellSoundPreview { get; };
+        Windows.Foundation.Collections.IObservableVector<BellSoundViewModel> CurrentBellSounds { get; };
+        void RequestAddBellSound(String path);
+        void RequestDeleteBellSound(BellSoundViewModel vm);
+
+        IInspectable CurrentAntiAliasingMode;
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> AntiAliasingModeList { get; };
+
+        IInspectable CurrentCloseOnExitMode;
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> CloseOnExitModeList { get; };
+
+        IInspectable CurrentScrollState;
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> ScrollStateList { get; };
+
+        Double LeftPadding { get; set; };
+        Double TopPadding { get; set; };
+        Double RightPadding { get; set; };
+        Double BottomPadding { get; set; };
+
+        IInspectable CurrentPathTranslationStyle;
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> PathTranslationStyleList { get; };
+
+        String CurrentStartingDirectoryPreview { get; };
+        Boolean UseParentProcessDirectory;
+
+        Boolean CanDeleteProfile { get; };
+        Boolean FocusDeleteButton;
+        Boolean IsBaseLayer;
+        ProfileSubPage CurrentPage;
+        AppearanceViewModel DefaultAppearance { get; };
+        Guid OriginalProfileGuid { get; };
+        Boolean HasUnfocusedAppearance { get; };
+        Boolean EditableUnfocusedAppearance { get; };
+        Boolean ShowUnfocusedAppearance { get; };
+        AppearanceViewModel UnfocusedAppearance { get; };
+
+        Boolean ShowMarksAvailable { get; };
+        Boolean AutoMarkPromptsAvailable { get; };
+        Boolean RepositionCursorWithMouseAvailable { get; };
+
+        Windows.UI.Xaml.Controls.IconElement IconPreview { get; };
+        String EvaluatedIcon { get; };
+        String LocalizedIcon { get; };
+        String IconPath;
+        Boolean UsingNoIcon { get; };
+
+        String TabTitlePreview { get; };
+        String AnswerbackMessagePreview { get; };
+        Windows.UI.Color TabColorPreview { get; };
+        Windows.UI.Color TabThemeColorPreview { get; };
+
+        void CreateUnfocusedAppearance();
+        void DeleteUnfocusedAppearance();
+
+        Boolean Orphaned { get; };
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, Name);
+        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Guid, Guid);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, Source);
+        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Guid, ConnectionType);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, Hidden);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Settings.Model.IMediaResource, Icon);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Settings.Model.CloseOnExitMode, CloseOnExit);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, TabTitle);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Windows.Foundation.IReference<Microsoft.Terminal.Core.Color>, TabColor);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, SuppressApplicationTitle);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, UseAcrylic);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Single, Opacity);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.ScrollbarState, ScrollState);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, Padding);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, Commandline);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, StartingDirectory);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.TextAntialiasingMode, AntialiasingMode);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Int32, HistorySize);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, SnapOnInput);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AltGrAliasing);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Settings.Model.BellStyle, BellStyle);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Windows.Foundation.Collections.IVector<Microsoft.Terminal.Settings.Model.IMediaResource>, BellSound);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, Elevate);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, ReloadEnvironmentVariables);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, RightClickContextMenu);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, ShowMarks);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AutoMarkPrompts);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, RepositionCursorWithMouse);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, ForceVTInput);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AllowKittyKeyboardMode);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AllowVtChecksumReport);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, AnswerbackMessage);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, RainbowSuggestions);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.PathTranslationStyle, PathTranslationStyle);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, DragDropDelimiter);
+        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AllowVtClipboardWrite);
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
index b00c1753bb5..9adea2aa018 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
@@ -35,254 +35,222 @@
                    Style="{StaticResource DisclaimerStyle}"
                    Visibility="{x:Bind Profile.IsBaseLayer}" />
         <StackPanel Grid.Row="1"
+                    Spacing="2"
                     Style="{StaticResource SettingsStackStyle}">
             <!--  Antialiasing Mode  -->
-            <local:SettingContainer x:Name="AntialiasingMode"
-                                    x:Uid="Profile_AntialiasingMode"
-                                    ClearSettingValue="{x:Bind Profile.ClearAntialiasingMode}"
-                                    HasSettingValue="{x:Bind Profile.HasAntialiasingMode, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.AntialiasingModeOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="AntialiasingMode"
+                                x:Uid="Profile_AntialiasingMode">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind Profile.AntiAliasingModeList, Mode=OneWay}"
                           SelectedItem="{x:Bind Profile.CurrentAntiAliasingMode, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  AltGr Aliasing  -->
-            <local:SettingContainer x:Name="AltGrAliasing"
-                                    x:Uid="Profile_AltGrAliasing"
-                                    ClearSettingValue="{x:Bind Profile.ClearAltGrAliasing}"
-                                    HasSettingValue="{x:Bind Profile.HasAltGrAliasing, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.AltGrAliasingOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="AltGrAliasing"
+                                x:Uid="Profile_AltGrAliasing">
                 <ToggleSwitch IsOn="{x:Bind Profile.AltGrAliasing, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Snap On Input  -->
-            <local:SettingContainer x:Name="SnapOnInput"
-                                    x:Uid="Profile_SnapOnInput"
-                                    ClearSettingValue="{x:Bind Profile.ClearSnapOnInput}"
-                                    HasSettingValue="{x:Bind Profile.HasSnapOnInput, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.SnapOnInputOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="SnapOnInput"
+                                x:Uid="Profile_SnapOnInput">
                 <ToggleSwitch IsOn="{x:Bind Profile.SnapOnInput, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  History Size  -->
-            <local:SettingContainer x:Name="HistorySize"
-                                    x:Uid="Profile_HistorySize"
-                                    ClearSettingValue="{x:Bind Profile.ClearHistorySize}"
-                                    HasSettingValue="{x:Bind Profile.HasHistorySize, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.HistorySizeOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="HistorySize"
+                                x:Uid="Profile_HistorySize">
                 <muxc:NumberBox x:Uid="Profile_HistorySizeBox"
                                 LargeChange="100"
                                 Minimum="0"
                                 SmallChange="10"
                                 Style="{StaticResource NumberBoxSettingStyle}"
                                 Value="{x:Bind Profile.HistorySize, Mode=TwoWay}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Close On Exit  -->
-            <local:SettingContainer x:Name="CloseOnExit"
-                                    x:Uid="Profile_CloseOnExit"
-                                    ClearSettingValue="{x:Bind Profile.ClearCloseOnExit}"
-                                    HasSettingValue="{x:Bind Profile.HasCloseOnExit, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.CloseOnExitOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="CloseOnExit"
+                                x:Uid="Profile_CloseOnExit">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind Profile.CloseOnExitModeList, Mode=OneWay}"
                           SelectedItem="{x:Bind Profile.CurrentCloseOnExitMode, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Bell Style  -->
-            <local:SettingContainer x:Name="BellStyle"
-                                    x:Uid="Profile_BellStyle"
-                                    ClearSettingValue="{x:Bind Profile.ClearBellStyle}"
-                                    CurrentValue="{x:Bind Profile.BellStylePreview, Mode=OneWay}"
-                                    HasSettingValue="{x:Bind Profile.HasBellStyle, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.BellStyleOverrideSource, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <StackPanel>
-                    <CheckBox x:Uid="Profile_BellStyleAudible"
-                              IsChecked="{x:Bind Profile.IsBellStyleFlagSet(1), BindBack=Profile.SetBellStyleAudible, Mode=TwoWay}" />
-                    <CheckBox x:Uid="Profile_BellStyleWindow"
-                              IsChecked="{x:Bind Profile.IsBellStyleFlagSet(2), BindBack=Profile.SetBellStyleWindow, Mode=TwoWay}" />
-                    <CheckBox x:Uid="Profile_BellStyleTaskbar"
-                              IsChecked="{x:Bind Profile.IsBellStyleFlagSet(4), BindBack=Profile.SetBellStyleTaskbar, Mode=TwoWay}" />
-                    <CheckBox x:Uid="Profile_BellStyleNotification"
-                              IsChecked="{x:Bind Profile.IsBellStyleFlagSet(8), BindBack=Profile.SetBellStyleNotification, Mode=TwoWay}" />
-                </StackPanel>
-            </local:SettingContainer>
+            <local:SettingsExpander x:Name="BellStyle"
+                                    x:Uid="Profile_BellStyle">
+                <local:SettingsExpander.Content>
+                    <TextBlock Style="{StaticResource SettingContainerCurrentValueTextBlockStyle}"
+                               Text="{x:Bind Profile.BellStylePreview, Mode=OneWay}" />
+                </local:SettingsExpander.Content>
+                <local:SettingsExpander.ItemsHeader>
+                    <ContentPresenter Padding="16,12,16,16">
+                        <StackPanel>
+                            <CheckBox x:Uid="Profile_BellStyleAudible"
+                                      IsChecked="{x:Bind Profile.IsBellStyleFlagSet(1), BindBack=Profile.SetBellStyleAudible, Mode=TwoWay}" />
+                            <CheckBox x:Uid="Profile_BellStyleWindow"
+                                      IsChecked="{x:Bind Profile.IsBellStyleFlagSet(2), BindBack=Profile.SetBellStyleWindow, Mode=TwoWay}" />
+                            <CheckBox x:Uid="Profile_BellStyleTaskbar"
+                                      IsChecked="{x:Bind Profile.IsBellStyleFlagSet(4), BindBack=Profile.SetBellStyleTaskbar, Mode=TwoWay}" />
+                            <CheckBox x:Uid="Profile_BellStyleNotification"
+                                      IsChecked="{x:Bind Profile.IsBellStyleFlagSet(8), BindBack=Profile.SetBellStyleNotification, Mode=TwoWay}" />
+                        </StackPanel>
+                    </ContentPresenter>
+                </local:SettingsExpander.ItemsHeader>
+            </local:SettingsExpander>
 
             <!--  Bell Sound  -->
-            <local:SettingContainer x:Name="BellSound"
-                                    x:Uid="Profile_BellSound"
-                                    ClearSettingValue="{x:Bind Profile.ClearBellSound}"
-                                    CurrentValue="{x:Bind Profile.BellSoundPreview, Mode=OneWay}"
-                                    HasSettingValue="{x:Bind Profile.HasBellSound, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.BellSoundOverrideSource, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <StackPanel Spacing="10">
-                    <TextBlock x:Uid="Profile_BellSoundInfo"
-                               Style="{StaticResource DisclaimerStyle}" />
-                    <ItemsControl ItemsSource="{x:Bind Profile.CurrentBellSounds, Mode=OneWay}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Spacing="4" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate x:DataType="local:BellSoundViewModel">
-                                <Grid TabFocusNavigation="Local">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="300" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <!--  standard UI for bell sound entry  -->
-                                    <StackPanel Grid.Column="0"
-                                                Visibility="{x:Bind FileExists, Mode=OneWay}">
-                                        <TextBlock Style="{StaticResource TextBlockSettingStyle}"
-                                                   Text="{x:Bind DisplayPath, Mode=OneWay}" />
-                                        <TextBlock Foreground="{ThemeResource SubgroupHeaderBrush}"
-                                                   Style="{StaticResource CaptionTextBlockStyle}"
-                                                   Text="{x:Bind SubText, Mode=OneWay}"
-                                                   Visibility="{x:Bind ShowDirectory, Mode=OneWay}" />
-                                    </StackPanel>
-                                    <!--  When a file is not found, we use this UI  -->
-                                    <StackPanel Grid.Column="0"
-                                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(FileExists), Mode=OneWay}">
-                                        <TextBlock Style="{StaticResource TextBlockSettingStyle}"
-                                                   Text="{x:Bind DisplayPath, Mode=OneWay}"
-                                                   TextDecorations="Strikethrough" />
-                                        <TextBlock Foreground="{ThemeResource SubgroupHeaderBrush}"
-                                                   Style="{StaticResource CaptionTextBlockStyle}"
-                                                   Text="{x:Bind SubText, Mode=OneWay}" />
-                                    </StackPanel>
-                                    <Button x:Uid="Profile_BellSoundAudioPreview"
-                                            Grid.Column="1"
-                                            Margin="4,0,0,0"
-                                            VerticalAlignment="Stretch"
-                                            Click="BellSoundAudioPreview_Click"
-                                            IsEnabled="{x:Bind FileExists, Mode=OneWay}"
-                                            Style="{StaticResource BrowseButtonStyle}"
-                                            Tag="{Binding Mode=OneWay}">
-                                        <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                                  Glyph="&#xE767;" />
-                                    </Button>
-                                    <Button x:Uid="Profile_BellSoundDelete"
-                                            Grid.Column="2"
-                                            Margin="4,0,0,0"
-                                            VerticalAlignment="Stretch"
-                                            Click="BellSoundDelete_Click"
-                                            Style="{StaticResource DeleteButtonStyle}"
-                                            Tag="{Binding Mode=OneWay}">
-                                        <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                                  Glyph="&#xE74D;" />
-                                    </Button>
-                                </Grid>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                    <Button x:Name="AddBellSoundButton"
-                            Click="BellSoundAdd_Click">
-                        <StackPanel Orientation="Horizontal">
-                            <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                      Glyph="&#xE948;" />
-                            <TextBlock x:Uid="Profile_AddBellSound"
-                                       Margin="8,0,0,0" />
+            <local:SettingsExpander x:Name="BellSound"
+                                    x:Uid="Profile_BellSound">
+                <local:SettingsExpander.Content>
+                    <TextBlock Style="{StaticResource SettingContainerCurrentValueTextBlockStyle}"
+                               Text="{x:Bind Profile.BellSoundPreview, Mode=OneWay}" />
+                </local:SettingsExpander.Content>
+                <local:SettingsExpander.ItemsHeader>
+                    <ContentPresenter Padding="16,12,16,16">
+                        <StackPanel Spacing="10">
+                            <TextBlock x:Uid="Profile_BellSoundInfo"
+                                       Style="{StaticResource DisclaimerStyle}" />
+                            <ItemsControl ItemsSource="{x:Bind Profile.CurrentBellSounds, Mode=OneWay}">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <StackPanel Spacing="4" />
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate x:DataType="local:BellSoundViewModel">
+                                        <Grid TabFocusNavigation="Local">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="300" />
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="Auto" />
+                                            </Grid.ColumnDefinitions>
+                                            <!--  standard UI for bell sound entry  -->
+                                            <StackPanel Grid.Column="0"
+                                                        Visibility="{x:Bind FileExists, Mode=OneWay}">
+                                                <TextBlock Style="{StaticResource TextBlockSettingStyle}"
+                                                           Text="{x:Bind DisplayPath, Mode=OneWay}" />
+                                                <TextBlock Foreground="{ThemeResource SubgroupHeaderBrush}"
+                                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                                           Text="{x:Bind SubText, Mode=OneWay}"
+                                                           Visibility="{x:Bind ShowDirectory, Mode=OneWay}" />
+                                            </StackPanel>
+                                            <!--  When a file is not found, we use this UI  -->
+                                            <StackPanel Grid.Column="0"
+                                                        Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(FileExists), Mode=OneWay}">
+                                                <TextBlock Style="{StaticResource TextBlockSettingStyle}"
+                                                           Text="{x:Bind DisplayPath, Mode=OneWay}"
+                                                           TextDecorations="Strikethrough" />
+                                                <TextBlock Foreground="{ThemeResource SubgroupHeaderBrush}"
+                                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                                           Text="{x:Bind SubText, Mode=OneWay}" />
+                                            </StackPanel>
+                                            <Button x:Uid="Profile_BellSoundAudioPreview"
+                                                    Grid.Column="1"
+                                                    Margin="4,0,0,0"
+                                                    VerticalAlignment="Stretch"
+                                                    Click="BellSoundAudioPreview_Click"
+                                                    IsEnabled="{x:Bind FileExists, Mode=OneWay}"
+                                                    Style="{StaticResource BrowseButtonStyle}"
+                                                    Tag="{Binding Mode=OneWay}">
+                                                <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                                          Glyph="&#xE767;" />
+                                            </Button>
+                                            <Button x:Uid="Profile_BellSoundDelete"
+                                                    Grid.Column="2"
+                                                    Margin="4,0,0,0"
+                                                    VerticalAlignment="Stretch"
+                                                    Click="BellSoundDelete_Click"
+                                                    Style="{StaticResource DeleteButtonStyle}"
+                                                    Tag="{Binding Mode=OneWay}">
+                                                <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                                          Glyph="&#xE74D;" />
+                                            </Button>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                            <Button x:Name="AddBellSoundButton"
+                                    Click="BellSoundAdd_Click">
+                                <StackPanel Orientation="Horizontal">
+                                    <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                              Glyph="&#xE948;" />
+                                    <TextBlock x:Uid="Profile_AddBellSound"
+                                               Margin="8,0,0,0" />
+                                </StackPanel>
+                            </Button>
                         </StackPanel>
-                    </Button>
-                </StackPanel>
-            </local:SettingContainer>
+                    </ContentPresenter>
+                </local:SettingsExpander.ItemsHeader>
+            </local:SettingsExpander>
 
             <!--  RightClickContextMenu  -->
-            <local:SettingContainer x:Name="RightClickContextMenu"
-                                    x:Uid="Profile_RightClickContextMenu"
-                                    ClearSettingValue="{x:Bind Profile.ClearRightClickContextMenu}"
-                                    HasSettingValue="{x:Bind Profile.HasRightClickContextMenu, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.RightClickContextMenuOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="RightClickContextMenu"
+                                x:Uid="Profile_RightClickContextMenu">
                 <ToggleSwitch IsOn="{x:Bind Profile.RightClickContextMenu, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  ShowMarks  -->
-            <local:SettingContainer x:Name="ShowMarks"
-                                    x:Uid="Profile_ShowMarks"
-                                    ClearSettingValue="{x:Bind Profile.ClearShowMarks}"
-                                    HasSettingValue="{x:Bind Profile.HasShowMarks, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.ShowMarksOverrideSource, Mode=OneWay}"
-                                    Visibility="{x:Bind Profile.ShowMarksAvailable}">
+            <local:SettingsCard x:Name="ShowMarks"
+                                x:Uid="Profile_ShowMarks"
+                                Visibility="{x:Bind Profile.ShowMarksAvailable}">
                 <ToggleSwitch IsOn="{x:Bind Profile.ShowMarks, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  AutoMarkPrompts  -->
-            <local:SettingContainer x:Name="AutoMarkPrompts"
-                                    x:Uid="Profile_AutoMarkPrompts"
-                                    ClearSettingValue="{x:Bind Profile.ClearAutoMarkPrompts}"
-                                    HasSettingValue="{x:Bind Profile.HasAutoMarkPrompts, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.AutoMarkPromptsOverrideSource, Mode=OneWay}"
-                                    Visibility="{x:Bind Profile.AutoMarkPromptsAvailable}">
+            <local:SettingsCard x:Name="AutoMarkPrompts"
+                                x:Uid="Profile_AutoMarkPrompts"
+                                Visibility="{x:Bind Profile.AutoMarkPromptsAvailable}">
                 <ToggleSwitch IsOn="{x:Bind Profile.AutoMarkPrompts, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  ReloadEnvVars  -->
-            <local:SettingContainer x:Name="ReloadEnvVars"
-                                    x:Uid="Profile_ReloadEnvVars"
-                                    ClearSettingValue="{x:Bind Profile.ClearReloadEnvironmentVariables}"
-                                    HasSettingValue="{x:Bind Profile.HasReloadEnvironmentVariables, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.ReloadEnvironmentVariablesOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="ReloadEnvVars"
+                                x:Uid="Profile_ReloadEnvVars">
                 <ToggleSwitch IsOn="{x:Bind Profile.ReloadEnvironmentVariables, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  RepositionCursorWithMouse  -->
-            <local:SettingContainer x:Name="RepositionCursorWithMouse"
-                                    x:Uid="Profile_RepositionCursorWithMouse"
-                                    ClearSettingValue="{x:Bind Profile.ClearRepositionCursorWithMouse}"
-                                    HasSettingValue="{x:Bind Profile.HasRepositionCursorWithMouse, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.RepositionCursorWithMouseOverrideSource, Mode=OneWay}"
-                                    Visibility="{x:Bind Profile.RepositionCursorWithMouseAvailable}">
+            <local:SettingsCard x:Name="RepositionCursorWithMouse"
+                                x:Uid="Profile_RepositionCursorWithMouse"
+                                Visibility="{x:Bind Profile.RepositionCursorWithMouseAvailable}">
                 <ToggleSwitch IsOn="{x:Bind Profile.RepositionCursorWithMouse, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  RainbowSuggestions  -->
-            <local:SettingContainer x:Name="RainbowSuggestions"
-                                    x:Uid="Profile_RainbowSuggestions"
-                                    ClearSettingValue="{x:Bind Profile.ClearRainbowSuggestions}"
-                                    HasSettingValue="{x:Bind Profile.HasRainbowSuggestions, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.RainbowSuggestionsOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="RainbowSuggestions"
+                                x:Uid="Profile_RainbowSuggestions">
                 <ToggleSwitch IsOn="{x:Bind Profile.RainbowSuggestions, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Path Translation  -->
-            <local:SettingContainer x:Name="PathTranslationStyle"
-                                    x:Uid="Profile_PathTranslationStyle"
-                                    ClearSettingValue="{x:Bind Profile.ClearPathTranslationStyle}"
-                                    HasSettingValue="{x:Bind Profile.HasPathTranslationStyle, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.PathTranslationStyleOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="PathTranslationStyle"
+                                x:Uid="Profile_PathTranslationStyle">
                 <ComboBox AutomationProperties.AccessibilityView="Content"
                           ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                           ItemsSource="{x:Bind Profile.PathTranslationStyleList, Mode=OneWay}"
                           SelectedItem="{x:Bind Profile.CurrentPathTranslationStyle, Mode=TwoWay}"
                           Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Drag Drop Delimiter  -->
-            <local:SettingContainer x:Name="DragDropDelimiter"
-                                    x:Uid="Profile_DragDropDelimiter"
-                                    ClearSettingValue="{x:Bind Profile.ClearDragDropDelimiter}"
-                                    HasSettingValue="{x:Bind Profile.HasDragDropDelimiter, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.DragDropDelimiterOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="DragDropDelimiter"
+                                x:Uid="Profile_DragDropDelimiter">
                 <TextBox Style="{StaticResource TextBoxSettingStyle}"
                          Text="{x:Bind Profile.DragDropDelimiter, Mode=TwoWay}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
         </StackPanel>
     </Grid>
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp
index 8a24895a57d..e817b200202 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.cpp
@@ -70,7 +70,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             TraceLoggingValue(_Profile.IsBaseLayer(), "IsProfileDefaults", "If the modified profile is the profile.defaults object"),
             TraceLoggingValue(static_cast<GUID>(_Profile.Guid()), "ProfileGuid", "The guid of the profile that was navigated to"),
             TraceLoggingValue(_Profile.Source().c_str(), "ProfileSource", "The source of the profile that was navigated to"),
-            TraceLoggingValue(_Profile.DefaultAppearance().BackgroundImageSettingsVisible(), "HasBackgroundImage", "If the profile has a background image defined"),
+            TraceLoggingValue(_Profile.DefaultAppearance().BackgroundImageSettingsEnabled(), "HasBackgroundImage", "If the profile has a background image defined"),
             TraceLoggingValue(_Profile.HasUnfocusedAppearance(), "HasUnfocusedAppearance", "If the profile has an unfocused appearance defined"),
             TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
             TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
index 280bca2940a..53254ee891c 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
@@ -81,16 +81,13 @@
                                WindowRoot="{x:Bind WindowRoot, Mode=OneTime}" />
 
             <!--  Grouping: Transparency  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Profile_TransparencyHeader"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-
+            <TextBlock x:Uid="Profile_TransparencyHeader"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <StackPanel Spacing="2"
+                        Style="{StaticResource PivotStackStyle}">
                 <!--  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}">
+                <local:SettingsCard x:Name="Opacity"
+                                    x:Uid="Profile_Opacity">
                     <StackPanel>
                         <Grid Style="{StaticResource CustomSliderControlGridStyle}">
                             <Grid.ColumnDefinitions>
@@ -105,105 +102,102 @@
                                        Text="{x:Bind mtu:Converters.PercentageToPercentageString(Profile.Opacity), Mode=OneWay}" />
                         </Grid>
                     </StackPanel>
-                </local:SettingContainer>
+                </local:SettingsCard>
 
                 <!--  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}">
+                <local:SettingsCard x:Name="UseAcrylic"
+                                    x:Uid="Profile_UseAcrylic">
                     <ToggleSwitch IsOn="{x:Bind Profile.UseAcrylic, Mode=TwoWay}"
                                   Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+                </local:SettingsCard>
 
             </StackPanel>
 
             <!--  Grouping: Window  -->
-            <StackPanel Style="{StaticResource PivotStackStyle}">
-                <TextBlock x:Uid="Profile_WindowHeader"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
-
+            <TextBlock x:Uid="Profile_WindowHeader"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <StackPanel Spacing="2"
+                        Style="{StaticResource PivotStackStyle}">
                 <!--  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>
+                <local:SettingsExpander x:Name="Padding"
+                                        x:Uid="Profile_Padding">
+                    <local:SettingsExpander.Content>
+                        <TextBlock Style="{StaticResource SettingContainerCurrentValueTextBlockStyle}"
+                                   Text="{x:Bind Profile.Padding, Mode=OneWay}" />
+                    </local:SettingsExpander.Content>
+                    <local:SettingsExpander.ItemsHeader>
+                        <ContentPresenter Padding="16,12,16,16">
+                            <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>
+                        </ContentPresenter>
+                    </local:SettingsExpander.ItemsHeader>
+                </local:SettingsExpander>
 
                 <!--  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}">
+                <local:SettingsCard x:Name="ScrollbarVisibility"
+                                    x:Uid="Profile_ScrollbarVisibility">
                     <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>
+                </local:SettingsCard>
             </StackPanel>
             <StackPanel MaxWidth="{StaticResource StandardControlMaxWidth}">
                 <StackPanel Orientation="Horizontal"
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
index 6a2840c011b..514c2f12553 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
@@ -21,10 +21,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         const auto startingDirCheckboxTooltip{ ToolTipService::GetToolTip(StartingDirectoryUseParentCheckbox()) };
         Automation::AutomationProperties::SetFullDescription(StartingDirectoryUseParentCheckbox(), unbox_value<hstring>(startingDirCheckboxTooltip));
 
-        Automation::AutomationProperties::SetName(DeleteButton(), RS_(L"Profile_DeleteButton/Text"));
-        AppearanceNavigator().Content(box_value(RS_(L"Profile_Appearance/Header")));
-        TerminalNavigator().Content(box_value(RS_(L"Profile_Terminal/Header")));
-        AdvancedNavigator().Content(box_value(RS_(L"Profile_Advanced/Header")));
+        AppearanceNavigator().Header(box_value(RS_(L"Profile_Appearance/Header")));
+        TerminalNavigator().Header(box_value(RS_(L"Profile_Terminal/Header")));
+        AdvancedNavigator().Header(box_value(RS_(L"Profile_Advanced/Header")));
     }
 
     void Profiles_Base::OnNavigatedTo(const NavigationEventArgs& e)
@@ -51,7 +50,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             if (_Profile.FocusDeleteButton())
             {
-                DeleteButton().Focus(FocusState::Programmatic);
+                DeleteProfileButton().Focus(FocusState::Programmatic);
                 _Profile.FocusDeleteButton(false);
             }
         });
@@ -88,6 +87,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _Profile.CurrentPage(ProfileSubPage::Advanced);
     }
 
+    void Profiles_Base::ResetProfileConfirmation_Click(const IInspectable& /*sender*/, const RoutedEventArgs& /*e*/)
+    {
+        Profile().ResetSettings();
+    }
+
     void Profiles_Base::DeleteConfirmation_Click(const IInspectable& /*sender*/, const RoutedEventArgs& /*e*/)
     {
         TraceLoggingWrite(
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.h b/src/cascadia/TerminalSettingsEditor/Profiles_Base.h
index 2fa4ab72254..8b8594c6b94 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.h
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.h
@@ -22,6 +22,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void Appearance_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
         void Terminal_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
         void Advanced_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
+        void ResetProfileConfirmation_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
         void DeleteConfirmation_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
 
         til::property_changed_event PropertyChanged;
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
index 9ba89412c2c..aef81751654 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
@@ -32,82 +32,62 @@
                    Style="{StaticResource DisclaimerStyle}"
                    Visibility="{x:Bind Profile.IsBaseLayer}" />
         <StackPanel Grid.Row="1"
+                    Spacing="2"
                     Style="{StaticResource SettingsStackStyle}">
 
             <!--  Name  -->
-            <!--
-                NOTE: Has/Clear is not bound because we don't want the reset button & override text to appear.
-                Additionally, the JSON stubs generated by auto-generated profiles come with a name,
-                so the name will always be overridden.
-            -->
-            <local:SettingContainer x:Name="Name"
-                                    x:Uid="Profile_Name"
-                                    CurrentValue="{x:Bind Profile.Name, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}"
-                                    Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+            <local:SettingsCard x:Name="Name"
+                                x:Uid="Profile_Name"
+                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
                 <TextBox Style="{StaticResource TextBoxSettingStyle}"
                          Text="{x:Bind Profile.Name, Mode=TwoWay}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  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>
+            <local:SettingsCard x:Name="Commandline"
+                                x:Uid="Profile_Commandline"
+                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                <StackPanel Orientation="Horizontal"
+                            Spacing="8">
                     <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>
+            </local:SettingsCard>
 
             <!--  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}">
+            <local:SettingsCard x:Name="StartingDirectory"
+                                x:Uid="Profile_StartingDirectory">
                 <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">
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="8">
+                        <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}" />
                         <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>
+                    <CheckBox x:Name="StartingDirectoryUseParentCheckbox"
+                              x:Uid="Profile_StartingDirectoryUseParentCheckbox"
+                              Margin="0,4,0,0"
+                              IsChecked="{x:Bind Profile.UseParentProcessDirectory, Mode=TwoWay}" />
                 </StackPanel>
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Icon  -->
-            <local:SettingContainer x:Name="Icon"
+            <local:SettingsExpander 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>
+                                    AutomationProperties.Name="{x:Bind Profile.LocalizedIcon, Mode=OneWay}">
+                <local:SettingsExpander.Content>
                     <Grid>
                         <ContentControl Width="16"
                                         Height="16"
@@ -122,86 +102,81 @@
                                    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>
+                </local:SettingsExpander.Content>
+                <local:SettingsExpander.ItemsHeader>
+                    <ContentPresenter Padding="16,12,16,16">
+                        <local:IconPicker CurrentIconPath="{x:Bind Profile.IconPath, Mode=TwoWay}"
+                                          WindowRoot="{x:Bind WindowRoot, Mode=OneWay}" />
+                    </ContentPresenter>
+                </local:SettingsExpander.ItemsHeader>
+            </local:SettingsExpander>
 
             <!--  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}">
+            <local:SettingsCard x:Name="TabTitle"
+                                x:Uid="Profile_TabTitle">
                 <TextBox Style="{StaticResource TextBoxSettingStyle}"
                          Text="{x:Bind Profile.TabTitle, Mode=TwoWay}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Tab Color  -->
-            <local:SettingContainer x:Name="TabColor"
+            <local:SettingsExpander 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>
+                                    AutomationProperties.Name="{x:Bind Profile.TabColorPreview, Converter={StaticResource ColorToStringConverter}, Mode=OneWay}">
+                <local:SettingsExpander.Content>
+                    <ContentControl Content="{x:Bind Profile.TabColorPreview, Mode=OneWay}"
+                                    ContentTemplate="{StaticResource ColorPreviewTemplate}" />
+                </local:SettingsExpander.Content>
+                <local:SettingsExpander.ItemsHeader>
+                    <ContentPresenter Padding="16,12,16,16">
+                        <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}" />
+                    </ContentPresenter>
+                </local:SettingsExpander.ItemsHeader>
+            </local:SettingsExpander>
 
             <!--  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}">
+            <local:SettingsCard x:Name="Elevate"
+                                x:Uid="Profile_Elevate">
                 <ToggleSwitch IsOn="{x:Bind Profile.Elevate, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Hidden  -->
-            <local:SettingContainer x:Name="Hidden"
-                                    x:Uid="Profile_Hidden"
-                                    Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+            <local:SettingsCard 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>
+            </local:SettingsCard>
 
-            <TextBlock x:Uid="Profile_AdditionalSettingsHeader"
-                       Margin="0,32,0,4"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Reset Profile  -->
+            <local:SettingsCard x:Name="ResetProfile"
+                                x:Uid="Profile_ResetProfile"
+                                Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                <Button x:Uid="Profile_ResetProfileButton"
+                        Style="{StaticResource DeleteButtonStyle}">
+                    <Button.Flyout>
+                        <Flyout>
+                            <StackPanel>
+                                <TextBlock x:Uid="Profile_ResetProfileConfirmationMessage"
+                                           Style="{StaticResource CustomFlyoutTextStyle}" />
+                                <Button x:Uid="Profile_ResetProfileConfirmationButton"
+                                        Click="ResetProfileConfirmation_Click" />
+                            </StackPanel>
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
+            </local:SettingsCard>
 
-            <Button x:Name="AppearanceNavigator"
-                    Click="Appearance_Click"
-                    Style="{StaticResource NavigatorButtonStyle}" />
-            <Button x:Name="TerminalNavigator"
-                    Click="Terminal_Click"
-                    Style="{StaticResource NavigatorButtonStyle}" />
-            <Button x:Name="AdvancedNavigator"
-                    Click="Advanced_Click"
-                    Style="{StaticResource NavigatorButtonStyle}" />
-            <!--  Delete Button  -->
-            <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
-                <Button x:Name="DeleteButton"
-                        Margin="{StaticResource StandardControlMargin}"
-                        Style="{StaticResource DeleteButtonStyle}"
-                        Visibility="{x:Bind Profile.CanDeleteProfile}">
-                    <Button.Content>
-                        <StackPanel Orientation="Horizontal">
-                            <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                      Glyph="&#xE74D;" />
-                            <TextBlock x:Uid="Profile_DeleteButton"
-                                       Margin="8,0,0,0" />
-                        </StackPanel>
-                    </Button.Content>
+            <!--  Delete Profile  -->
+            <local:SettingsCard x:Name="DeleteProfile"
+                                x:Uid="Profile_DeleteProfile"
+                                Visibility="{x:Bind Profile.CanDeleteProfile}">
+                <Button x:Name="DeleteProfileButton"
+                        x:Uid="Profile_DeleteProfileButton"
+                        Style="{StaticResource DeleteButtonStyle}">
                     <Button.Flyout>
                         <Flyout>
                             <StackPanel>
@@ -213,7 +188,21 @@
                         </Flyout>
                     </Button.Flyout>
                 </Button>
-            </Border>
+            </local:SettingsCard>
+
+            <TextBlock x:Uid="Profile_AdditionalSettingsHeader"
+                       Margin="0,32,0,4"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+
+            <local:SettingsCard x:Name="AppearanceNavigator"
+                                Click="Appearance_Click"
+                                IsClickEnabled="True" />
+            <local:SettingsCard x:Name="TerminalNavigator"
+                                Click="Terminal_Click"
+                                IsClickEnabled="True" />
+            <local:SettingsCard x:Name="AdvancedNavigator"
+                                Click="Advanced_Click"
+                                IsClickEnabled="True" />
         </StackPanel>
     </Grid>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.xaml
index 6f928b0cb73..b6e3867e435 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.xaml
@@ -23,9 +23,9 @@
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
         <!--  Delete Button  -->
-        <local:SettingContainer x:Name="DeleteOrphaned"
-                                x:Uid="Profile_Delete_Orphaned">
-            <local:SettingContainer.Content>
+        <local:SettingsCard x:Name="DeleteOrphaned"
+                            x:Uid="Profile_Delete_Orphaned">
+            <local:SettingsCard.Content>
                 <Button x:Name="DeleteButton"
                         Click="DeleteConfirmation_Click"
                         Style="{StaticResource DeleteButtonStyle}">
@@ -38,25 +38,25 @@
                         </StackPanel>
                     </Button.Content>
                 </Button>
-            </local:SettingContainer.Content>
-        </local:SettingContainer>
+            </local:SettingsCard.Content>
+        </local:SettingsCard>
 
-        <local:SettingContainer x:Name="Name"
-                                x:Uid="Profile_Name">
-            <local:SettingContainer.Content>
+        <local:SettingsCard x:Name="Name"
+                            x:Uid="Profile_Name">
+            <local:SettingsCard.Content>
                 <TextBlock FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
                            Style="{StaticResource SettingsPageItemDescriptionStyle}"
                            Text="{x:Bind Profile.Name, Mode=OneTime}" />
-            </local:SettingContainer.Content>
-        </local:SettingContainer>
+            </local:SettingsCard.Content>
+        </local:SettingsCard>
 
-        <local:SettingContainer x:Name="Source"
-                                x:Uid="Profile_Source_Orphaned">
-            <local:SettingContainer.Content>
+        <local:SettingsCard x:Name="Source"
+                            x:Uid="Profile_Source_Orphaned">
+            <local:SettingsCard.Content>
                 <TextBlock FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
                            Style="{StaticResource SettingsPageItemDescriptionStyle}"
                            Text="{x:Bind Profile.Source, Mode=OneTime}" />
-            </local:SettingContainer.Content>
-        </local:SettingContainer>
+            </local:SettingsCard.Content>
+        </local:SettingsCard>
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml
index b8701d7132d..9d6d165b36b 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml
@@ -29,69 +29,58 @@
                    Style="{StaticResource DisclaimerStyle}"
                    Visibility="{x:Bind Profile.IsBaseLayer}" />
         <StackPanel Grid.Row="1"
+                    Spacing="2"
                     Style="{StaticResource SettingsStackStyle}">
 
             <!--  Suppress Application Title  -->
-            <local:SettingContainer x:Name="SuppressApplicationTitle"
-                                    x:Uid="Profile_SuppressApplicationTitle"
-                                    ClearSettingValue="{x:Bind Profile.ClearSuppressApplicationTitle}"
-                                    HasSettingValue="{x:Bind Profile.HasSuppressApplicationTitle, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="SuppressApplicationTitle"
+                                x:Uid="Profile_SuppressApplicationTitle">
                 <ToggleSwitch IsOn="{x:Bind Profile.SuppressApplicationTitle, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Force VT Input  -->
-            <local:SettingContainer x:Name="ForceVTInput"
-                                    x:Uid="Profile_ForceVTInput"
-                                    ClearSettingValue="{x:Bind Profile.ClearForceVTInput}"
-                                    HasSettingValue="{x:Bind Profile.HasForceVTInput, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.ForceVTInputOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="ForceVTInput"
+                                x:Uid="Profile_ForceVTInput">
                 <ToggleSwitch IsOn="{x:Bind Profile.ForceVTInput, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Kitty Keyboard Mode  -->
-            <local:SettingContainer x:Name="AllowKittyKeyboardMode"
-                                    x:Uid="Profile_AllowKittyKeyboardMode"
-                                    ClearSettingValue="{x:Bind Profile.ClearAllowKittyKeyboardMode}"
-                                    HasSettingValue="{x:Bind Profile.HasAllowKittyKeyboardMode, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.AllowKittyKeyboardModeOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="AllowKittyKeyboardMode"
+                                x:Uid="Profile_AllowKittyKeyboardMode">
                 <ToggleSwitch IsOn="{x:Bind Profile.AllowKittyKeyboardMode, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Allow VT Checksum Report  -->
-            <local:SettingContainer x:Name="AllowVtChecksumReport"
-                                    x:Uid="Profile_AllowVtChecksumReport"
-                                    ClearSettingValue="{x:Bind Profile.ClearAllowVtChecksumReport}"
-                                    HasSettingValue="{x:Bind Profile.HasAllowVtChecksumReport, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.AllowVtChecksumReportOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="AllowVtChecksumReport"
+                                x:Uid="Profile_AllowVtChecksumReport">
                 <ToggleSwitch IsOn="{x:Bind Profile.AllowVtChecksumReport, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Allow VT Clipboard Writing  -->
-            <local:SettingContainer x:Name="AllowVtClipboardWrite"
-                                    x:Uid="Profile_AllowVtClipboardWrite"
-                                    ClearSettingValue="{x:Bind Profile.ClearAllowVtClipboardWrite}"
-                                    HasSettingValue="{x:Bind Profile.HasAllowVtClipboardWrite, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.AllowVtClipboardWriteOverrideSource, Mode=OneWay}">
+            <local:SettingsCard x:Name="AllowVtClipboardWrite"
+                                x:Uid="Profile_AllowVtClipboardWrite">
                 <ToggleSwitch IsOn="{x:Bind Profile.AllowVtClipboardWrite, Mode=TwoWay}"
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+            </local:SettingsCard>
 
             <!--  Answerback Message  -->
-            <local:SettingContainer x:Name="AnswerbackMessage"
-                                    x:Uid="Profile_AnswerbackMessage"
-                                    ClearSettingValue="{x:Bind Profile.ClearAnswerbackMessage}"
-                                    CurrentValue="{x:Bind Profile.AnswerbackMessagePreview, Mode=OneWay}"
-                                    HasSettingValue="{x:Bind Profile.HasAnswerbackMessage, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.AnswerbackMessageOverrideSource, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                         Text="{x:Bind Profile.AnswerbackMessage, Mode=TwoWay}" />
-            </local:SettingContainer>
+            <local:SettingsExpander x:Name="AnswerbackMessage"
+                                    x:Uid="Profile_AnswerbackMessage">
+                <local:SettingsExpander.Content>
+                    <TextBlock Style="{StaticResource SettingContainerCurrentValueTextBlockStyle}"
+                               Text="{x:Bind Profile.AnswerbackMessagePreview, Mode=OneWay}" />
+                </local:SettingsExpander.Content>
+                <local:SettingsExpander.ItemsHeader>
+                    <ContentPresenter Padding="16,12,16,16">
+                        <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                                 Text="{x:Bind Profile.AnswerbackMessage, Mode=TwoWay}" />
+                    </ContentPresenter>
+                </local:SettingsExpander.ItemsHeader>
+            </local:SettingsExpander>
         </StackPanel>
     </Grid>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.xaml b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
index 9a966d0f913..fa668919edf 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
@@ -23,26 +23,27 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <StackPanel Style="{StaticResource SettingsStackStyle}">
-        <local:SettingContainer x:Name="GraphicsAPI"
-                                x:Uid="Globals_GraphicsAPI">
+    <StackPanel Spacing="2"
+                Style="{StaticResource SettingsStackStyle}">
+        <local:SettingsCard x:Name="GraphicsAPI"
+                            x:Uid="Globals_GraphicsAPI">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.GraphicsAPIList}"
                       SelectedItem="{x:Bind ViewModel.CurrentGraphicsAPI, Mode=TwoWay}"
                       Style="{StaticResource ComboBoxSettingStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
-        <local:SettingContainer x:Name="DisablePartialInvalidation"
-                                x:Uid="Globals_DisablePartialInvalidation">
+        <local:SettingsCard x:Name="DisablePartialInvalidation"
+                            x:Uid="Globals_DisablePartialInvalidation">
             <ToggleSwitch IsOn="{x:Bind ViewModel.DisablePartialInvalidation, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
 
-        <local:SettingContainer x:Name="SoftwareRendering"
-                                x:Uid="Globals_SoftwareRendering">
+        <local:SettingsCard x:Name="SoftwareRendering"
+                            x:Uid="Globals_SoftwareRendering">
             <ToggleSwitch IsOn="{x:Bind ViewModel.SoftwareRendering, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
+        </local:SettingsCard>
     </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw
index 3b20dcb8ee6..0e84a3de2f3 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>Dieses Farbschema ist Teil der integrierten Einstellungen oder einer installierten Erweiterung.</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>Um Änderungen an diesem Farbschema vorzunehmen, müssen Sie eine Kopie davon erstellen.</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>Farbschema als Standard festlegen</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>Dieses Farbschema standardmäßig auf alle Profile anwenden. Einzelne Profile können weiterhin ihre eigenen Farbschemas auswählen.</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>Sprache (erfordert Neustart)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>Wählt eine Anzeigesprache für die Anwendung aus. Dadurch wird die Standardsprache der Windows-Benutzeroberfläche überschrieben.</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>Standard-IME-Eingabemodus</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>Informiert den IME, welche Sprache standardmäßig verwendet werden soll. Für Sprachen, die auf einem IME basieren und standardmäßig keine lateinischen Zeichen verwenden, kann diese Einstellung verwendet werden, um beim Start die Eingabe in Englisch zu erzwingen.</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>Registerkarten immer anzeigen</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>Wenn diese Option deaktiviert ist, wird die Registerkartenleiste angezeigt, wenn eine neue Registerkarte erstellt wird. Kann nicht deaktiviert werden, während "Titelleiste ausblenden" aktiviert ist.</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>Position neu erstellter Registerkarten</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>Gibt an, wo neue Registerkarten in der Registerkartenzeile angezeigt werden.</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>Standard-URL, die für die Aktion "Web suchen" verwendet werden soll</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>Der Platzhalter "%s" wird durch die Suchabfrage ersetzt.</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>Standardprofil</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>Profil, das beim Klicken auf das Symbol „+“ oder das Tippen der Tastenbindung für die neue Registerkarte geöffnet wird.</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>Standardmäßige Terminalanwendung</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>Die Terminalanwendung, die gestartet wird, wenn eine Befehlszeilenanwendung ohne vorhandene Sitzung gestartet wird, beispielsweise vom Startmenü oder über das Dialogfeld "Ausführen".</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>Grafik-API</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Direct3D 11 bietet eine leistungsfähigere und funktionsreichere Benutzeroberfläche, während Direct2D stabiler ist. Mit der Standardoption "Automatisch" wird die API ausgewählt, die am besten zu Ihrer Grafikhardware passt. Wenn erhebliche Probleme auftreten, erwägen Sie die Verwendung von Direct2D.</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>Swapchain-Teilinvalidierung deaktivieren</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>Standardmäßig verwendet der Textrenderer eine FLIP_SEQUENTIAL Swap Chain und deklariert modifiziert Rechtecke über die Present1-API. Wenn diese Einstellung aktiviert ist, wird stattdessen eine FLIP_DISCARD Swap Chain verwendet, und es werden keine modifiziert Rechtecke deklariert. Ob der eine oder der andere besser ist, hängt von Ihrer Hardware und verschiedenen anderen Faktoren ab.</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>Softwarerendering verwenden (WARP)</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, verwendet das Terminal einen Softwarerasterer (WARP). Diese Einstellung sollte unter fast allen Umständen deaktiviert bleiben.</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>Textmessungsmodus</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>Dadurch wird geändert, wie eingehender Text in Zellen gruppiert wird. Die Option "Grapheme clusters" ist die moderne und unicode-korrekte Methode, während "wcswidth" ein gängiger Ansatz für UNIX ist und "Windows-Konsole" die für die Arbeit unter Windows verwendete Methode repliziert. Das Ändern dieser Einstellung erfordert einen Neustart von Windows-Terminal und gilt nur für Anwendungen, die innerhalb der Einstellung gestartet werden.</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>Breite von mehrdeutigen Zeichen</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>Legt die Breite fest, die für ostasiatische mehrdeutige Zeichen verwendet wird. „Eng“ (Standard) priorisiert die Kompatibilität, während „Weit“ die Lesbarkeit mit vielen CJK-Schriftarten priorisiert. Im Modus „Breit“ funktionieren einige Anwendungen möglicherweise nicht ordnungsgemäß und verursachen eine erratische Cursorbewegung. Das Ändern dieser Einstellung erfordert einen Neustart von Windows-Terminal und gilt nur für Anwendungen, die von dort aus gestartet werden.</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>Breit</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>Spalten</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>Zeilen</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>Beim Starten des Terminals</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>Gibt an, was angezeigt werden soll, wenn das erste Terminal erstellt wird.</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>Startparameter</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>Einstellungen, die steuern, wie das Terminal gestartet wird</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>Startmodus</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Wie das Terminal beim Start angezeigt wird. Der Fokus blendet die Registerkarten und die Titelleiste aus.</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>Standard</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>Neues Instanzverhalten</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>Steuert, wie neue Terminalinstanzen an vorhandene Fenster angehängt werden.</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>Titelleiste ausblenden (Neustart erforderlich)</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>Wenn diese Option deaktiviert ist, wird die Titelleiste über den Registerkarten angezeigt.</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>Verwendung des Titels des aktiven Terminals als Anwendungstitel</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>Wenn diese Option deaktiviert ist, lautet die Titelleiste „Terminal“.</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>Anpassen der Fenstergröße an Zeichenraster ausrichten</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>Wenn diese Option deaktiviert ist, wird die Größe des Fensters reibungslos geändert.</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>Beim Starten des Computers starten</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Terminal automatisch starten, wenn Sie sich bei Windows anmelden.</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>Zentriert</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>Beim Start zentrieren</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Wenn diese Option aktiviert ist, wird das Fenster beim Starten in der Mitte des Bildschirms platziert.</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>Immer im Vordergrund</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>Debugfeatures aktivieren</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>Terminal wird immer das oberste Fenster auf dem Desktop sein.</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>Bestimmte Tastatureingaben in einigen Anwendungen funktionieren möglicherweise nicht mehr ordnungsgemäß, wenn diese Einstellung aktiviert ist.</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>Auf diese Weise können Aktionen wie globale Korrektur- und Quakemodusaktionen auch dann funktionieren, wenn keine Fenster geöffnet sind.</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>Modus Registerkartenbreite</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>Mit "Kompakt" werden inaktive Registerkarten auf die Größe des Symbols verkleinert.</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>Worttrennzeichen</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>Diese Symbole werden verwendet, wenn Sie im Terminal auf Text doppelklicken oder "Markierungsmodus" aktivieren.</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>Hintergrunddeckkraft</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>Legt die Deckkraft des Fensters fest.</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>AltGr-Aliasing</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>Standardmäßig behandelt Windows STRG+ALT als Alias für AltGr. Diese Einstellung überschreibt das Standardverhalten von Windows.</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>Text-Aliasing</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>Steuert, wie Antialiasing für Text im Renderer funktioniert.</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>Hintergrundbild-Pfad</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>Dateispeicherort des Bilds, das im Hintergrund des Fensters verwendet wird.</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>Ausrichtung des Hintergrundbilds</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>Legt fest, wie das Hintergrundbild an den Fensterrändern ausgerichtet wird.</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>Hintergrundbild-Deckkraft</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>Legt die Deckkraft des Hintergrundbilds fest.</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>Streckmodus für Hintergrundbild</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>Legt fest, wie das Hintergrundbild angepasst wird, um das Fenster auszufüllen.</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>Farbschema</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>Erweitern, um den Vordergrund-, Hintergrund- und Auswahlhintergrund außer Kraft zu setzen.</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>Befehlszeile</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>Im Profil verwendete ausführbare Datei.</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>Cursorhöhe</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>Legt die prozentuale Höhe des Cursors beginnend von unten fest. Funktioniert nur mit der Vintage-Cursorform.</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>Schriftart</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>Sie können mehrere Schriftarten verwenden, indem Sie sie durch ein ASCII-Komma voneinander trennen.</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>Schriftgrad</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>Größe der Schriftart in Punkt.</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>Zellenbreite</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>Überschreiben Sie die Zeilenhöhe des Terminals. Gemessen als Vielfaches des Schriftgrads. Der Standardwert hängt von Ihrer Schriftart ab und liegt in der Regel bei 1,2.</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>Überschreiben Sie die Zellenbreite des Terminals. Gemessen als Vielfaches des Schriftgrads. Der Standardwert hängt von Ihrer Schriftart ab und liegt in der Regel bei 0,6.</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>Integrierte Glyphen</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, zeichnet das Terminal benutzerdefinierte Glyphen für Blockelement- und Rahmenelementzeichen, anstatt die Schriftart zu verwenden.</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>Vollfarb-Emoji</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, werden Emojis in Vollfarbe angezeigt.</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>Schriftstärke</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>Legt die Strichstärke (leichter oder betonter) für die angegebene Schriftart fest.</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>Profil in Dropdownliste ausblenden</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, wird das Profil nicht in der Liste der Profile angezeigt. Dies kann verwendet werden, um Standardprofile und dynamisch generierte Profile auszublenden, während sie in Ihrer Einstellungsdatei bleiben.</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>Dieses Profil als Administrator ausführen</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, wird das Profil automatisch in einem Admin Terminalfenster geöffnet. Wenn das aktuelle Fenster bereits als Administrator ausgeführt wird, wird es in diesem Fenster geöffnet.</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>Verlaufsgröße</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>Die Anzahl der Zeilen oberhalb der, die im Fenster angezeigt werden, zu dem Sie zurück scrollen können.</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>Symbol</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>Emoji- oder Bilddateipfad des im Profil verwendeten Symbols.</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>Abstand</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>Legt den Abstand um den Text im Fenster fest.</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>Retro-Terminal-Effekte</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>Zeigen Sie Retro-Terminaleffekte wie leuchtenden Text und Scanzeilen an.</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>Automatisches Anpassen der Helligkeit von nicht unterscheidbarem Text</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>Hellt Text automatisch auf oder verdunkelt ihn, um ihn besser sichtbar zu machen. Selbst wenn diese Funktion aktiviert ist, erfolgt diese Anpassung nur dann, wenn eine Kombination aus Vorder- und Hintergrundfarben zu einem schlechten Kontrast führen würde.</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>Startverzeichnis</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>Das Verzeichnis, in dem das Profil gestartet wird, wenn es geladen wird.</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>Titeländerungen unterdrücken</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>Anwendungsanforderungen zum Ändern des Titels ignorieren (OSC 2).</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>Registerkartentitel</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>Ersetzt den Profilnamen als Titel, der beim Starten an die Shell übergeben wird.</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>Acrylmaterial aktivieren</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>Wendet eine durchscheinende Textur auf den Hintergrund des Fensters an.</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>Glocken-Benachrichtigungsstil</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>Steuert, was passiert, wenn die Anwendung ein BEL-Zeichen ausgibt.</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>Diese Anwendung mit einem neuen Umgebungsblock starten</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, generiert das Terminal beim Erstellen neuer Registerkarten oder Bereiche mit diesem Profil einen neuen Umgebungsblock. Wenn diese Option deaktiviert ist, erbt die Registerkarte/der Bereich stattdessen die Variablen, mit denen das Terminal gestartet wurde.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>Menü bei Rechtsklick anzeigen</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, zeigt das Terminal ein Menü an, wenn Sie mit der rechten Maustaste klicken. Wenn diese Option deaktiviert ist, wird durch Klicken mit der rechten Maustaste der markierte Text kopiert (oder eingefügt, wenn keine Auswahl erfolgt).</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>Anzeigen von Markierungen auf der Scrollleiste</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, zeigt das Terminal Markierungen in der Scrollleiste an, wenn nach Text gesucht oder die Shellintegration aktiviert ist.</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>Prompts beim Drücken der EINGABETASTE automatisch markieren</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, fügt das Terminal automatisch eine Markierung hinzu, die die Position des Befehlsendes angibt, wenn Sie die EINGABETASTE drücken.</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>Experimentell: Positionieren des Cursors mit Mausklicks</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, wird der Cursor durch Klicken innerhalb des Prompts an diese Position verschoben. Dies erfordert, dass die Shellintegration in Ihrer Shell aktiviert ist, damit sie erwartungsgemäß funktioniert.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>Startgröße</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>Die Anzahl der Zeilen und Spalten, die beim ersten Laden im Fenster angezeigt werden. Gemessen in Zeichen.</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>Startposition</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Die anfängliche Position des Terminalfensters beim Start. Beim Start als maximierter Vollbildmodus oder mit aktivierter Option „Zentrieren beim Start“ wird dies verwendet, um den gewünschten Monitor als Ziel zu verwenden.</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>Alle</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>Profil löschen</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>Der Name des Profils, das in der Dropdown Liste angezeigt wird.</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>Benutzeroberflächenstil des Registerkarten-Umschalters</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>Legt fest, welche Schnittstelle verwendet wird, wenn Sie mit der Tastatur die Registerkarte wechseln.</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>Fenster automatisch ausblenden</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, wird das Terminal ausgeblendet, sobald Sie zu einem anderen Fenster wechseln.</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>Beim Schließen warnen</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>Steuert, wann ein Bestätigungsdialogfeld angezeigt wird, bevor Registerkarten oder Fenster geschlossen werden. "Immer" zeigt das Dialogfeld beim Schließen eines Fensters an.</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>Warnung beim Einfügen von Zeilenumbrüchen</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>Wenn Ihre Shell den Modus „Einfügen in Klammern“ nicht unterstützt, wird aus Sicherheitsgründen empfohlen, dies auf „Immer“ festzulegen.</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2274,7 +2262,7 @@
     <value>Klingelton</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>Steuert, welcher Sound wiedergegeben wird, wenn die Anwendung ein BEL Zeichen ausgibt. "Glockenbenachrichtigungsstil" muss "Hörbar" enthalten.</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2325,19 +2313,19 @@
     <value>Cursorfarbe</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>Überschreibt die Vordergrundfarbe aus dem Farbschema.</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>Überschreibt die Cursorfarbe aus dem Farbschema.</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>Überschreibt die Hintergrundfarbe aus dem Farbschema.</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>Überschreibt die Hintergrundfarbe der Auswahl aus dem Farbschema.</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2421,11 +2409,11 @@
     <value>Verbleibende Profile</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>Fügen Sie eine Gruppe von Profilen hinzu, die mindestens einer der definierten Eigenschaften für reguläre Ausdrücke entsprechen.</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>Es kann nur ein Eintrag "Verbleibende Profile" vorhanden sein.</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2505,7 +2493,7 @@
     <value>Inlining zulassen</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, wird der Eintrag direkt angezeigt, wenn der Ordner nur einen einzigen Eintrag enthält, und es wird kein Ordner gerendert.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2513,7 +2501,7 @@
     <value>Leer zulassen</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, wird der Ordner weiterhin angezeigt, wenn er keine Einträge enthält. Andernfalls wird der Ordner nicht gerendert.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2577,11 +2565,11 @@
     <value>ENQ-Antwort (ENQ, Request Terminal Status, Terminalstatus anfordern)</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>Die Antwort, die gesendet wird, wenn eine ENQ-Steuersequenz empfangen wird.</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>Nützlich für die Problembehandlung oder Entwicklung eines Terminals.</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2593,7 +2581,7 @@
     <value>Experimentell: Tastenzuordnungen zum Einfärben von ausgewähltem Text hinzufügen</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>Diese Tastenbindungen können den markierten Text oder alle Instanzen des markierten Texts mit einer angegebenen Farbe hervorheben.</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2609,7 +2597,7 @@
     <value>Registerkarten im Vollbildmodus anzeigen</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>Wenn diese Option aktiviert ist, wird die Registerkartenleiste angezeigt, wenn sich die App im Vollbildmodus befindet.</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2621,7 +2609,7 @@
     <value>Pfadübersetzung</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>Steuert, wie Datei- und Verzeichnispfade bei Drag &amp;amp; Drop-Vorgängen übersetzt werden.</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2648,13 +2636,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>Profil wird nicht mehr erkannt</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>Dieses automatisch erkannte Profil wurde anscheinend deinstalliert. Änderungen, die Sie daran vorgenommen haben, bleiben erhalten, können aber erst verwendet werden, nachdem sie neu installiert wurde.</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>Ursprüngliche Quelle</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>Gibt die Software an, die dieses Profil ursprünglich erstellt hat.</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2729,7 +2717,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>Cache löschen</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>Im Cache werden Daten gespeichert, die mit gespeicherten Sitzungen und automatisch generierten Profilen zusammenhängen.</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2772,7 +2760,7 @@
     <value>Trennzeichen per Drag &amp;amp; Drop</value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>Dieser Text wird zwischen den Pfaden mehrerer in das Terminal gezogener Dateien eingefügt.</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index ba6631deaa8..fce69a57ac7 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>This color scheme is part of the built-in settings or an installed extension</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>To make changes to this color scheme, you must make a copy of it.</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>Set color scheme as default</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>Apply this color scheme to all your profiles, by default. Individual profiles can still select their own color schemes.</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>Language (requires relaunch)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>Selects a display language for the application. This will override your default Windows interface language.</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>Default IME input mode</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>Informs the IME what language to use by default. For languages that rely on an IME and don't use Latin characters by default, this setting can be used to force English input on startup.</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>Always show tabs</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>When disabled, the tab bar will appear when a new tab is created. Cannot be disabled while "Hide the title bar" is On.</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>Position of newly created tabs</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>Specifies where new tabs appear in the tab row.</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>Default URL to use for the "Search web" action</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>The placeholder "%s" will be replaced with the search query.</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>Default profile</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>Profile that opens when clicking the '+' icon or by typing the new tab key binding.</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>Default terminal application</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>The terminal application that launches when a command-line application is run without an existing session, like from the Start Menu or Run dialog.</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>Graphics API</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Direct3D 11 provides a more performant and feature-rich experience, whereas Direct2D is more stable. The default option "Automatic" will pick the API that best fits your graphics hardware. If you experience significant issues, consider using Direct2D.</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>Disable partial Swap Chain invalidation</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>By default, the text renderer uses a FLIP_SEQUENTIAL Swap Chain and declares dirty rectangles via the Present1 API. When this setting is enabled, a FLIP_DISCARD Swap Chain will be used instead, and no dirty rectangles will be declared. Whether one or the other is better depends on your hardware and various other factors.</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>Use software rendering (WARP)</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>When enabled, the terminal will use a software rasterizer (WARP). This setting should be left disabled under almost all circumstances.</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>Text measurement mode</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>This changes the way incoming text is grouped into cells. The "Grapheme clusters" option is the most modern and Unicode-correct way to do so, while "wcswidth" is a common approach on UNIX, and "Windows Console" replicates the way it used to work on Windows. Changing this setting requires a restart of Windows Terminal and it only applies to applications launched from within it.</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>Width of ambiguous characters</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>Sets the width used for East Asian Ambiguous characters. "Narrow" (default) prioritizes compatibility, while "Wide" prioritizes readability with many CJK fonts. In "Wide" mode, some applications may not work correctly and cause erratic cursor movement. Changing this setting requires a restart of Windows Terminal and it only applies to applications launched from within it.</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>Wide</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>Columns</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>Rows</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>When Terminal starts</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>What should be shown when the first terminal is created.</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>Launch parameters</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>Settings that control how the terminal launches</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>Launch mode</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>How the terminal will appear on launch. Focus will hide the tabs and title bar.</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>Default</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>New instance behavior</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>Controls how new terminal instances attach to existing windows.</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>Hide the title bar (requires relaunch)</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>When disabled, the title bar will appear above the tabs.</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>Use active terminal title as application title</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>When disabled, the title bar will be 'Terminal'.</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>Snap window resizing to character grid</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>When disabled, the window will resize smoothly.</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>Launch on machine startup</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Automatically launch Terminal when you log in to Windows.</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>Centered</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>Center on launch</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>When enabled, the window will be placed in the center of the screen when launched.</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>Always on top</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>Enable debugging features</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>Terminal will always be the topmost window on the desktop.</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>Certain keyboard input in some applications may stop working properly when this setting is enabled.</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>This allows actions such as Global Summon and Quake Mode actions to work even when no windows are open.</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>Tab width mode</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>Compact will shrink inactive tabs to the size of the icon.</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>Word delimiters</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>These symbols will be used when you double-click text in the terminal or activate "Mark mode".</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>Background opacity</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>Sets the opacity of the window.</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>AltGr aliasing</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>By default, Windows treats Ctrl+Alt as an alias for AltGr. This setting will override Windows' default behavior.</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>Text antialiasing</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>Controls how text is antialiased in the renderer.</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>Background image path</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>File location of the image used in the background of the window.</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>Background image alignment</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>Sets how the background image aligns to the boundaries of the window.</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>Background image opacity</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>Sets the opacity of the background image.</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>Background image stretch mode</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>Sets how the background image is resized to fill the window.</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>Color scheme</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>Expand to override the foreground, background, and selection background.</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>Command line</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>Executable used in the profile.</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>Cursor height</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>Sets the percentage height of the cursor starting from the bottom. Only works with the vintage cursor shape.</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>Font face</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>You can use multiple fonts by separating them with an ASCII comma.</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>Font size</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>Size of the font in points.</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>Cell width</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>Override the line height of the terminal. Measured as a multiple of the font size. The default value depends on your font and is usually around 1.2.</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>Override the cell width of the terminal. Measured as a multiple of the font size. The default value depends on your font and is usually around 0.6.</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>Builtin Glyphs</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>When enabled, the terminal draws custom glyphs for block element and box drawing characters instead of using the font.</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>Full-color Emoji</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>When enabled, Emoji are displayed in full color.</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>Font weight</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>Sets the weight (lightness or heaviness of the strokes) for the given font.</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>Hide profile from dropdown</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>If enabled, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamically generated profiles, while leaving them in your settings file.</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>Run this profile as Administrator</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>If enabled, the profile will open in an Admin terminal window automatically. If the current window is already running as admin, it will open in this window.</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>History size</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>The number of lines above the ones displayed in the window you can scroll back to.</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>Icon</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>Emoji or image file location of the icon used in the profile.</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>Padding</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>Sets the padding around the text within the window.</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>Retro terminal effects</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>Show retro-style terminal effects such as glowing text and scan lines.</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>Automatically adjust lightness of indistinguishable text</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>Automatically brightens or darkens text to make it more visible. Even when enabled, this adjustment will only occur when a combination of foreground and background colors would result in poor contrast.</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>Starting directory</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>The directory the profile starts in when it is loaded.</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>Suppress title changes</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>Ignore application requests to change the title (OSC 2).</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>Tab title</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>Replaces the profile name as the title to pass to the shell on startup.</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>Enable acrylic material</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>Applies a translucent texture to the background of the window.</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>Bell notification style</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>Controls what happens when the application emits a BEL character.</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>Launch this application with a new environment block</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>When enabled, the Terminal will generate a new environment block when creating new tabs or panes with this profile. When disabled, the tab/pane will instead inherit the variables the Terminal was started with.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>Display a menu on right-click</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>When enabled, the Terminal will display a menu on right-click. When disabled, right-clicking will copy the selected text (or paste if there's no selection).</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>Display marks on the scrollbar</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>When enabled, the Terminal will display marks in the scrollbar when searching for text, or when shell integration is enabled.</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>Automatically mark prompts on pressing Enter</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>When enabled, the Terminal automatically add a mark indicating the position of the end of the command when you press enter.</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>Experimental: Reposition the cursor with mouse clicks</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>When enabled, clicking inside the prompt will move the cursor to that position. This requires shell integration to be enabled in your shell to work as expected.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>Launch size</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>The number of rows and columns displayed in the window upon first load. Measured in characters.</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>Launch position</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>The initial position of the terminal window upon startup. When launching as maximized, full screen, or with "Center on launch" enabled, this is used to target the monitor of interest.</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>All</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>Delete profile</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>The name of the profile that appears in the dropdown.</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1653,6 +1641,38 @@
     <value>Are you sure you want to delete this profile?</value>
     <comment>A confirmation message displayed when the user intends to delete a profile.</comment>
   </data>
+  <data name="Profile_ResetProfile.Header" xml:space="preserve">
+    <value>Reset this profile to default settings</value>
+    <comment>Header for a settings card that resets the profile to inherited defaults.</comment>
+  </data>
+  <data name="Profile_ResetProfile.Description" xml:space="preserve">
+    <value>Clears all customizations and restores inherited defaults from the Defaults profile</value>
+    <comment>Description for the reset profile settings card.</comment>
+  </data>
+  <data name="Profile_ResetProfileButton.Content" xml:space="preserve">
+    <value>Reset</value>
+    <comment>Button label to reset a profile's settings.</comment>
+  </data>
+  <data name="Profile_ResetProfileConfirmationMessage.Text" xml:space="preserve">
+    <value>Are you sure you want to reset all settings for this profile? This cannot be undone.</value>
+    <comment>A confirmation message displayed when the user intends to reset a profile.</comment>
+  </data>
+  <data name="Profile_ResetProfileConfirmationButton.Content" xml:space="preserve">
+    <value>Reset profile</value>
+    <comment>Button label for positive confirmation of resetting a profile.</comment>
+  </data>
+  <data name="Profile_DeleteProfile.Header" xml:space="preserve">
+    <value>Delete this profile</value>
+    <comment>Header for a settings card that deletes the profile.</comment>
+  </data>
+  <data name="Profile_DeleteProfile.Description" xml:space="preserve">
+    <value>Permanently removes this profile</value>
+    <comment>Description for the delete profile settings card.</comment>
+  </data>
+  <data name="Profile_DeleteProfileButton.Content" xml:space="preserve">
+    <value>Delete</value>
+    <comment>Button label to delete a profile.</comment>
+  </data>
   <data name="Settings_SaveSettingsButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Save all unsaved settings.</value>
     <comment>A description for what the "save" button does. Presented near "Settings_SaveSettingsButton".</comment>
@@ -1661,7 +1681,7 @@
     <value>Tab switcher interface style</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>Selects which interface will be used when you switch tabs using the keyboard.</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2205,7 @@
     <value>Automatically hide window</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>If enabled, the terminal will be hidden as soon as you switch to another window.</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2225,7 @@
     <value>Warn when closing</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>Controls when a confirmation dialog appears before closing tabs or windows. "Always" presents the dialog when closing any pane.</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2250,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>Warn when pasting newlines</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>If your shell does not support "bracketed paste" mode, we recommend setting this to "Always" for security reasons.</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2278,7 +2298,7 @@
     <value>Bell sound</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>Controls what sound is played when the application emits a BEL character. "Bell notification style" must include "Audible".</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2329,19 +2349,19 @@
     <value>Cursor color</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>Overrides the foreground color from the color scheme.</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>Overrides the cursor color from the color scheme.</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>Overrides the background color from the color scheme.</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>Overrides the selection background color from the color scheme.</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2425,11 +2445,11 @@
     <value>Remaining profiles</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>Add a group of profiles that match at least one of the defined regular expression properties</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>There can only be one "remaining profiles" entry</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2509,7 +2529,7 @@
     <value>Allow inlining</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>When enabled, if the folder only has a single entry, the entry will show directly and no folder will be rendered.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2517,7 +2537,7 @@
     <value>Allow empty</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>When enabled, if the folder has no entries, it will still be displayed. Otherwise, the folder will not be rendered.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2581,11 +2601,11 @@
     <value>ENQ (Request Terminal Status) response</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>The response that is sent when an ENQ control sequence is received.</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>Useful for troubleshooting or developing Terminal.</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2597,7 +2617,7 @@
     <value>Experimental: Add key bindings to color selected text</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>These key bindings can highlight the selected text or all instances of the selected text with a specified color.</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2613,7 +2633,7 @@
     <value>Show tabs in full screen</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>When enabled, the tab bar will be visible when the app is full screen.</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2625,7 +2645,7 @@
     <value>Path translation</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>Controls how file and directory paths are translated during drag-and-drop operations.</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2652,13 +2672,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>Profile no longer detected</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>This automatically-detected profile appears to have been uninstalled. Changes you have made to it are preserved, but it cannot be used until it has been reinstalled.</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>Original Source</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>Indicates the software that originally created this profile.</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2733,7 +2753,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>Clear cache</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>The cache stores data related to saved sessions and automatically generated profiles.</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2776,8 +2796,12 @@
     <value>Drag and drop delimiter</value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <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="TextBoxSettingStyle_PlaceholderText.Value" xml:space="preserve">
+    <value>None</value>
+    <comment>Default placeholder text shown in text box settings when no value has been set.</comment>
+  </data>
 </root>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw
index 28fc2731183..7cccabce236 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>Esta combinación de colores forma parte de la configuración integrada o de una extensión instalada</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>Para realizar cambios en esta combinación de colores, debe hacer una copia del mismo.</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>Establecer combinación de colores como predeterminada</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>Aplique esta combinación de colores a todos los perfiles de forma predeterminada. Los perfiles individuales aún pueden seleccionar sus propias combinaciones de colores.</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>Idioma (requiere reiniciar)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>Seleccionar un idioma para mostrarlo en la aplicación. Esto invalidará el idioma predeterminado de la interfaz de Windows.</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>Modo de entrada IME predeterminado</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>Informa al IME qué idioma usar de forma predeterminada. Para los idiomas que dependen de un IME y no usan caracteres latinos de forma predeterminada, esta configuración se puede usar para forzar la entrada de inglés al iniciar.</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>Mostrar pestañas siempre</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>Si se deshabilita, la barra de pestañas aparecerá cuando se cree una nueva pestaña. No se puede desactivar mientras "Ocultar la barra de título" está Habilitado.</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>Posición de las pestañas recién creadas</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>Especifica dónde aparecen las nuevas pestañas en la fila de pestañas.</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>Dirección URL predeterminada que se usará para la acción "Buscar en la Web"</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>El marcador de posición "%s" se reemplazará por la consulta de búsqueda.</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>Perfil predeterminado</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>Perfil que se abre al hacer clic en el icono '+' o al escribir la combinación de teclas de nueva pestaña.</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>Aplicación de terminal predeterminada</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>Aplicación de terminal que se inicia cuando se ejecuta una aplicación de línea de comandos sin una sesión existente, como en el menú Inicio o en el cuadro de diálogo Ejecutar.</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>API de gráficos</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Direct3D 11 proporciona una experiencia con más rendimiento y características, mientras que Direct2D es más estable. La opción predeterminada "Automático" seleccionará la API que mejor se adapte a su hardware gráfico. Si experimenta problemas importantes, considere la posibilidad de usar Direct2D.</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>Deshabilitar la invalidación parcial de la cadena de intercambio</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>De forma predeterminada, el representador de texto usa una cadena de intercambio de FLIP_SEQUENTIAL y declara rectángulos modificados a través de la API de Present1. Cuando esta configuración está habilitada, se usará una cadena de intercambio de FLIP_DISCARD y no se declarará ningún rectángulo con modificaciones. Si uno u otro es mejor depende de su hardware y de otros factores.</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>Uso de la representación de software (WARP)</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>Cuando está habilitado, el terminal usará un rasterizador de software (WARP). Esta configuración debe dejarse deshabilitada en casi todas las circunstancias.</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>Modo de medición de texto</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>Esto cambia la forma en que el texto entrante se agrupa en celdas. La opción "Grapheme clusters" es la forma más moderna y correcta de hacerlo, mientras que "wcswidth" es un enfoque común en UNIX y "Consola de Windows" replica la forma en que se utiliza para trabajar en Windows. Para cambiar esta configuración, es necesario reiniciar Terminal Windows y solo se aplica a las aplicaciones iniciadas desde ella.</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>Ancho de caracteres ambiguos</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>Establece el ancho usado para los caracteres ambiguos de Asia Oriental. "Estrecho" (valor predeterminado) da prioridad a la compatibilidad, mientras que "Ancho" da prioridad a la legibilidad con muchas fuentes CJK. En el modo "Ancho", es posible que algunas aplicaciones no funcionen correctamente y provoquen un movimiento errático del cursor. Cambiar esta configuración requiere un reinicio de Terminal Windows y solo se aplica a las aplicaciones que se inician desde dentro de ella.</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>Anchura</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>Columnas</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>Filas</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>Cuando se inicia la terminal</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>Qué se debe mostrar cuando se crea la primera terminal.</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>Parámetros de inicio</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>Configuración que controla cómo se inicia el terminal</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>Modo de inicio</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Cómo aparecerá el terminal al iniciarse. El foco ocultará las pestañas y la barra de título.</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>Predeterminado</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>Comportamiento de nueva instancia</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>Controla cómo se adjuntan nuevas instancias de terminal a ventanas existentes.</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>Ocultar la barra de título (requiere reiniciar)</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>Cuando está deshabilitada, la barra de título aparecerá encima de las pestañas.</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>Usar título de terminal activo como título de la aplicación</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>Cuando se deshabilita, la barra de título será "Terminal".</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>Ajustar el tamaño de la ventana a la cuadrícula del carácter</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>Cuando se deshabilita, la ventana cambiará de tamaño sin problemas.</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>Iniciar al inicio del equipo</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Iniciar terminal automáticamente al iniciar sesión en Windows.</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>Centrado</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>Centrar en el inicio</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Cuando está habilitada, la ventana se coloca en el centro de la pantalla cuando se inicia.</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>Siempre en primer plano</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>Habilitar características de depuración</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>El terminal siempre será la ventana superior del escritorio.</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>Es posible que determinada entrada de teclado en algunas aplicaciones deje de funcionar correctamente cuando esta configuración está habilitada.</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>Esto permite que acciones como las acciones de la convocatoria global y el modo de conferencia funcionen incluso cuando no hay ventanas abiertas.</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>Modo de ancho de pestaña</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>Compactar reducirá las pestañas inactivas al tamaño del icono.</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>Delimitadores de palabras</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>Estos símbolos se usarán al hacer doble clic en el texto en el terminal o al activar el "Modo marcar".</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>Opacidad del fondo</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>Establece la opacidad de la ventana.</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>Alias AltGr</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>De forma predeterminada, Windows trata Ctrl+Alt como alias de AltGr. Esta configuración invalidará el comportamiento predeterminado de Windows.</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>Suavizado de contorno de texto</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>Controla la forma en que el texto se alisa en el representador.</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>Ruta de la imagen de fondo</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>Ubicación de archivo de la imagen usada en el fondo de la ventana.</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>Alineación de la imagen de fondo</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>Establece cómo se alinea la imagen de fondo con los límites de la ventana.</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>Opacidad de la imagen de fondo</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>Establece la opacidad de la imagen de diseño de escritorio.</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>Modo de expansión de imagen de fondo</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>Establece cómo se ajusta el tamaño de la imagen de fondo para que rellene la ventana.</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>Combinación de colores</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>Expanda para reemplazar el primer plano, el fondo y el fondo de selección.</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>Línea de comandos</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>Ejecutable utilizado en el perfil.</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>Alto del cursor</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>Establece el alto porcentual del cursor a partir de la parte inferior. Solo funciona con la forma del cursor de la cosecha.</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>Estilo tipográfico</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>Puede usar varias fuentes separándolas con una coma ASCII.</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>Tamaño de la fuente</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>Tamaño de la fuente en puntos.</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>Ancho de celda</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>Invalide el alto de línea del terminal. Medido como múltiplo del tamaño de fuente. El valor predeterminado depende de la fuente y suele ser alrededor de 1,2.</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>Invalidar el ancho de celda del terminal. Medido como múltiplo del tamaño de fuente. El valor predeterminado depende de la fuente y suele ser alrededor de 0,6.</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>Glifos integrados</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>Cuando está habilitado, el terminal dibuja glifos personalizados para los caracteres de dibujo de elementos de bloque y cuadros, en lugar de usar la fuente.</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>Emoji a todo color</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>Cuando se habilita, los emojis se muestran a todo color.</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>Espesor de la fuente</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>Establece el grosor (luminosidad o densidad de los trazos) para la fuente especificada.</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>Ocultar perfil de la lista desplegable</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>Si se habilita, el perfil no aparecerá en la lista de perfiles. Se puede usar para ocultar los perfiles predeterminados y los perfiles generados dinámicamente, al dejarlos en el archivo de configuración.</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>Ejecutar este perfil como Administrador</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>Si se habilita, el perfil se abrirá automáticamente en una ventana de terminal Administración. Si la ventana actual ya se está ejecutando como administrador, se abrirá en esta ventana.</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>Tamaño del historial</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>El número de líneas encima de las que se muestran en la ventana a la que puede desplazarse.</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>Icono</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>Ubicación del archivo de imagen o emoji del icono que se usa en el perfil.</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>Espaciado</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>Establece el espaciado alrededor del texto dentro de la ventana.</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>Efecto de terminal retro</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>Muestra efectos del terminal de estilo retro, como texto brillante y líneas de exploración.</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>Ajustar automáticamente la luminosidad del texto indistinguible</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>Ilumina u oscurece automáticamente el texto para que sea más visible. Aunque esté habilitado, este ajuste solo se producirá cuando una combinación de colores de primer plano y fondo genere un contraste deficiente.</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>Directorio de inicio</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>El directorio en el que se inicia el perfil cuando se carga.</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>Suprimir cambios de título</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>Omitir solicitudes de aplicación para cambiar el título (OSC 2).</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>Título de la pestaña</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>Sustituye el nombre del perfil por el título que se pasa al shell al iniciarse.</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>Habilitar material acrílico</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>Aplica una textura traslúcida al fondo de la ventana.</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>Notificación estilo campana</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>Controla lo que sucede cuando la aplicación emite un personaje BEL.</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>Iniciar esta aplicación con un nuevo bloque de entorno</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>Cuando está habilitado, el terminal generará un nuevo bloque de entorno al crear nuevas pestañas o paneles con este perfil. Cuando se deshabilita, la pestaña o el panel heredarán las variables con las que se inició el terminal.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>Mostrar un menú al hacer clic con el botón derecho</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>Cuando se habilite, el terminal mostrará un menú al hacer clic con el botón derecho. Cuando se deshabilite, al hacer clic con el botón derecho se copiará el texto seleccionado (o se pegará si no hay ninguna selección).</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>Mostrar marcas en la barra de desplazamiento</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>Cuando está habilitado, el terminal mostrará marcas en la barra de desplazamiento al buscar texto o cuando la integración de shell esté habilitada.</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>Marcar automáticamente los avisos al presionar Entrar</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>Cuando se habilita, el terminal agrega automáticamente una marca que indica la posición del final del comando al presionar Entrar.</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>Experimental: cambiar la posición del cursor con clics del mouse</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>Cuando se habilita, al hacer clic dentro del aviso se moverá el cursor a esa posición. Esto requiere que la integración de shell esté habilitada en el shell para funcionar de la forma esperada.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>Tamaño de inicio</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>Número de filas y columnas que se muestran en la ventana en la primera carga. Medido en caracteres.</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>Posición de inicio</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Posición inicial de la ventana del terminal al iniciarse. Al iniciar como maximizado, en pantalla completa o con "Centrar al iniciar", se usa para dirigirse al monitor de interés.</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>Todo</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>Eliminar perfil</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>Nombre del perfil que aparece en la lista desplegable.</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>Estilo de interfaz del modificador de tabulación</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>Selecciona la interfaz que se usará al cambiar de pestaña con el teclado.</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>Ocultar automáticamente la ventana</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>Si se habilita, el terminal se ocultará en cuanto cambies a otra ventana.</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>Advertir al cerrar</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>Controla cuándo aparece un cuadro de diálogo de confirmación antes de cerrar pestañas o ventanas. "Siempre" presenta el cuadro de diálogo al cerrar cualquier panel.</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>Advertir al pegar nuevas líneas</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>Si tu shell no admite el modo de "pegar entre corchetes", le recomendamos configurarlo en "Siempre" por motivos de seguridad.</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2274,7 +2262,7 @@
     <value>Sonido de campana</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>Controla el sonido que se reproduce cuando la aplicación emite un carácter BEL. "Estilo de notificación de campana" debe incluir "Audible".</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2325,19 +2313,19 @@
     <value>Color del cursor</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>Invalida el color de primer plano de la combinación de colores.</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>Invalida el color del cursor de la combinación de colores.</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>Invalida el color de fondo de la combinación de colores.</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>Invalida el color de fondo de la selección de la combinación de colores.</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2421,11 +2409,11 @@
     <value>Perfiles restantes</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>Agregar un grupo de perfiles que coincidan al menos con una de las propiedades de expresión regular definidas</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>Solo puede haber una entrada de "perfiles restantes"</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2505,7 +2493,7 @@
     <value>Permitir inserción</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>Cuando está habilitada, si la carpeta solo tiene una entrada, la entrada se mostrará directamente y no se representará ninguna carpeta.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2513,7 +2501,7 @@
     <value>Permitir vacío</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>Cuando se habilita, si la carpeta no tiene entradas, se seguirá mostrando. De lo contrario, la carpeta no se representará.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2577,11 +2565,11 @@
     <value>Respuesta de ENQ (Request Terminal Status)</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>Respuesta que se envía cuando se recibe una secuencia de control ENQ.</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>Útil para solucionar problemas o desarrollar terminales.</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2593,7 +2581,7 @@
     <value>Experimental: Agregar enlaces de teclado al texto seleccionado de color</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>Estos enlaces de teclas pueden resaltar el texto seleccionado o todas las instancias del texto seleccionado con un color especificado.</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2609,7 +2597,7 @@
     <value>Mostrar las pestañas en pantalla completa</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>Cuando está habilitada, la barra de pestañas estará visible cuando la aplicación esté en pantalla completa.</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2621,7 +2609,7 @@
     <value>Traducción de ruta de acceso</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>Controla cómo se traducen las rutas de acceso de archivos y directorios durante las operaciones de arrastrar y colocar.</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2648,13 +2636,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>El perfil ya no se ha detectado</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>Parece que este perfil detectado automáticamente se ha desinstalado. Los cambios realizados en él se conservan, pero no se pueden usar hasta que se haya reinstalado.</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>Origen original</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>Indica el software que creó originalmente este perfil.</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2729,7 +2717,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>Borrar caché</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>La caché guarda datos relacionados con las sesiones guardadas y los perfiles generados automáticamente.</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2772,7 +2760,7 @@
     <value>Delimitador de arrastrar y colocar</value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>Este texto se insertará entre las rutas de acceso de varios archivos colocados en el terminal.</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw
index 6dbe23803b9..3b8d10a564e 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>Ce modèle de couleurs fait partie des paramètres intégrés ou d’une extension installée</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>Pour apporter des modifications à ce modèle de couleurs, vous devez en faire une copie.</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>Définir le modèle de couleurs par défaut</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>Appliquer ce modèle de couleurs à tous vos profils, par défaut. Les profils individuels peuvent toujours sélectionner leurs propres jeux de couleurs.</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>Langue (nécessite une relance)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>Sélectionne une langue d’affichage pour l’application. Cette opération remplace votre langue d’interface Windows par défaut.</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>Mode d’entrée IME par défaut</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>Indique à IME la langue à utiliser par défaut. Pour les langues qui s'appuient sur un IME et qui n'utilisent pas les caractères latins par défaut, ce paramètre peut être utilisé pour forcer la saisie de l'anglais au démarrage.</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>Toujours afficher les onglets</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>Si cette option est désactivée, la barre d’onglets s’affiche lors de la création d’un nouvel onglet. Nous n’avons pas pu désactiver si « Masquer la barre de titre » est activé.</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>Position des onglets nouvellement créés</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>Indique l'endroit où les nouveaux onglets apparaissent dans la ligne d'onglets.</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>URL par défaut à utiliser pour l’action « Rechercher sur le web »</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>L’espace réservé "%s" sera remplacé par la requête de recherche.</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>Profil par défaut</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>Profil qui s’ouvre lorsque vous cliquez sur l’icône « + » ou que vous utilisez le raccourci clavier « nouvel onglet ».</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>Application Terminal par défaut</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>L’application Terminal qui se lance lorsqu’une application de ligne de commande est exécutée sans session existante, par exemple à partir du menu Démarrer ou de la boîte de dialogue Exécuter.</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>Graphics API</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Direct3D 11 offre une expérience plus performante et riche en fonctionnalités, tandis que Direct2D est plus stable. L’option par défaut « Automatique » sélectionne l’API qui correspond le mieux à votre matériel graphique. Si vous rencontrez des problèmes importants, envisagez d’utiliser Direct2D.</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>Désactiver l’invalidation partielle de la chaîne d’échange</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>Par défaut, le moteur de rendu de texte utilise une chaîne de permutation FLIP_SEQUENTIAL et déclare les rectangles sales via l’API Present1. Lorsque ce paramètre est activé, une chaîne d’échange FLIP_DISCARD est utilisée à la place, et aucun rectangle sale n’est déclaré. La supériorité de l’un ou de l’autre dépend de votre matériel et de divers autres facteurs.</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>Utiliser le rendu logiciel (WARP)</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>Lorsque cette option est activée, le terminal utilise un logiciel de tramage (WARP). Ce paramètre doit être désactivé dans presque toutes les circonstances.</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>Mode de mesure de texte</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>Cela modifie la façon dont le texte entrant est regroupé en cellules. L'option « Clusters de graphèmes » est la méthode la plus moderne et la plus conforme à Unicode, tandis que « wcswidth » est une approche courante sous UNIX et la « Console Windows » reproduit la manière dont cela fonctionnait sous Windows. La modification de ce paramètre nécessite le redémarrage du Terminal Windows et ne s'applique qu'aux applications lancées à partir de celui-ci.</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>Largeur des caractères ambigus d’Asie de l’Est</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>Définit la largeur utilisée pour les caractères ambigus d’Asie de l’Est. « Narrow » (par défaut) privilégie la compatibilité, tandis que « Wide » favorise la lisibilité avec de nombreuses polices CJK. En mode « Wide », certaines applications peuvent ne pas fonctionner correctement et provoquer un déplacement erratique du curseur. La modification de ce paramètre nécessite le redémarrage du Terminal Windows et ne s’applique qu’aux applications lancées à partir de celui-ci.</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>Larges</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>Colonnes</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>Lignes</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>Au démarrage du terminal</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>Ce qui doit être affiché lors de la création du premier terminal.</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>Paramètres de lancement</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>Paramètres qui contrôlent le lancement du terminal</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>Mode de lancement</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Mode d’affichage du terminal au démarrage. Le focus masque les onglets et la barre de titre.</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>Par défaut</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>Comportement des nouvelles instances</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>Contrôle la façon dont les nouvelles instances de terminal sont attachées aux fenêtres existantes.</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>Masquer la barre de titre (redémarrage nécessaire)</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>Une fois désactivée, la barre de titre s’affiche au-dessus des onglets.</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>Utilisez le titre du terminal actif comme titre de l’application</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>Une fois désactivée, la barre de titre est « Terminal ».</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>Ajuster la dimension de la fenêtre à la grille de caractères</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>Une fois désactivée, la fenêtre se redimensionne sans à-coups.</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>Lancement au démarrage de l’ordinateur</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Lancez automatiquement Terminal lorsque vous vous connectez à Windows.</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>Centré</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>Centrer au lancement</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Lorsque cette option est activée, la fenêtre est placée au centre de l’écran lorsqu’elle est lancée.</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>Toujours au premier plan</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>Activer les fonctionnalités de débogage</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>Le terminal est toujours la fenêtre située au premier plan sur le bureau.</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>Certaines entrées de clavier dans certaines applications peuvent cesser de fonctionner correctement lorsque ce paramètre est activé.</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>Cela permet aux actions telles que les actions en mode d’engagement global et de mode Dent de fonctionner même lorsqu’aucune fenêtre n’est ouverte.</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>Largeur des onglets</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>Compact réduit les onglets inactifs à la taille de l’icône.</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>Délimitation des mots</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>Ces symboles sont utilisés lorsque vous double-cliquez sur du texte dans le terminal ou activez le « mode Marque ».</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>Opacité de l’arrière-plan</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>Définit l’opacité de la fenêtre.</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>Alias AltGr</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>Par défaut, Windows traite Ctrl+Alt comme un alias pour AltGr. Ce paramètre remplace le comportement par défaut de Windows.</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>Anticrénelage de texte</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>Contrôle le mode d’anticrénelage du rendu.</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>Emplacement de l’image d’arrière-plan</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>Emplacement du fichier de l’image utilisée en arrière-plan.</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>Alignement de l’image d’arrière-plan</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>Définit l’ajustement de l’image de fond à la fenêtre.</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>Opacité de l’image de fond</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>Définit l’opacité de l’image d’arrière-plan.</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>Mode d’étirement de l’image d’arrière-plan</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>Définit la façon dont l’image d’arrière-plan est redimensionnée pour remplir la fenêtre.</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>Jeu de couleurs</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>Développez pour remplacer l’arrière-plan, l’arrière-plan et l’arrière-plan de sélection.</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>Ligne de commande</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>Exécutable de profil.</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>Hauteur du curseur</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>Définit la hauteur en pourcentage du curseur en partant du bas. Fonctionne uniquement avec la forme de curseur.</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>Style de police</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>Vous pouvez utiliser plusieurs polices en les séparant par une virgule ASCII.</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>Taille de police</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>Taille de la police en points.</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>Largeur de cellule</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>Remplacez la hauteur de la ligne du terminal. Mesuré sous la forme d’un multiple de la taille de la police. La valeur par défaut dépend de votre police et se situe généralement autour de 1,2.</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>Remplacez la largeur de cellule du terminal. Se mesure en tant que multiple de la taille de police. La valeur par défaut dépend de votre police et est généralement autour de 0,6.</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>Glyphes intégrés</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>Lorsque cette option est activée, le terminal trace des glyphes personnalisés pour les éléments de bloc et pour les caractères de dessin de boîte au lieu d'utiliser la police de caractère.</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>Emoji en couleurs</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>Lorsque cette option est activée, les emojis sont affichés en couleurs.</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>Épaisseur de la police</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>Définit le poids (la luminosité ou l’épaisseur des traits d’encre) de la police.</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>Masquez le profil de la liste déroulante</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>Si cette option est activée, le profil n’apparaît pas dans la liste des profils. Peut être utilisé pour masquer les profils par défaut et les profils générés dynamiquement, tout en les laissant dans votre fichier de paramètres.</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>Exécuter ce profil en tant qu’administrateur</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>Si cette option est activée, le profil s’ouvre automatiquement dans une fenêtre de terminal Administration. Si la fenêtre active est déjà en cours d’exécution en tant qu’administrateur, elle s’ouvre dans cette fenêtre.</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>Taille de l’historique</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>Nombre de lignes au-dessus des lignes affichées dans la fenêtre auxquelles vous pouvez accéder en défilant.</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>Icône</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>Emplacement de l’image ou emoji pour l’icône du profil.</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>Marges</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>Définit la marge intérieure autour du texte dans la fenêtre.</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>Effet terminal rétro</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>Afficher les effets de terminal rétro, tels que le texte lumineux et les lignes d’analyse.</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>Ajuster automatiquement la luminosité du texte illisible.</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>Égaye automatiquement ou noircit le texte pour le rendre plus visible. Même si cette option est activée, cet ajustement se produit uniquement lorsqu’une combinaison de couleurs de premier plan et d’arrière-plan entraîne un contraste médiocre.</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>Répertoire de démarrage</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>Répertoire dans lequel le shell démarre lorsqu’il est chargé.</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>Annuler les modifications apportées au titre</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>Ignorer les demandes d’application pour modifier le titre (OSC 2).</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>Titre de l’onglet</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>Remplace le titre du shell au démarrage.</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>Activer le matériau acrylique</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>Applique une texture translucide à l’arrière-plan de la fenêtre.</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>Style de notification Bell</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>Contrôle ce qui se produit lorsque l’application émet un caractère BEL.</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>Lancer cette application avec un nouveau bloc d’environnement</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>Lorsqu’il est activé, le terminal génère un nouveau bloc d’environnement lors de la création de nouveaux onglets ou volets avec ce profil. Lorsqu’il est désactivé, l’onglet/volet hérite à la place des variables avec laquelle le terminal a été démarré.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>Afficher un menu en cliquant avec le bouton droit</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>Lorsque cette option est activée, le terminal affiche un menu en cliquant avec le bouton droit. Si cette option est désactivée, le fait de cliquer avec le bouton droit copie le texte sélectionné (ou le coller en l’absence de sélection).</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>Afficher les marques sur la barre de défilement</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>Quand cette option est activée, le terminal affiche les marques dans la barre de défilement lors de la recherche de texte ou lorsque l’intégration de l’interpréteur de commandes est activée.</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>Marquer automatiquement les invites en appuyant sur Entrée</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>Lorsque cette option est activée, le terminal ajoute automatiquement une marque indiquant la position de la fin de la commande lorsque vous appuyez sur Entrée.</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>Expérimental : repositionner le curseur avec des clics de souris</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>Lorsque cette option est activée, le fait de cliquer à l’intérieur de l’invite déplace le curseur vers cette position. Cela nécessite que l’intégration de l’interpréteur de commandes soit activée dans votre interpréteur de commandes pour fonctionner comme prévu.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>Taille au lancement</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>Nombre de lignes et de colonnes affichées dans la fenêtre lors du premier chargement. Se mesure en caractères.</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>Position de lancement</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Position initiale de la fenêtre de terminal au démarrage. Lors du lancement en mode agrandi, en plein écran ou avec l’option « Centrer au lancement » activée, elle est utilisée pour cibler le moniteur d’intérêt.</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>Tout</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>Supprimer le profil</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>Nom du profil qui apparaît dans la liste déroulante.</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>Style d’interface du sélecteur d’onglets</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>Sélectionne l’interface à utiliser lorsque vous changez d’onglet à l’aide du clavier.</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>Masquage automatique de la fenêtre</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>Si cette option est activée, le terminal est masqué dès que vous basculez vers une autre fenêtre.</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>Avertir lors de la fermeture</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>Contrôle l’apparition d’une boîte de dialogue de confirmation avant la fermeture des onglets ou des fenêtres. « Toujours » affiche la boîte de dialogue lors de la fermeture de n’importe quel volet.</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>Avertir lors du collage de nouvelles lignes</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>Si votre interpréteur de commandes ne prend pas en charge le mode « collage entre crochets », nous vous recommandons de définir ce paramètre sur « Toujours » pour des raisons de sécurité.</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2274,7 +2262,7 @@
     <value>Son de cloche</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>Contrôle le son joué lorsque l'application émet un caractère BEL. Le « style de notification par cloche » doit inclure « Audible ».</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2325,19 +2313,19 @@
     <value>Couleurs du curseur</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>Remplace la couleur de premier plan du modèle de couleurs.</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>Remplace la couleur du curseur du modèle de couleurs.</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>Remplace la couleur d’arrière-plan du modèle de couleurs.</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>Remplace la couleur d’arrière-plan de la sélection du modèle de couleurs.</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2421,11 +2409,11 @@
     <value>Profils restants</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>Ajouter un groupe de profils qui correspondent à au moins une des propriétés d’expression régulière définies</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>Il ne peut y avoir qu’une seule entrée « Profils restants »</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2505,7 +2493,7 @@
     <value>Autoriser l’inlining</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>Quand cette option est activée, si le dossier n’a qu’une seule entrée, l’entrée s’affiche directement et aucun dossier n’est affiché.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2513,7 +2501,7 @@
     <value>Autoriser les entrées vides</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>Quand cette option est activée, si le dossier n’a pas d’entrées, il est toujours affiché. Sinon, le dossier ne sera pas rendu.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2577,11 +2565,11 @@
     <value>Réponse ENQ (Request Terminal Status)</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>Réponse envoyée lors de la réception d’une séquence de contrôle ENQ.</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>Utile pour le dépannage ou le développement de Terminal.</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2593,7 +2581,7 @@
     <value>Expérimental : ajouter des liaisons de touches au texte sélectionné en couleur</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>Ces liaisons clés peuvent mettre en surbrillance le texte sélectionné ou toutes les instances du texte sélectionné avec une couleur spécifiée.</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2609,7 +2597,7 @@
     <value>Afficher les onglets en mode plein écran</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>Lorsque cette option est activée, la barre d’onglets est visible lorsque l’application est en plein écran.</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2621,7 +2609,7 @@
     <value>Traduction du chemin d’accès</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>Contrôle la façon dont les chemins d’accès aux fichiers et aux répertoires sont traduits pendant les opérations de glisser-déplacer.</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2648,13 +2636,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>Le profil n’est plus détecté</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>Ce profil détecté automatiquement semble avoir été désinstallé. Les modifications que vous lui avez apportées sont conservées, mais ne peuvent pas être utilisées tant qu’elle n’a pas été réinstallée.</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>Source d’origine</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>Indique le logiciel qui a créé ce profil à l’origine.</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2729,7 +2717,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>Effacer le cache</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>Le cache stocke les données relatives aux sessions enregistrées et aux profils générés automatiquement.</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2772,7 +2760,7 @@
     <value>Glisser-déplacer le délimiteur</value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>Ce texte sera inséré entre les chemins d’accès de plusieurs fichiers déposés dans le terminal.</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw
index 72778d45345..8617bdee5ce 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>Questa combinazione di colori fa parte delle impostazioni predefinite o di un'estensione installata</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>Per apportare modifiche a questa combinazione di colori, è necessario crearne una copia.</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>Imposta combinazione colori come predefinita</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>Applica questa combinazione di colori a tutti i profili, per impostazione predefinita. I singoli profili possono comunque selezionare combinazioni colori personalizzate.</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>Lingua (richiede il riavvio)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>Seleziona una lingua di visualizzazione per l'applicazione. La lingua di visualizzazione sostituisce quella predefinita dell'interfaccia di Windows.</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>Modalità di input IME predefinita</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>Informa l'IME della lingua da usare per impostazione predefinita. Per le lingue che si affidano a un IME e che non usano i caratteri latini per impostazione predefinita, questa impostazione può essere usata per forzare l'inserimento dell'inglese all'avvio.</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>Mostra sempre le schede</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>Quando disabilitata, la barra delle schede verrà visualizzata quando verrà creata una nuova scheda. Non può essere disabilitata quando l’opzione "Nascondi barra del titolo" è attivata.</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>Posizione delle schede appena create</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>Specifica dove vengono visualizzate le nuove schede nella riga delle schede.</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>URL predefinito da usare per l'azione "Cerca sul Web"</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>Il segnaposto "%s" verrà sostituito con la query di ricerca.</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>Profilo predefinito</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>Profilo che viene aperto quando si fa clic sull'icona ' +' o digitando il nuovo binding di codice della scheda.</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>Applicazione terminale predefinita</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>L'applicazione terminale che viene avviata quando viene eseguita un'applicazione della riga di comando senza una sessione esistente, ad esempio dalla finestra di dialogo menu Start o Esegui.</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>API grafica</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Direct3D 11 offre un'esperienza più performante e con funzionalità più elevate, mentre Direct2D è più stabile. L'opzione predefinita "Automatico" sceglierà l'API più adatta all'hardware grafico. Se si verificano problemi significativi, provare a usare Direct2D.</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>Disabilitare invalidazione catena di scambio parziale</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>Per impostazione predefinita, il renderer di testo usa una catena di scambio FLIP_SEQUENTIAL e dichiara rettangoli modificati ma non modificati tramite l'API Present1. Quando questa impostazione è abilitata, verrà utilizzata una catena di scambio FLIP_DISCARD e non verranno dichiarati rettangoli modificati ma non modificati. Il miglioramento dell'uno o dell'altro dipende dall'hardware e da vari altri fattori.</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>Usare il rendering software (WARP)</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>Se questa opzione è abilitata, il terminale userà un rasterizzatore software (WARP). Questa impostazione deve essere lasciata disabilitata in quasi tutte le circostanze.</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>Modalità misurazione testo</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>Cambia il modo in cui il testo in arrivo viene raggruppato in celle. L'opzione "Cluster Grapheme" è il modo più moderno e corretto per Unicode, mentre "wcswidth" è un approccio comune su UNIX e "Console di Windows" replica il modo in cui funzionava in Windows. La modifica di questa impostazione richiede il riavvio di Terminale Windows e si applica solo alle applicazioni avviate da essa.</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>Larghezza dei caratteri ambigui</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>Imposta la larghezza usata per i caratteri ambigui dell'Asia orientale. "Narrow" (impostazione predefinita) privilegia la compatibilità, mentre "Wide" privilegia la leggibilità con molti tipi di carattere CJK. In modalità "Wide", alcune applicazioni potrebbero non funzionare correttamente e causare movimenti irregolari del cursore. Per applicare questa modifica è necessario riavviare Terminale Windows e si applica solo alle applicazioni avviate all'interno.</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>Ampiezza</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>Colonne</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>Righe</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>All'avvio del terminale</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>Cosa deve essere visualizzato quando viene creato il primo terminale.</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>Parametri di avvio</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>Impostazioni che controllano il modo in cui viene avviato il terminale</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>Modalità di avvio</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Come verrà visualizzato il terminale all'avvio. Lo stato attivo nasconde le schede e la barra del titolo.</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>Predefinito</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>Comportamento nuova istanza</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>Controlla il modo in cui le nuove istanze di terminale si allegano alle finestre esistenti.</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>Nascondi la barra del titolo (sarà necessario riavviare)</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>Se disabilitata, la barra del titolo verrà visualizzata sopra le schede.</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>Usa il titolo del terminale attivo come titolo dell'applicazione</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>Se disabilitata, la barra del titolo sarà “Terminale”.</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>Ancora ridimensionamento della finestra alla griglia caratteri</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>Se disabilitata, la finestra verrà ridimensionata in modo corretto.</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>Avvia all'avvio del computer</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Avvia automaticamente il terminale quando accedi a Windows.</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>Centrato</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>Allinea al centro all'avvio</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Se questa opzione è abilitata, la finestra verrà posizionata al centro dello schermo all'avvio.</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>Sempre in primo piano</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>Abilita funzionalità di debug</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>Il terminale sarà sempre la finestra più in alto sul desktop.</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>Alcuni input da tastiera in alcune applicazioni potrebbero smettere di funzionare correttamente quando questa impostazione è abilitata.</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>Questo consente ad azioni quali richiamo globale e modalità quake di funzionare anche quando non sono aperte finestre.</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>Modalità larghezza tabulazione</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>Compatta riduce le schede inattive a icona.</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>Delimitatori di parola</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>Questi simboli verranno usati quando fai doppio clic sul testo nel terminale o attivi la "modalità contrassegna".</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>Opacità sfondo</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>Imposta l'opacità della finestra.</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>Aliasing AltGr</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>Per impostazione predefinita, Windows considera CTRL+ALT come un alias per AltGr. Questa impostazione sostituirà il comportamento predefinito di Windows.</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>Testo anti-aliasing</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>Controlla l'alias del testo nel renderer.</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>Percorso dell'immagine di sfondo</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>Percorso del file dell'immagine utilizzata in background della finestra.</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>Allineamento immagine di sfondo</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>Imposta l'immagine di sfondo in cui allinea i bordi della finestra.</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>Opacità immagine di sfondo</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>Imposta l'opacità dell'immagine dello sfondo.</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>Modalità estesa immagine di sfondo</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>Imposta il modo in cui l'immagine di sfondo viene ridimensionata per riempire la finestra.</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>Combinazione colori</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>Espandere per eseguire l'override dello sfondo primo piano, dello sfondo e della selezione.</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>Riga di comando</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>Eseguibile utilizzato nel profilo.</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>Altezza cursore</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>Imposta l'altezza percentuale del cursore partendo dal basso. Funziona solo con la forma del cursore vintage.</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>Tipo di carattere</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>Puoi usare più tipi di carattere separandoli con una virgola ASCII.</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>Dimensioni del carattere</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>Dimensioni del tipo carattere in punti.</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>Larghezza cella</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>Sovrascrive l'altezza della linea del terminale. Si misura come multiplo della dimensione del carattere. Il valore predefinito dipende dal tipo di carattere e in genere è intorno a 1,2.</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>Esegue l'override della larghezza della cella del terminale. Misurato come multiplo delle dimensioni del carattere. Il valore predefinito dipende dal tipo di carattere e in genere è circa 0,6.</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>Glifi incorporati</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>Se abilitato, il terminale disegna glifi personalizzati per i caratteri di disegno a blocchi di elementi e caselle anziché usare il tipo di carattere.</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>Emoji a colori</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>Se questa opzione è abilitata, le emoji sono visualizzate a colori.</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>Spessore del carattere</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>Imposta il peso (leggerezza o pesantezza dei tratti) per il tipo di carattere specificato.</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>Nascondi profilo da elenco a discesa</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>Se questa opzione è abilitata, il profilo non verrà visualizzato nell'elenco dei profili. Può essere usato per nascondere i profili predefiniti e i profili generati dinamicamente, lasciandoli nel file di impostazioni.</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>Esegui questo profilo come amministratore</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>Se questa opzione è abilitata, il profilo verrà aperto automaticamente in una finestra del terminale Amministrazione. Se la finestra corrente è già in esecuzione come amministratore, verrà aperta in questa finestra.</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>Dimensioni cronologia</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>Il numero di righe sopra quelli visualizzati nella finestra in cui è possibile eseguire lo scorrimento.</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>Icona</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>Posizione del file dell'emoji o dell'immagine usato per l'immagine del profilo.</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>Spaziatura interna</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>Imposta la spaziatura interna attorno al testo all'interno della finestra.</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>Attiva/disattiva effetto retrò del terminale</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>Mostra effetti di terminale in stile retrò, come testo neon e linee di scansione.</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>Regola automaticamente la luminosità del testo indistinguibile</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>Schiarisce o scurisce automaticamente il testo per renderlo più visibile. Anche quando è abilitata, tale regolazione avrà effetto solo quando la combinazione di colori in primo piano e sullo sfondo produce scarso contrasto.</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>Directory iniziale</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>La directory che inizia il profilo durante il caricamento.</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>Elimina le modifiche del titolo</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>Ignora le richieste dell'applicazione per modificare il titolo (OSC 2).</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>Titolo della scheda</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>Sostituisce il nome del profilo come titolo da passare alla shell all'avvio.</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>Abilita il materiale acrilico</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>Applica una trama traslucido allo sfondo della finestra.</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>Stile di notifica campana</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>Controlla il comportamento quando l'applicazione crea un carattere BEL.</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>Avvia questa applicazione con un nuovo blocco di ambiente</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>Se abilitato, il Terminale genera un nuovo blocco ambiente quando crea nuove schede o riquadri con questo profilo. Se disattivato, la scheda/riquadro erediterà le variabili con cui è stato avviato il Terminale.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>Visualizzare un menu al clic con il pulsante destro del mouse</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>Se questa opzione è abilitata, il terminale visualizzerà un menu al clic con il pulsante destro del mouse. Se questa opzione è disabilitata, facendo clic con il pulsante destro del mouse verrà copiato il testo selezionato o incollato se non è presente alcuna selezione.</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>Visualizzare indicatori sulla barra di scorrimento</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>Se questa opzione è abilitata, il terminale visualizzerà i segni nella barra di scorrimento durante la ricerca di testo o quando è abilitata l'integrazione della shell.</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>Contrassegnare automaticamente i prompt premendo INVIO</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>Se questa opzione è abilitata, il terminale aggiunge automaticamente un indicatore che indica la posizione della fine del comando quando si preme INVIO.</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>Sperimentale: riposizionare il cursore con i clic del mouse</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>Se questa opzione è abilitata, facendo clic all'interno del prompt il cursore verrà spostato in tale posizione. Ciò richiede che l'integrazione della shell sia abilitata nella shell dell’utente per funzionare come previsto.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>Dimensioni avvio</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>Numero di righe e colonne visualizzate nella finestra al primo caricamento. Misurato in caratteri.</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>Posizione di avvio</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Posizione iniziale della finestra del terminale all'avvio. Quando si avvia come ingrandita, a schermo intero o con l'opzione "Allinea al centro all'avvio" abilitata, viene usata per il targeting al monitor di interesse.</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>Tutto</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>Elimina profilo</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>Nome del profilo visualizzato nell'elenco a discesa.</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>Stile interfaccia commutatore scheda</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>Seleziona l'interfaccia da usare quando passi da una scheda all'altra usando la tastiera.</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>Nascondi automaticamente la finestra</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>Se abilitata, il terminale viene nascosto non appena si passa a un'altra finestra.</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>Avvisa in caso di chiusura</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>Controlla quando viene visualizzata una finestra di dialogo di conferma prima di chiudere schede o finestre. "Sempre" visualizza la finestra di dialogo quando si chiude un riquadro.</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>Avvisa quando si incollano le nuove righe</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>Se la shell non supporta la modalità "incolla tra parentesi quadre", è consigliabile impostarla su "Sempre" per motivi di sicurezza.</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2274,7 +2262,7 @@
     <value>Suono campana</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>Controlla il suono riprodotto quando l'applicazione crea un carattere BEL. "Stile notifica campanello" deve includere l’opzione "Udibile".</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2325,19 +2313,19 @@
     <value>Colore del cursore</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>Esegue l'override del colore primo piano dalla combinazione colori.</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>Esegue l'override del colore del cursore dalla combinazione colori.</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>Esegue l'override del colore di sfondo dalla combinazione colori.</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>Esegue l'override del colore di sfondo della selezione dalla combinazione di colori.</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2421,11 +2409,11 @@
     <value>Profili rimanenti</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>Aggiungi un gruppo di profili che corrispondono ad almeno una delle proprietà dell'espressione regolare definita</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>Può esistere una sola voce "profili rimanenti"</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2505,7 +2493,7 @@
     <value>Consenti inlining</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>Se questa opzione è abilitata, se la cartella contiene una sola voce, la voce verrà visualizzata direttamente e non verrà eseguito il rendering di alcuna cartella.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2513,7 +2501,7 @@
     <value>Consenti vuoto</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>Se questa opzione è abilitata, se la cartella non contiene voci, verrà comunque visualizzata. In caso contrario, non verrà eseguito il rendering della cartella.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2577,11 +2565,11 @@
     <value>Risposta ENQ (Request Terminal Status)</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>Risposta inviata alla ricezione di una sequenza di controllo ENQ.</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>Utile per la risoluzione dei problemi o lo sviluppo del terminale.</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2593,7 +2581,7 @@
     <value>Sperimentale: aggiungi tasti di scelta rapida al testo selezionato</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>Questi tasti di scelta rapida possono evidenziare il testo selezionato o tutte le istanze del testo selezionato con un colore specificato.</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2609,7 +2597,7 @@
     <value>Mostra le schede a schermo intero</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>Se questa opzione è abilitata, la barra delle schede sarà visibile quando l'app è a schermo intero.</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2621,7 +2609,7 @@
     <value>Traduzione percorso</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>Controlla la modalità di traduzione dei percorsi di file e directory durante le operazioni di trascinamento della selezione.</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2648,13 +2636,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>Profilo non più rilevato</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>Sembra che questo profilo rilevato automaticamente sia stato disinstallato. Le modifiche apportate verranno mantenute, ma non potranno essere utilizzate finché non viene reinstallato.</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>Origine originale</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>Indica il software che ha creato originariamente questo profilo.</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2729,7 +2717,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>Cancella cache</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>La cache archivia i dati relativi alle sessioni salvate e ai profili generati automaticamente.</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2772,7 +2760,7 @@
     <value>Trascina e rilascia il delimitatore</value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>Questo testo verrà inserito tra i percorsi di più file trascinati nel terminale.</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
index 7ac0c6cc8e9..779a1938c2b 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>この配色は、組み込みの設定またはインストールされている拡張機能の一部です</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>この配色パターンを変更するには、コピーを作成する必要があります。</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>配色を既定として設定する</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>既定ですべてのプロファイルにこの配色を適用します。個々のプロファイルは、引き続き独自の配色を選択できます。</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>言語 (再起動が必要)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>アプリケーションの表示言語を選択します。 これにより、既定の Windows インターフェイス言語が上書きされます。</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>既定の IME 入力モード</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>既定で使用する言語を IME に通知します。IME に依存し、既定ではラテン文字を使用しない言語では、スタートアップ時に英語入力を強制するためにこの設定を使用できます。</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>常にタブを表示する</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>無効にすると、新しいタブが作成されたときにタブ バーが表示されます。[タイトル バーを非表示にする] が [オン] の間は無効にできません。</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>新しく作成したタブの位置</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>タブ行に新しいタブを表示する場所を指定します。</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>"Web の検索" アクションに使用する既定の URL</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>プレースホルダー "%s" は検索クエリに置き換えられます。</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>既定のプロファイル</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>[+] アイコンをクリックするか、新しい tab キーのバインドを入力すると表示されるプロファイルです。</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>既定のターミナル アプリケーション</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>[スタート] メニューや [ファイル名を指定して実行] ダイアログなど、既存のセッションなしでコマンドライン アプリケーションを実行したときに起動するターミナル アプリケーション。</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>グラフィックス API</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Direct3D 11 はよりパフォーマンスが高く、機能が豊富なエクスペリエンスを提供しますが、Direct2D はより安定しています。既定のオプション [自動] では、グラフィックス ハードウェアに最適な API が選択されます。重大な問題が発生した場合は、Direct2D の使用を検討してください。</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>部分的なスワップ チェーンの無効化を無効にする</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>既定では、テキスト レンダラーは FLIP_SEQUENTIAL Swap Chain を使用し、Present1 API を介してダーティ四角形を宣言します。この設定を有効にすると、代わりに FLIP_DISCARD スワップ チェーンが使用され、ダーティ四角形は宣言されません。どちらか一方が望ましいかどうかは、お使いのハードウェアとその他のさまざまな要因によって異なります。</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>ソフトウェア レンダリングを使用する (WARP)</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>有効にすると、ターミナルはソフトウェア ラスターライザー (WARP) を使用します。この設定は、ほとんどの状況で無効のままにする必要があります。</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>テキスト測定モード</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>入力したテキストをセルにグループ化する方法を変更します。"Grapheme clusters" オプションは最も新しく Unicode で正しい方法ですが、UNIX では "wcswidth" は一般的な方法であり、"Windows コンソール" は Windows での動作方法をレプリケートします。この設定を変更するには、Windows ターミナルの再起動が必要です。この設定は、その中から起動されたアプリケーションにのみ適用されます。</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>あいまいな文字の幅</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>東アジアのあいまいな文字に使用する幅を設定します。[幅を狭くする] (既定) は互換性を優先し、[幅を広くする] は多くの CJK フォントでの読みやすさを優先します。[幅を広くする] モードでは、一部のアプリケーションが正しく動作せず、カーソルの動きが不安定になることがあります。この設定を変更するには、Windows ターミナルの再起動が必要で、Windows ターミナル内から起動したアプリケーションにのみ適用されます。</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>広い</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>列</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>行</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>ターミナルの起動時</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>最初のターミナルの作成時に何が表示されるべきでしょうか。</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>起動パラメーター</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>ターミナルの起動方法を制御する設定</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>起動モード</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>ターミナルが起動時にどのように表示されるか。フォーカスすると、タブとタイトル バーが非表示になります。</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>既定</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>新しいインスタンスの動作</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>新しい端末インスタンスを既存のウィンドウにアタッチする方法を制御します。</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>タイトル バーを非表示にする (再起動が必要)</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>無効にすると、タイトル バーがタブの上に表示されます。</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>アクティブなターミナルのタイトルをアプリケーションのタイトルとして使用</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>無効にすると、タイトル バーは 'ターミナル' になります。</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>ウィンドウをサイズ変更して文字グリッドにスナップする</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>無効にすると、ウィンドウがスムーズにサイズ変更されます。</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>コンピューターのスタートアップ時に起動</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Windows にログインすると、ターミナルが自動的に起動します。</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>中央揃え</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>起動時に中央</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>有効にすると、起動時にウィンドウが画面の中央に配置されます。</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>常に手前に表示</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>デバッグ機能を有効にする</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>ターミナルは常にデスクトップの最上位ウィンドウになります。</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>この設定を有効にすると、一部のアプリケーションでキーボード入力が正しく動作しなくなる可能性があります。</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>これにより、ウィンドウが開かなくても、グローバル デコレーションや Quake モードのアクションなどのアクションを実行できます。</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>タブ幅モード</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>コンパクトは、非アクティブなタブをアイコンのサイズに縮小します。</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>単語の区切り文字</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>これらの記号は、ターミナル内のテキストをダブルクリックするか、"マーク モード".をアクティブにするときに使用されます。</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>背景の不透明度</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>ウィンドウの不透明度を設定します。</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>AltGr エイリアス</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>既定では、WindowsはCtrl+Altを AltGr のエイリアスとして扱います。この設定は、Windowsの既定の動作をオーバーライドします。</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>テキストのアンチエイリアシング</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>レンダラーでテキストをアンチエイリアスする方法を制御します。</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>背景画像のパス</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>ウィンドウの背景として使用されるイメージのファイルの場所を指定します。</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>背景画像の配置</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>背景画像をウィンドウの境界に合わせる方法を設定します。</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>背景画像の不透明度</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>背景画像の不透明度を設定します。</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>背景画像の伸縮モード</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>背景画像のサイズをウィンドウに合わせて変更する方法を設定します。</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>配色</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>展開して、前景、背景、選択の背景をオーバーライドします。</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>コマンド ライン</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>プロファイルで使用される実行可能ファイル。</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>カーソルの高さ</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>カーソルの下部からの高さの割合を設定します。ビンテージ カーソルの形に対してのみ機能します。</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>フォント スタイル</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>複数のフォントを使用するには、複数のフォントを ASCII コンマで区切ります。</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>フォント サイズ</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>フォントのサイズ (ポイント単位)。</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>セルの幅</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>ターミナルの行の高さをオーバーライドします。フォント サイズの倍数として測定されます。 既定値はフォントによって異なりますが、通常は約 1.2 です。</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>ターミナルのセル幅をオーバーライドします。フォント サイズの倍数として計測されます。既定値はフォントによって異なり、通常は 0.6 前後です。</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>組み込みグリフ</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>有効にすると、ターミナルは、フォントを使用する代わりに、ブロック要素とボックス描画文字のカスタム グリフを描画します。</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>フル カラーの絵文字</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>有効にすると、絵文字がフル カラーで表示されます。</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>フォントの太さ</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>指定されたフォントの太さ （ストロークの軽さまたは重さ） を設定します。</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>ドロップダウンからプロファイルを非表示にする</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>有効にした場合、プロファイルはプロファイルの一覧に表示されません。これを使用すると、既定のプロファイルや動的に生成されたプロファイルを設定ファイルに残したまま非表示にすることができます。</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>このプロファイルを管理者として実行する</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>有効にすると、プロファイルは自動的にターミナル ウィンドウ管理開きます。現在のウィンドウが既に管理者として実行されている場合は、このウィンドウで開きます。</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>履歴のサイズ</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>画面に表示されている行の上にスクロールして戻すことができる行数です。</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>アイコン</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>プロファイルで使用されるアイコンの絵文字またはイメージ ファイルの場所です。</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>パディング</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>ウィンドウ内のテキストの周囲のスペースを設定します。</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>レトロ ターミナルの効果</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>光彩テキストやスキャン ラインなどのレトロ ターミナル効果を表示します。</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>見分けがつかないテキストの明るさを自動的に調整する</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>テキストを自動的に明るくまたは暗くして見やすくします。この調整が有効になっている場合でも、前景色と背景色の組み合わせによってコントラストが低下する場合にのみこの調整が行われます。</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>開始ディレクトリ</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>プロファイルが読み込まれたときに開始されるディレクトリです。</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>タイトルの変更を表示しない</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>タイトルの変更要求を無視します (OSC 2)。</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>タブタイトル名</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>起動時にシェルに渡すタイトルとして、プロファイル名を置き換えます。</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>アクリル素材を有効にする</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>半透明のテクスチャをウィンドウの背景に適用します。</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>ベル通知スタイル</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>アプリケーションがBEL文字を生成する場合の動作を制御します。</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>新しい環境ブロックを使用してこのアプリケーションを起動します</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>有効にすると、ターミナルは、このプロファイルで新しいタブまたはペインを作成するときに新しい環境ブロックを生成します。無効にすると、代わりにタブ/ペインはターミナルが開始された変数を継承します。</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>右クリックでメニューを表示する</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>有効にすると、ターミナルは右クリックでメニューを表示します。無効にすると、右クリックすると選択したテキストがコピーされます (選択されていない場合は貼り付けます)。</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>スクロール バーにマークを表示する</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>有効にすると、ターミナルでテキストを検索するとき、またはシェル統合が有効になっているときに、スクロール バーにマークが表示されます。</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>Enter キーを押したときにプロンプトを自動的にマークする</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>有効にすると、ターミナルは Enter キーを押したときにコマンドの終了位置を示すマークを自動的に追加します。</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>試験段階: マウスのクリックでカーソルの位置を変更する</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>有効にすると、プロンプト内をクリック時にカーソルがその位置に移動します。これを行うには、シェルでシェル統合を有効にし、期待どおりに動作させる必要があります。</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>起動サイズ</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>最初の読み込み時にウィンドウに表示される行と列の数。文字数で計測されます。</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>起動位置</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>スタートアップ時のターミナル ウィンドウの初期位置。最大化、全画面表示、または [起動時に中央] を有効にして起動する場合、これは目的のモニターをターゲットにするために使用されます。</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>すべて</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>プロファイルの削除</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>ドロップダウンに表示されるプロファイルの名前です。</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>タブ スイッチャー インターフェイス スタイル</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>キーボードを使用してタブを切り替えるときに使用するインターフェイスを選択します。</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>ウィンドウを自動的に非表示にする</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>有効にすると、別のウィンドウに切り替えるとすぐにターミナルが非表示になります。</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>閉じるときに警告する</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>タブまたはウィンドウを閉じる前に確認ダイアログを表示するタイミングを制御します。[常に] を選択すると、ウィンドウを閉じるときにダイアログが表示されます。</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>改行を貼り付ける際に警告する</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>シェルが ”角かっこで囲まれた貼り付け” モードをサポートしていない場合は、セキュリティ上の理由からこれを [常に] に設定することをお勧めします。</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2274,7 +2262,7 @@
     <value>ベルの音</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>アプリケーションが BEL 文字を出力するときに再生されるサウンドを制御します。"ベル通知スタイル" には "Audible" を含める必要があります。</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2325,19 +2313,19 @@
     <value>カーソルの色</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>配色から前景色をオーバーライドします。</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>配色からカーソルの色をオーバーライドします。</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>配色の背景色をオーバーライドします。</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>選択した背景色を配色からオーバーライドします。</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2421,11 +2409,11 @@
     <value>残りのプロファイル</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>定義された正規表現プロパティの少なくとも 1 つに一致するプロファイルのグループを追加します</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>"残りのプロファイル" エントリは 1 つしか指定できません</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2505,7 +2493,7 @@
     <value>インライン化を許可する</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>有効にすると、フォルダーに 1 つのエントリしかない場合、エントリは直接表示され、フォルダーは表示されません。</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2513,7 +2501,7 @@
     <value>空を許可する</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>有効にすると、フォルダーにエントリがない場合でも表示されます。それ以外の場合、フォルダーは表示されません。</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2577,11 +2565,11 @@
     <value>ENQ (Request Terminal Status) 応答</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>ENQ 制御シーケンスを受信したときに送信される応答です。</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>ターミナルのトラブルシューティングや開発に役立ちます。</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2593,7 +2581,7 @@
     <value>試験段階: 選択した色のテキストにキー バインドを追加する</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>これらのキー バインドは、選択したテキスト、または選択したテキストのすべてのインスタンスを指定された色で強調表示できます。</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2609,7 +2597,7 @@
     <value>全画面表示でタブを表示</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>有効にすると、アプリが全画面表示のときにタブ バーが表示されます。</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2621,7 +2609,7 @@
     <value>パスの変換</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>ドラッグ アンド ドロップ操作中にファイルパスとディレクトリ パスを変換する方法を制御します。</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2648,13 +2636,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>プロファイルは検出されなくなりました</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>この自動的に検出されたプロファイルはアンインストールされた可能性があります。行った変更は保存されますが、再インストールされるまでは使用できません。</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>元のソース</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>このプロファイルを最初に作成したソフトウェアを示します。</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2729,7 +2717,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>キャッシュのクリア</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>キャッシュには、保存されたセッションと自動生成されたプロファイルに関連するデータが格納されます。</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2772,7 +2760,7 @@
     <value>ドラッグ アンド ドロップ区切り記号</value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>このテキストは、ターミナルにドロップされた複数のファイルのパスの間に挿入されます。</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
index cd4e601694b..b8443e350c3 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>이 색 구성표는 기본 제공 설정 또는 설치된 확장의 일부입니다.</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>이 색 구성표를 변경하려면 복사본을 만들어야 합니다.</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>색 구성표를 기본값으로 설정</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>기본적으로 모든 프로필에 이 색 구성표를 적용합니다. 개별 프로필은 자신의 색 구성표를 선택할 수 있습니다.</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>언어(다시 시작 필요)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>응용 프로그램의 표시 언어를 선택하세요. 기본 Windows 인터페이스 언어가 재정의됩니다.</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>기본 IME 입력 모드</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>기본적으로 사용할 언어를 IME에 알릴 수 있습니다. IME를 사용하고 기본적으로 라틴 문자를 사용하지 않는 언어의 경우 이 설정을 사용하여 시작할 때 영어 입력을 강제 적용할 수 있습니다.</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>항상 탭 표시</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>비활성화하면 새 탭이 만들어질 때 탭 표시줄이 표시됩니다. "제목 표시줄 숨기기"가 켜져 있을 때는 비활성화할 수 없습니다.</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>새로 만든 탭의 위치</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>탭 행에 새 탭이 표시되는 위치를 지정합니다.</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>"웹 검색" 작업에 사용할 기본 URL</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>자리 표시자 "%s"가 검색 쿼리로 바뀝니다.</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>기본 프로필</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>'+' 아이콘을 클릭하거나 새 탭 키 바인딩을 입력하여 열리는 프로필입니다.</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>기본 터미널 응용 프로그램</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>시작 메뉴나 실행 대화 상자와 같이 기존 세션이 없으면 명령 줄 응용 프로그램을 실행하고 있는 터미널 응용 프로그램입니다.</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>Graphics API</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Direct3D 11은 성능과 기능이 풍부한 환경을 제공하는 반면 Direct2D는 더욱 안정적입니다. 기본 옵션 "자동"은 그래픽 하드웨어에 가장 적합한 API를 선택합니다. 심각한 문제가 발생하는 경우 Direct2D를 사용하는 것이 좋습니다.</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>부분 스왑 체인 무효화 사용 안 함</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>기본적으로 텍스트 렌더러는 FLIP_SEQUENTIAL 스왑 체인을 사용하고 Present1 API를 통해 더티 사각형을 선언합니다. 이 설정을 사용하면 FLIP_DISCARD 스왑 체인이 대신 사용되며 더티 사각형이 선언되지 않습니다. 하나 또는 다른 요소가 더 좋은지 여부는 하드웨어 및 다양한 다른 요인에 따라 달라집니다.</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>소프트웨어 렌더링(WARP) 사용</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>사용하도록 설정하면 터미널에서 소프트웨어 래스터라이저(WARP)를 사용합니다. 거의 모든 상황에서는 이 설정을 사용하지 않도록 설정해야 합니다.</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>텍스트 측정 모드</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>들어오는 텍스트가 셀로 그룹화되는 방식을 변경합니다. "Grapheme 클러스터" 옵션은 가장 최신이며 유니코드로 올바른 방법이며, "wcswidth"는 UNIX에서 일반적인 접근 방식이며 "Windows 콘솔"은 Windows에서 작동하는 방식을 복제합니다. 이 설정을 변경하려면 Windows 터미널 다시 시작해야 하며 이 설정 내에서 시작된 애플리케이션에만 적용됩니다.</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>모호한 문자 너비</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>동아시아의 모호한 문자에 사용되는 너비를 설정하세요. "좁게"(기본값)는 호환성을 우선시하고, "넓게"는 많은 CJK 글꼴에서 가독성을 우선시합니다. "넓게" 모드에서는 일부 애플리케이션이 제대로 작동하지 않아 커서가 이상하게 움직일 수 있습니다. 이 설정을 변경하려면 Windows 터미널을 다시 시작해야 하며, 이 설정은 Windows 터미널 내에서 실행된 애플리케이션에만 적용됩니다.</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>넓게</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>열</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>행</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>터미널이 시작되는 경우</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>첫 번째 터미널이 만들어질 때 표시할 항목입니다.</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>매개 변수 시작</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>터미널 시작 방법을 제어하는 설정</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>시작 모드</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>시작 시에 터미널이 나타나는 방식입니다. 포커스가 탭과 제목 표시줄을 숨길 수 있습니다.</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>기본값</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>새 인스턴스 동작</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>새 터미널 인스턴스가 기존 창에 어떻게 연결하는지 제어합니다.</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>제목 표시줄 숨기기(다시 시작해야 함)</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>사용하지 않도록 설정하면 제목 표시줄이 탭 위에 표시됩니다.</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>활성 터미널 제목을 응용 프로그램 제목으로 사용</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>사용하지 않도록 설정하면 제목 표시줄이 '터미널'이 됩니다.</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>문자 눈금에 맞게 창 크기 조정</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>사용하지 않도록 설정하면 창의 크기가 원활하게 조정됩니다.</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>컴퓨터 시작 시 실행</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Windows 로그인할 때 터미널을 자동으로 시작합니다.</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>가운데</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>시작 시 가운데 맞춤</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>사용하도록 설정하면 창이 시작될 때 화면 중앙에 배치됩니다.</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>항상 위</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>디버깅 기능 사용</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>터미널은 항상 데스크톱에 있는 최상위 창이 됩니다.</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>이 설정을 사용하면 일부 응용 프로그램의 특정 키보드 입력이 제대로 작동하지 않을 수 있습니다.</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>이렇게 하면 창이 열려 있지 않아도 전역 관리자 및 관리자 모드 작업과 같은 작업이 작동할 수 있습니다.</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>탭 너비 모드</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>압축하면 비활성 탭이 아이콘 크기로 축소됩니다.</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>단어 구분 기호</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>이러한 기호는 터미널에서 텍스트를 두 번 클릭하거나 ‘표시 모드’를 활성화할 때 사용됩니다.</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>배경 불투명도</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>창의 불투명도를 설정합니다.</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>AltGr 별칭</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>기본적으로 Windows Ctrl+Alt AltGr의 별칭으로 간주합니다. 이 설정은 Windows 기본 동작을 재정의합니다.</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>텍스트 앤티앨리어싱</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>렌더러에서 텍스트 안티앨리어싱 방법을 제어합니다.</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>배경 이미지 경로</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>창 배경에 사용되는 이미지의 파일 위치입니다.</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>배경 이미지 맞춤</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>배경 이미지가 창 경계에 맞춰지는 방식을 설정합니다.</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>배경 이미지 불투명도</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>배경 이미지의 불투명도를 설정합니다.</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>배경 이미지 늘이기 모드</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>창을 채우도록 배경 이미지 크기가 조정되는 방법을 설정합니다.</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>색 구성표</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>확장하여 전경, 배경 및 선택 배경을 재정의합니다.</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>명령줄</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>프로필에 사용된 실행 파일입니다.</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>커서 높이</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>아래부터 시작하는 커서의 높이 비율을 설정합니다. 빈티지 커서모양에서만 작동합니다.</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>글꼴 스타일</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>여러 글꼴을 ASCII 쉼표로 구분하여 사용할 수 있습니다.</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>글꼴 크기</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>글꼴의 크기(포인트 단위)입니다.</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>셀 너비</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>터미널에서 각 줄의 높이를 재정의합니다. 글꼴 크기의 배수로 설정합니다. 기본값은 글꼴에 따라 달라지며 일반적으로 약 1.2입니다.</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>터미널의 셀 너비를 재정의합니다. 글꼴 크기의 배수로 측정되었습니다. 기본값은 글꼴에 따라 달라지며 대개 약 0.6입니다.</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>기본 제공 문자 모양</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>사용하도록 설정하면 터미널은 글꼴을 사용하는 대신 블록 요소 및 상자 그리기 문자에 대한 사용자 지정 문자 모양을 그립니다.</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>풀 컬러 이모지</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>사용하도록 설정하면 이모지가 풀 컬러로 표시됩니다.</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>글꼴 두께</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>지정된 글꼴의 두께(스트로크 얇게 또는 굵게)를 설정합니다.</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>드롭다운에서 프로필 숨기기</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>사용하도록 설정하면 프로필이 프로필 목록에 나타나지 않습니다. 기본 프로필 및 동적으로 생성된 프로필을 설정 파일에 그대로 두는 데 사용할 수 있습니다.</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>이 프로필을 관리자 권한으로 실행</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>사용하도록 설정하면 프로필이 관리 터미널 창에서 자동으로 열립니다. 현재 창이 관리자 권한으로 이미 실행되고 있는 경우 이 창에서 열립니다.</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>기록 크기</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>뒤로 스크롤할 수 있는 창에 표시된 줄 수</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>아이콘</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>프로필에 사용된 아이콘의 이모지 또는 이미지 파일 위치입니다.</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>안쪽 여백</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>창 내에서 텍스트를 안쪽 여백으로 설정합니다.</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>레트로 터미널 효과</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>텍스트가 빛나거나 검색 선과 같은 레트로 스타일 터미널 효과를 사용할 수 있습니다.</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>구분할 수 없는 텍스트의 밝기 자동 조정</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>텍스트를 자동으로 밝고 어둡게 조정하여 더 잘 보이도록 합니다. 사용하도록 설정하더라도 전경색과 배경색이 잘 어우러지지 않아 대비가 좋지 않을 때만 조정됩니다.</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>시작 디렉터리</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>프로필이 로드될 때 시작됩니다.</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>제목 변경 표시 안 함</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>제목 변경 요청을 무시합니다(OSC 2).</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>탭 제목</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>시작할 때 셸에 전달되는 프로필 이름을 제목으로 바꿉니다.</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>아크릴 재질 사용</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>창의 배경에 대응 텍스트를 적용합니다.</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>벨 알림 스타일</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>응용 프로그램이 BEL 문자를 출력할 때 발생되는 일을 제어합니다.</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>새 환경 블록으로 이 애플리케이션 시작</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>사용하도록 설정하면 이 프로필을 사용하여 새 탭이나 창을 만들 때 터미널이 새 환경 블록을 생성합니다. 사용하지 않도록 설정하면 탭이나 창이 터미널이 시작된 변수를 상속합니다.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>마우스 오른쪽 단추를 클릭할 때 메뉴 표시</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>사용하도록 설정하면 터미널에서 마우스 오른쪽 단추를 클릭할 때 메뉴가 표시됩니다. 사용하지 않도록 설정하면 마우스 오른쪽 단추를 클릭하면 선택한 텍스트가 복사됩니다(또는 선택 항목이 없는 경우 붙여넣기).</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>스크롤 막대에 마크 표시</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>사용하도록 설정하면 터미널은 텍스트를 검색하거나 셸 통합을 사용할 때 스크롤 막대에 표시를 표시합니다.</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>&lt;Enter&gt; 키를 누를 때 자동으로 프롬프트 표시</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>사용하도록 설정하면 Enter 키를 누를 때 터미널에서 명령의 끝 위치를 나타내는 표시를 자동으로 추가합니다.</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>실험적: 마우스 클릭으로 커서 위치 변경</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>활성화된 경우 프롬프트 내부를 클릭하면 커서가 해당 위치로 이동합니다. 예상대로 작동하려면 셸에서 셸 통합이 활성화되어 있어야 합니다.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>시작 크기</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>처음 로드할 때 창에 표시되는 행 및 열 수입니다. 문자로 측정되었습니다.</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>시작 위치</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>시작할 때 터미널 창의 초기 위치입니다. 최대화, 전체 화면 또는 "시작 시 센터"를 사용하도록 설정한 상태로 시작할 때 관심 모니터를 대상으로 지정하는 데 사용됩니다.</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>모두</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>프로필 삭제</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>드롭다운에 표시되는 프로필의 이름입니다.</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>탭 전환기 인터페이스 스타일</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>키보드를 사용하여 탭을 전환할 때 사용할 인터페이스를 선택합니다.</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>창 자동 숨기기</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>사용하도록 설정하면 다른 창으로 전환하는 즉시 터미널이 숨겨집니다.</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>닫을 때 경고 표시</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>탭이나 창을 닫기 전에 확인 대화 상자가 나타나는 시기를 제어합니다. "항상"은 창을 닫을 때 대화 상자를 표시합니다.</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>붙여넣기에 줄 바꿈이 포함된 경우 경고</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>셸이 "대괄호로 묶은 붙여넣기" 모드를 지원하지 않는 경우, 보안상의 이유로 이 설정을 "항상"으로 변경하는 것이 좋습니다.</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2274,7 +2262,7 @@
     <value>벨 소리</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>응용 프로그램에서 BEL 문자를 내보낸 경우 재생되는 소리를 제어합니다. "벨 알림 스타일"에는 "가청"이 포함되어야 합니다.</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2325,19 +2313,19 @@
     <value>커서 색</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>색 구성표에서 전경색을 재정의합니다.</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>색 구성표에서 커서 색을 재정의합니다.</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>색 구성표의 배경색을 재정의합니다.</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>색 구성표의 선택 영역 배경색을 재정의합니다.</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2421,11 +2409,11 @@
     <value>남은 프로필</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>정의된 정규식 속성 중 하나 이상과 일치하는 프로필 그룹을 추가합니다.</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>"남은 프로필" 항목은 하나만 있을 수 있습니다.</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2505,7 +2493,7 @@
     <value>인라인 허용</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>사용하도록 설정하면 폴더에 단일 항목만 있는 경우 항목이 직접 표시되고 폴더가 렌더링되지 않습니다.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2513,7 +2501,7 @@
     <value>비어 있음 허용</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>사용하도록 설정하면 폴더에 항목이 없으면 계속 표시됩니다. 그렇지 않으면 폴더가 렌더링되지 않습니다.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2577,11 +2565,11 @@
     <value>ENQ(Request Terminal Status) 응답</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>ENQ 컨트롤 시퀀스를 받을 때 전송되는 응답입니다.</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>터미널 문제 해결 또는 개발에 유용합니다.</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2593,7 +2581,7 @@
     <value>실험적: 선택한 텍스트 색에 키 바인딩 추가</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>이러한 키 바인딩은 선택한 텍스트 또는 선택한 텍스트의 모든 인스턴스를 지정한 색으로 강조 표시할 수 있습니다.</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2609,7 +2597,7 @@
     <value>전체 화면으로 탭 표시</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>사용하도록 설정하면 앱이 전체 화면일 때 탭 표시줄이 표시됩니다.</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2621,7 +2609,7 @@
     <value>경로 변환</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>끌어서 놓기 작업 중에 파일 및 디렉터리 경로를 변환하는 방법을 제어합니다.</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2648,13 +2636,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>프로필이 더 이상 검색되지 않음</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>자동으로 검색된 이 프로필은 제거된 것 같습니다. 변경한 내용은 유지되지만 다시 설치할 때까지 사용할 수 없습니다.</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>원본 소스</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>이 프로필을 원래 만든 소프트웨어를 나타냅니다.</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2729,7 +2717,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>캐시 지우기</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>캐시는 저장된 세션과 관련된 데이터 및 자동으로 생성된 프로필을 저장합니다.</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2772,7 +2760,7 @@
     <value>끌어서 놓기 구분 기호</value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>이 텍스트는 터미널에 놓인 여러 파일의 경로 사이에 삽입됩니다.</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw
index 7d52d284501..bb22b14ba96 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>Este esquema de cores faz parte das configurações internas ou de uma extensão instalada</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>Para fazer alterações neste esquema de cores, você deve fazer uma cópia dele.</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>Definir esquema de cores como padrão</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>Aplique este esquema de cores a todos os seus perfis, por padrão. Os perfis individuais ainda podem selecionar seus próprios esquemas de cores.</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>Idioma (requer inicialização)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>Seleciona um idioma de exibição para o aplicativo. Isso substituirá o idioma padrão da interface do Windows.</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>Modo de entrada padrão do IME</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>Informa ao IME qual idioma usar por padrão. Para idiomas que dependem de um IME e não utilizam caracteres latinos por padrão, essa configuração pode forçar a entrada em inglês na inicialização.</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>Sempre mostrar as guias</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>Quando desabilitada, a barra de guias será exibida quando uma nova guia for criada. Não pode ser desabilitado enquanto "Ocultar a barra de título" está Ativado.</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>Posição das guias recém-criadas</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>Especifica onde as novas guias aparecem na linha de guias.</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>URL padrão a ser usada para a ação "Pesquisar na Web"</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>O espaço reservado "%s" será substituído pela consulta de pesquisa.</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>Perfil padrão</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>Perfil que é aberto quando você clica no ícone ' + ' ou digitando a nova associação de tecla de tabulação.</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>Aplicativo terminal padrão</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>O aplicativo de terminal que é iniciado quando um aplicativo de linha de comando é executado sem uma sessão existente, como no menu iniciar ou na caixa de diálogo Executar.</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>API de Gráficos</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>O Direct3D 11 fornece uma experiência mais completa e avançada de recursos, enquanto o Direct2D é mais estável. A opção padrão "Automático" escolherá a API que melhor se ajusta ao hardware gráfico. Se você tiver problemas significativos, considere o uso Direct2D.</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>Desabilitar a invalidação parcial da cadeia de troca</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>Por padrão, o renderizador de texto usa FLIP_SEQUENTIAL Cadeia de Permuta e declara sujo retângulos por meio da API Present1. Quando esta configuração estiver habilitada, um FLIP_DISCARD cadeia de troca será usado e nenhum retângulo sujo será declarado. Se um ou outro é melhor depende do hardware e de vários outros fatores.</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>Usar a renderização de software (WARP)</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>Quando habilitado, o terminal usará um rasterizador de software (WARP). Esta configuração deve ser desabilitada em quase todas as circunstâncias.</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>Modo de medição de texto</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>Isso altera a maneira como o texto de entrada é agrupado em células. A opção "Clusters do Grapheme" é a maneira mais moderna e correta de fazer isso, enquanto "wcswidth" é uma abordagem comum no UNIX e o "Console do Windows" replica a maneira como ele funciona no Windows. Alterar essa configuração requer uma reinicialização Terminal do Windows e aplica-se somente a aplicativos iniciados de dentro dela.</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>Largura de caracteres ambíguos</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>Define a largura usada para caracteres ambíguos do Leste Asiático. "Estreito" (padrão) prioriza a compatibilidade, enquanto "Amplo" prioriza a legibilidade com muitas fontes CJK. No modo "Amplo", alguns aplicativos podem não funcionar corretamente e provocar movimento irregular do cursor. Alterar essa configuração exige reiniciar o Terminal do Windows e vale só para aplicativos iniciados dentro dele.</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>Largo</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>Colunas</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>Linhas</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>Quando o Terminal começa</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>O que deve ser mostrado quando o primeiro terminal é criado.</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>Parâmetros de inicialização</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>Configurações que controlam como o terminal é iniciado</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>Modo de inicialização</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Como o terminal aparecerá na inicialização. O foco ocultará as guias e a barra de título.</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>Padrão</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>Comportamento ao criar nova instância</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>Controla como novas instâncias de terminal são anexadas às janelas existentes.</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>Oculta a barra do título (requer reinicialização)</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>Quando desabilitada, a barra de título aparecerá acima das guias.</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>Usar título do terminal ativo como título do aplicativo</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>Quando desabilitada, a barra de título será 'Terminal'.</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>Ajustar o redimensionamento da janela para a grade de caracteres</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>Quando desabilitado, a janela será redimensionada sem problemas.</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>Iniciar na inicialização da máquina</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Inicie automaticamente o Terminal quando você fizer login no Windows.</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>Centralizado</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>Centralizar na inicialização</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Quando habilitada, a janela será colocada no centro da tela quando iniciada.</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>Sempre no topo</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>Habilitar recursos de depuração</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>O terminal sempre será a janela mais superior na área de trabalho.</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>Determinada entrada de teclado em alguns aplicativos pode parar de funcionar corretamente quando esta configuração está habilitada.</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>Isso permite que ações como Ações de Bloqueio Global e Modo de Quake funcionem mesmo quando nenhuma janela estiver aberta.</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>Modo da largura da guia</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>Compactar reduzirá as guias inativas para o tamanho do ícone.</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>Delimitadores das palavras</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>Esses símbolos serão usados quando você clicar duas vezes no texto no terminal ou ativar o "Modo de marcação".</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>Opacidade de fundo</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>Define a opacidade da janela.</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>Alias para AltGr</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>Por padrão, o Windows trata Ctrl+Alt como um alias para AltGr. Essa configuração substituirá o comportamento padrão do Windows.</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>Suavização de texto</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>Controla como é feito o anti-aliasing do texto na renderização.</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>Caminho da imagem de tela de fundo</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>Local do arquivo da imagem usada em segundo plano da janela.</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>Alinhamento da imagem da tela de fundo</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>Define como a imagem de tela de fundo se alinha aos limites da janela.</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>Opacidade da imagem da tela de fundo</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>Define a opacidade da imagem de plano de fundo.</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>Modo ampliar imagem da tela de fundo</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>Define como a imagem de tela de fundo é redimensionada para preencher a janela.</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>Esquema de cores</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>Expanda para substituir o plano de fundo, o plano de fundo e a tela de fundo da seleção.</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>Linha de comando</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>Arquivo executável usado no perfil.</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>Altura do cursor</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>Define a altura percentual do cursor começando da parte inferior. Só funciona com a forma de cursor vintage.</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>Variação</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>Você pode usar várias fontes, separando-as com uma vírgula ASCII.</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>Tamanho da fonte</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>Tamanho da fonte por pontos.</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>Largura da célula</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>Substituir a altura da linha do terminal. Medido como um múltiplo do tamanho da fonte. O valor padrão depende da sua fonte e geralmente fica em torno de 1,2.</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>Substituir a largura da célula do terminal. Medido como um múltiplo do tamanho da fonte. O valor padrão depende de sua fonte e geralmente está em torno de 0,6.</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>Glifos internos</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>Quando habilitado, o terminal desenha glifos personalizados para elementos de bloco e caracteres de desenho de caixa em vez de usar a fonte.</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>Emoji colorido</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>Quando habilitado, o Emoji é exibido em cores.</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>Espessura da fonte</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>Define o peso (claridade ou pesado dos traços) para a fonte especificada.</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>Ocultar perfil da lista suspensa</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>Se habilitado, o perfil não aparecerá na lista de perfis. Isso pode ser usado para ocultar perfis padrão e perfis gerados dinamicamente, deixando-os no arquivo de configurações.</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>Executar esse perfil como Administrador</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>Se habilitado, o perfil será aberto em uma janela Administração terminal automaticamente. Se a janela atual já estiver em execução como administrador, ela será aberta nesta janela.</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>Tamanho de histórico</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>O número de linhas acima das exibidas na janela à qual você pode rolar para trás.</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>Ícone</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>Local do arquivo de imagem ou emoji do ícone usado no perfil.</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>Preenchimento</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>Define o preenchimento ao redor do texto na janela.</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>Efeito de terminal retrô</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>Mostre efeitos de terminal de estilo retrô, como texto brilhante e linhas de digitalização.</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>Ajuste automaticamente a clareza do texto indistinguível</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>Clareia ou escurece automaticamente o texto para torná-lo mais visível. Mesmo quando ativado, esse ajuste só ocorrerá quando uma combinação de cores de primeiro plano e de fundo resultar em baixo contraste.</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>Diretório inicial</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>A pasta em que o perfil começa quando é carregado.</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>Suprimir alterações do título</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>Ignore as solicitações do aplicativo para alterar o título (OSC 2).</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>Título da guia</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>Substitui o nome do perfil como o título a ser passado para o Shell na inicialização.</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>Habilitar material acrílico</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>Aplica uma textura translúcida ao plano de fundo da janela.</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>Estilo de notificação de sino</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>Controla o que acontece quando o aplicativo emite um caractere BEL.</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>Iniciar esse aplicativo com um novo bloco de ambiente</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>Quando habilitado, o Terminal gerará um novo bloco de ambiente ao criar novas guias ou painéis com esse perfil. Quando desabilitado, a guia/painel herdará as variáveis com as quais o Terminal foi iniciado.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>Exibir um menu ao clicar com o botão direito do mouse</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>Quando habilitado, o Terminal exibirá um menu ao clicar com o botão direito do mouse. Quando desabilitado, clicar com o botão direito do mouse copiará o texto selecionado (ou colará se não houver seleção).</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>Exibir marcas na barra de rolagem</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>Quando habilitado, o Terminal exibirá marcas na barra de rolagem ao procurar texto ou quando a integração do shell estiver habilitada.</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>Marcar automaticamente os prompts ao pressionar Enter</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>Quando habilitado, o Terminal adiciona automaticamente uma marca indicando a posição do final do comando quando você pressiona Enter.</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>Experimental: reposicionar o cursor com cliques do mouse</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>Quando habilitado, clicar dentro do prompt moverá o cursor para essa posição. Isso exige que a integração do shell seja habilitada no shell para funcionar conforme o esperado.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>Tamanho de inicialização</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>O número de linhas e colunas exibidas na janela após o primeiro carregamento. Medido em caracteres.</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>Posição de inicialização</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>A posição inicial da janela do terminal na inicialização. Ao iniciar como maximizado, em tela inteira ou com a opção "Centralizar na inicialização" habilitada, isso é usado para direcionar o monitor de interesse.</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>Tudo</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>Apagar perfil</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>O nome do perfil que aparece na lista suspensa.</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>Estilo de interface do alternador de guias</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>Seleciona qual interface será usada quando você alternar as guias usando o teclado.</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>Ocultar janela automaticamente</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>Se habilitado, o terminal ficará oculto assim que você mudar para outra janela.</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>Avisar ao fechar</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>Controla quando uma caixa de diálogo de confirmação aparece antes de fechar guias ou janelas. "Sempre" apresenta a caixa de diálogo ao fechar qualquer painel.</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>Avisar ao colar novas linhas</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>Se o shell não for compatível com o modo "colar entre colchetes", recomendamos defini-lo como "Sempre" por motivos de segurança.</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2274,7 +2262,7 @@
     <value>Som de sino</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>Controla qual som é reproduzido quando o aplicativo emite um BEL caractere. "Estilo de notificação de sino" deve incluir "Udível".</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2325,19 +2313,19 @@
     <value>Cor do cursor</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>Substitui a cor de primeiro plano do esquema de cores.</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>Substitui a cor do cursor do esquema de cores.</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>Substitui a cor da tela de fundo do esquema de cores.</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>Substitui a cor da tela de fundo da seleção do esquema de cores.</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2421,11 +2409,11 @@
     <value>Perfis restantes</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>Adicionar um grupo de perfis que correspondam a pelo menos uma das propriedades de expressão regular definidas</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>Só pode haver uma entrada de "perfis restantes"</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2505,7 +2493,7 @@
     <value>Permitir embutimento</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>Quando habilitada, se a pasta tiver apenas uma única entrada, a entrada será mostrada diretamente e nenhuma pasta será renderizada.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2513,7 +2501,7 @@
     <value>Permitir vazio</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>Quando habilitada, se a pasta não tiver entradas, ela ainda será exibida. Caso contrário, a pasta não será renderizada.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2577,11 +2565,11 @@
     <value>Resposta ENQ (Request Terminal Status)</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>A resposta que é enviada quando uma sequência ENQ controle é recebida.</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>Útil para solucionar problemas ou desenvolver o Terminal.</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2593,7 +2581,7 @@
     <value>Experimental: adicionar associações de teclas ao texto selecionado colorido</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>Essas associações de teclas podem realçar o texto selecionado ou todas as instâncias do texto selecionado com uma cor especificada.</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2609,7 +2597,7 @@
     <value>Mostrar as guias em tela inteira</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>Quando habilitada, a barra de guias ficará visível quando o aplicativo estiver em tela inteira.</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2621,7 +2609,7 @@
     <value>Tradução de caminho</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>Controla como os caminhos de arquivo e diretório são traduzidos durante operações de arrastar e soltar.</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2648,13 +2636,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>Perfil não detectado</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>Este perfil detectado automaticamente parece ter sido desinstalado. As alterações feitas nela são preservadas, mas não podem ser usadas até que sejam reinstaladas.</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>Fonte Original</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>Indica o software que criou originalmente este perfil.</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2729,7 +2717,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>Limpar cache</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>O cache armazena dados relacionados a sessões salvas e perfis gerados automaticamente.</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2772,7 +2760,7 @@
     <value>Delimitador de Arrastar e soltar</value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>Este texto será inserido entre os caminhos de vários arquivos descartados no terminal.</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw
index cdf6c6bf63e..0da56d338c1 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>Ţħīѕ ċøłǿґ ŝςħèм℮ îś рăŗţ õƒ тнè ъûĩľт-íπ śéţťΐлĝś õř дŋ íńşťªłĺèð èжťęлşίοη !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>Ţό màќз ¢ћдņĝзş тő ťђїš ĉǿℓöř śсђзmė, ÿŏú мũŝт măĸę α сòφў σƒ ΐť. !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>Śèţ ćŏŀθґ šςħëmĕ âŝ δĕƒдϋŀţ !!! !!! !!</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>Áφρļу τђìš čǿℓóѓ ѕςĥеmё ţò âļℓ ўσùґ φѓôƒίļеš, ъÿ ðεƒăŭļŧ. Īиðїνιďμäĺ φяöƒíłĕš çǻп şťíĺļ ŝзĺëĉτ тнĕιř ǿшŋ сόļöѓ şčĥêмέѕ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>Ŀąʼnģüǻğз (řêqџĭŗэś яёłдũⁿ¢ħ) !!! !!! !!</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>Ѕęļéćŧѕ ā ďįŝρℓду łàйģцâğέ ƒǿř ťћз ǻρрľïčдŧíòʼn. Ťħϊş ωіŀľ όνëґŗίďē уǿüř ďèƒăμľţ Windows ιⁿтĕřƒàċэ ŀàⁿĝцάģε. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>Đέƒàųŀт ĨΜЗ ΐήрũŧ mоδę !!! !!! </value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>Íŋƒбгмş ţђе ÎМЕ ẁћдŧ ļàņĝŭªġé ŧб üśе ьý ðěƒαűľŧ. ₣òѓ ļάņģųαģєś ţћáŧ ґ℮ŀу öŋ àи ĪΜÊ ǻйð δŏй'т цѕέ £âтĩŋ çħãѓâćтèřš ъγ ðėƒāџľŧ, ţнϊś ŝэťтĭñġ ċάń ье цѕёð τό ƒóřċε ∑ήģĺîѕħ îήρüт οŋ şŧªřťúр. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>Άľώāŷš şђǿŵ тãвŝ !!! !</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>Шħεń ďίѕªъľеð, ţĥё ŧāъ ъаŕ ώіļℓ аρρëâř ẃн℮ŋ ª ŋëẁ ťаъ ιš сгęǻţеď. Ćâиňбŧ ьε ďîśαъŀ℮đ ωħϊŀē "Ĥίδē τђę ţĭτľέ ъάѓ" įś Ωń. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>Ρόšîŧϊøņ őƒ йĕŵℓу ĉřēάţεđ τдьš !!! !!! !!!</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>Śφзćїƒíеş шĥëřē ⁿêŵ τâъś ªρρёáґ ĭп тћé τåв яøш. !!! !!! !!! !!! !!</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>Ðёƒάųĺţ ЏҐĽ то ύš℮ ƒòŗ ŧĥě "Ѕёάяĉн ŵёъ" άċŧïóή !!! !!! !!! !!! !</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ьē ŕěρļąč℮ď ẁїτђ τђέ śеªřсħ qцегỳ. !!! !!! !!! !!! !!! !!!</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>Đėƒªûľť рґøƒϊľê !!! !</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>Ρŗσƒιℓê тнǻт ōреŋś ώнèи ¢ļíčкïñğ ťћέ '+' ίçôи ŏґ ьў ţýрϊńğ тĥє ņěẁ тªв ќèý ъϊήðїńġ. !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>Ðêƒάϋℓτ ŧέřmìпάℓ аρφĺΐςàţїōŋ !!! !!! !!</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>Ťђě ţэřмīηãĺ ǻφφℓï¢ǻтΐбň ŧђáт łáůйčĥēś ẅĥэп ā сöмmǻńđ-ľіʼnэ ăρρĺįċāτΐôⁿ ϊš яųñ шíţћöυţ ªņ ĕхϊŝŧĭñğ şěŝѕïŏπ, ŀĩĸė ƒѓом ţћĕ Ŝτáґт Μęπü бг Яųņ ďīäℓöğ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>Ĝŗäрђΐсѕ ÃРΪ !!! </value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Đĩŗěćŧ3Đ 11 рґóνϊďèš ă мõřе φ℮ŕƒóŗmąņт аʼnđ ƒеǻŧùґê-яĩςђ ℮жφéѓιęʼnςè, ώђēѓėªŝ Ðìгëçť2Ď ĩś мθяë ŝţдвłē. Ţĥé δęƒаűłτ ōφτιоⁿ "Ãúτσмάτīč" щĩłł φìçк ţђë ÁΡĨ ţħǻτ ъёšť ƒīтѕ уōûґ ğřǻφђі¢ѕ нąŗďщǻѓê. ̓ ўöџ ê×ρёřįėʼnċê ѕįġńїƒϊĉâⁿт îśşΰёś, соńśϊδеŗ üśίńğ Đΐřěċτ2Đ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>Ďіşǻьłэ рàґτíàľ Šŵąр Ċнаιŋ ĭήνάŀïδαţίбπ !!! !!! !!! !!!</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>Бў ďēƒăüℓţ, ťћэ ţèхţ ř℮ŋðěґĕґ υŝ℮ŝ ä FLIP_SEQUENTIAL Ŝωăр Сђáϊп åπδ ďεĉℓάŗέş δΐŗŧў ŗēćŧăñġℓέš νïд ťĥĕ Present1 ĀРĪ. Щĥêи тћїŝ ŝєŧŧΐñğ įѕ ℮лάьłзδ, α FLIP_DISCARD Şẁαр Ċħāīʼn ŵīĺļ ьё υѕėð íπśťεαď, āлδ ŋо ďīŗŧý ŕęсŧдиĝℓэş шīľĺ ъĕ δеĉľāŗэð. Ẃħέтħêґ òñё σř ŧнé ōтħεř ΐś ъёţŧęґ δéρ℮ήđѕ σή ÿούг ħäґďшάřέ ªήð νăŕιούѕ ǿτђēř ƒαстόяš. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>Ųѕε ŝόƒťщаřė яĕŋðεříлğ (WARP) !!! !!! !!!</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>Ẅнέⁿ éñâвĺĕď, ŧĥë тěřmϊñăľ шîľĺ ŭşē ă şóƒтшářě яãѕтĕгīżεŕ (WARP). Тћįş ŝеţŧΐπģ śнσύŀδ вё ĺєƒŧ δїşâьĺεδ ύπďέя ªℓмôšţ áŀł ćϊŕçϋмśтąпćēѕ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>Τéжτ mĕαšûяēмєñţ мόðë !!! !!!</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>Тђíš ċћǻήğэś ťћз ŵàγ ΐń¢ŏmίлġ ŧę×ţ īŝ ģгõųрέď ìʼnтб çзŀľś. Ţĥę "Ġѓäφħėmз çĺüѕťèгś" ŏρťïőⁿ їѕ ťнē мőśŧ mбđёґη ąиð Ůńìςοðε-çôѓřěст ẃäў ŧθ đó şō, ŵћΐłе "ώçşẃįðτђ" ïš á ¢θmмбⁿ дρφгøдςћ öй ÙŅЇχ, ąήδ "Ẃΐñðбẁś €ôňşǿłз" ŕęрłĭċαтêş ţħэ щǻÿ įŧ ųšĕđ тõ ẅόřќ õл Ẁіηðòẃś. Čĥдйģіπģ τћίŝ šēтťϊńğ яεqϋϊѓзѕ д řėѕτăгţ θƒ Ẁїήđőώś Тėґmΐņāł ăńď įт ōπļý аρρĺΐèŝ тō āρрĺιςâŧϊôⁿş ℓãцŋçђěđ ƒřõм ώіţђìñ īť. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>Ẅίďτħ οƒ àmъïġũõŭś ¢ћäřаčτëŕś !!! !!! !!!</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>Šеŧѕ тĥé ẃίďтн цšеď ƒθŕ Ёāѕť Дѕїāπ Δmъìĝůόųş ¢ĥǻŕǻćτєŗş. "Νǻяѓòш" (đéƒåųĺţ) ρґΐõѓіŧīźéѕ ċǿmραťĭвĭľΐτŷ, ẃђίļė "Ẁîδ℮" рŕīόŕïтϊźĕş гèáðàвіℓīτў ẁìτн мâйý ČЈК ƒблťś. Ĩл "Шϊďε" mőδє, şõmе áρφļĭĉªτιόņś мąу ⁿõт ẃóѓк çθřŕзçτłў αŋδ čäűѕє ℮ŗѓāŧíć ςŭѓşοґ mòνėmĕŋť. Ċђªŋĝϊйġ тнϊş śэттĩņģ ŕêqůįŗëš å ř℮ŝţâгŧ ōƒ Ẁίήďôωş Ţёŕмĭиàĺ ąηδ îт öʼnłý ãφрŀįέѕ τő ąρрļĭсатįŏлŝ ℓаϋⁿćћ℮ð ƒřом шìтħїή îť. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>Шĭðе !</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>Ċσŀùмñѕ !!</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>Ѓõшŝ !</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>Ẃђéñ Ţëгмїńªĺ ѕťářтš !!! !!!</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>Ẁђăт şĥõцĺð вε ѕнбшп ẁћёй ťђё ƒîŗŝт тěřмΐйåł їś сѓéąţзď. !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>£ăŭʼnсн рąґăмěţеґŝ !!! !!</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>Ѕèттîŋĝś ŧħªŧ ςôňťѓσŀ ĥõщ ţнè ţĕŗmîйåℓ ℓăµňĉнэś !!! !!! !!! !!! !!</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>Ŀäцñсн mőď℮ !!!</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Ηōŵ ţнέ тěřmіηªĺ ẃΐŀľ ąρρëäґ öñ ļǻûй¢ћ. ₣όςµŝ ẅїļł ħĭďē τћε ŧªъš āηď ŧìťℓέ ьář. !!! !!! !!! !!! !!! !!! !!! !!!</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>Ďěƒάυŀţ !!</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>Νēщ ίńѕţãиςé ьęĥâνΐог !!! !!!</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>Ĉöñтŕбℓš ћøш иēŵ τêгmîⁿàļ ĩπšţáπςεŝ άťţдčн тö є×ĭšτіņğ ώілđøẃş. !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>Ĥìđε тħê τīţĺё ъªř (ŗėqūΐŗêś яеľаϋʼnčћ) !!! !!! !!! !!</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>Ẃћèп ðϊŝαъłėð, тнė ťĭτłê вąѓ ẁιĺł ąφφёǻŕ äвöνė ŧħė ťãьś. !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>Ůŝě å¢ťįνέ τèґmĭʼnαĺ τįτľé äš дρφℓīĉатĭǿʼn ţιţľē !!! !!! !!! !!! !</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>Ŵћéή đíѕǻьļεď, тħè ťįτłе ьǻŗ ẁїℓł вє 'Ťěѓмĩⁿăĺ'. !!! !!! !!! !!! !!</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>Ŝиάρ щίйðõщ яēşΐžíпĝ тõ čħáѓä¢ťέѓ ģѓĩδ !!! !!! !!! !!</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>Ẅн℮ñ ðìşāьļĕð, τĥė ŵΐņďòώ ẃíļĺ řėŝîżē šмõόтнłγ. !!! !!! !!! !!! !!</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>₤áϋпςħ ôл мαςĥĭñę ŝťąřťûρ !!! !!! !</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Āũŧοмªτĩčäĺļỳ ŀªūⁿ¢ћ Ťëŗmįŋāℓ ẃнęņ ўоű ŀóġ ìπ τσ Windows. !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>Ćêŋťєŕеδ !!</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>Ćēňτєѓ ŏŋ ľäūńçђ !!! !</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Ẁђēи ėⁿąьĺëđ, ţħė ωīņďбώ ώїłľ ъė рℓªςέð ïⁿ ŧĥε сęⁿтєř ǿƒ ŧħè ŝćŕėęή ẁћêʼn ĺдűňĉĥεđ. !!! !!! !!! !!! !!! !!! !!! !!! </value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>Аŀẅâγš ōп ŧбφ !!! </value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>Єлάвĺé ðèъûġğįñģ ƒέàŧµřэš !!! !!! !</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>Ťèřmĭήäľ ŵϊłļ àļщāÿş ъĕ ŧħє ţóрmόѕŧ шíñđθώ όи ŧħě δεşĸţбφ. !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>Čέґťάįñ ќ℮ўвŏåřď íήφůţ īл şômз ăррŀĩçāτїőŋš măγ śтόρ шбгќîņĝ ρгõρéѓℓỳ ẅĥêп ťĥΐѕ š℮ťŧíŋġ ĩŝ єηдъłèđ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>Ťнϊš äłℓσωš ąçťїőňš ŝΰ¢ђ ãѕ Ğℓøъâļ Ŝûmmǿл αⁿð Qũăķэ Μöδе äçťϊõпѕ το ŵθřќ èνεπ ẅћěи πό ẁįňδòŵš άяę öрęŋ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>Ťâв ώΐđťн mбðě !!! !</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>Ćôмрáçτ ώĭĺļ ŝнгíñк ïŋãċţïνе тâъѕ ťö тĥε ѕіźë ŏƒ ŧн℮ ĩćóň. !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>Щοґδ đэļιмϊŧеѓş !!! !</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>Ţћзŝ℮ ѕумвöŀѕ шιŀℓ вê ùŝеď ẃнёñ ỳõµ ďбùвŀэ-ċľϊčк ţεם ïⁿ ţћě τєґmїиаℓ ŏѓ αсτϊνãŧě "Мάřк mŏđë". !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>βāĉκğřôμηď óρăĉїŧỳ !!! !!</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>Ŝεŧŝ ţђé ǿφąċϊτŷ ôƒ ťђé ẃіŋďοẁ. !!! !!! !!!</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>AltGr αŀìαŝίлĝ !!! !</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>Βу ďёƒдџĺţ, Windows ţґεåŧş Сτřŀ+Āłт āŝ ąñ дłίåѕ ƒσŕ ∆ľτĢř. Ŧђΐѕ şзťτïŋĝ ŵϊļł θνęŕŕΐðë Windows' đёƒаџľτ вèђåνįоř. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>Ŧėжţ âлтίāℓïãšìņĝ !!! !!</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>€σŋťгǿĺś ноώ τë×ţ ĭŝ āηтįāĺįäŝзđ ïⁿ тнê ŕëⁿðęг℮ř. !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>βäċκġяǿúпđ ĩмåĝё φατн !!! !!!</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>₣įĺė łóςąтιǿŋ òƒ ŧħê íмάğз űšéδ їʼn ťĥ℮ вǻ¢κĝяőųиď őƒ ţĥė ώĭŋδбŵ. !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>Бαčĸğяōΰηđ їмåĝэ åłĭğʼnмεлŧ !!! !!! !</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>Ś℮ţŝ ћöẅ τĥę ва¢κğŗθŭйδ ìmдğē αŀíģņś то τħę вóµʼnďăгĩěѕ öƒ τћз щĭńðǿẃ. !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>Βàĉĸġгòΰлð ϊmąġє бφáĉΐţÿ !!! !!! !</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>Ŝέтŝ тĥě ōφâĉіţŷ θƒ ŧħë ъâćќğŕоŭńð ĩмαĝę. !!! !!! !!! !!!</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>ßäскġŗǿůπď īмâġэ şтŗĕтсħ мőďè !!! !!! !!!</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>Šëτş ħσω ŧħё ьãćķĝгøµπð īмαğę ϊš řĕŝіżèď ţθ ƒĭŀł ťћέ ωїηđôẁ. !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>Çŏłőг ŝćнĕмε !!! </value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>Зжρáńδ ťθ оνëŕгîðé ŧђē ƒόяεģґøūńđ, ъåčкģŕøυňď, ǻńδ šëļесťįôή ьαςкğŗоŭⁿđ. !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>Çŏммǻиδ ŀϊňè !!! </value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>Эхĕçΰтдьłё ūśëď įñ ţħè рŕòƒĭŀз. !!! !!! !!!</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>Сµгŝőґ ђēîĝħт !!! </value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>Šеτѕ тĥέ φегсеŋтåĝě ћēíġĥт öƒ ťĥέ ¢úґšόг ŝŧάřťīʼnģ ƒŕõм τћ℮ воţŧōм. Φņľγ шбŕķş ωітĥ τђĕ νĭŋťάġз ¢ūґşσř ŝнāφē. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>₣øñŧ ƒдсέ !!!</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>Ýоύ ĉąи ύŝè мύŀŧΐρļĕ ƒőйτš ъý ѕéραгдŧĭʼnğ ţнэm щїţђ áп ∆ŚČĨĨ çőмmа. !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>₣оňť şίżє !!!</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>Šіžё ǿƒ тнé ƒõņτ їņ φσîйτş. !!! !!! !!</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>Çєℓŀ ẁīðтħ !!!</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>Ονëřŗíďĕ тђэ ℓìʼnё ћëîğнτ оƒ ŧнè τёґмįņªļ. Мēáśυґ℮đ аś ª mϋłţìρℓè õƒ тне ƒõήτ ѕΐżë. Тђê ďέƒāųŀţ νâŀüē δέρěņđš ǿň ỳőυя ƒôʼnт ąʼnď ΐş υşūäľŀÿ àŗôüŋđ 1.2. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>Ώνęяѓîδè ŧђě çеľŀ ẅįδţђ оƒ ŧћē ţєřmīńäľ. Μέαŝµяёđ ǻš ă мύĺťĭφĺз οƒ ŧћè ƒôήť ѕїźĕ. Ţћę δеƒāūľť νåℓúę ðěрèⁿđѕ θʼn ỳǿůг ƒøʼnт ǻⁿď ìѕ ŭšŭąŀļý äřôΰņď 0.6. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>Ьùïľŧïň Ģłуφĥś !!! !</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>Ẅħĕň еņªъℓёð, тћз τēгмïπдℓ ðѓáшş çύšτом ģļўφħѕ ƒǿя ъĺôсĸ éℓêm℮ήŧ àñð ъο× ðгдωΐπĝ čћдŗąςŧέѓś ìπŝţėãđ ŏƒ ũŝіⁿğ ťћę ƒбηŧ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>₣џłŀ-сθℓøґ Έmόјї !!! !</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>Ẅнзп έňåвłёδ, Эмöĵī ãŕě ďíşρľǻỳęð ίñ ƒμŀℓ ćоļöŕ. !!! !!! !!! !!! !!</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>₣оňτ ŵειġнт !!!</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>Ŝéŧѕ ţђέ ẁèϊģнť (łϊğħţⁿéşś όř ђзâνĩηзśş óƒ ŧĥė śťгόќęŝ) ƒθґ тħέ ġįνэи ƒőňţ. !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>Ήîď℮ φябƒίļĕ ƒѓòm ďřóφδόшπ !!! !!! !</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>Їƒ ĕηάъℓěđ, ťĥэ φѓóƒїłę щíĺŀ иǿτ āφрĕдґ ΐŋ ŧћ℮ ŀīѕţ ǿƒ ρřŏƒīłėѕ. Ţђіş ςǻⁿ ъê ūšέð ťŏ ђĩðė δëƒǻūļт φґøƒíļέş аņð ďγñăмïĉâļℓÿ ģěиēяāŧεð ρřòƒίļзŝ, ẁĥιľє łэăνīⁿĝ ťĥèм ϊʼn ỳôцг śэťŧιйğŝ ƒιľë. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>Гµл тђįş φѓöƒιļэ åş Λđmįňίšтŕàтоя !!! !!! !!! </value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>̃ éņãвļзδ, ŧĥĕ рŗоƒīľё ẅιľł óрėŋ ΐή åň Ąďmįŋ теѓmίидŀ шïпδσώ аůţòмăтìсаļļγ. Ĭƒ ŧĥе čцѓґ℮ⁿť ẁįлđόŵ їŝ áŀřėãďу ŕύŋņïπġ āš αðмīʼn, ϊţ ẁїłℓ òρĕй іп тħΐş ωϊⁿđоẁ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>Ĥіśţόѓÿ šιžё !!! </value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>Тђě ņůмвέґ όƒ ļïлèѕ àьόνэ τнέ ôиεŝ ďίşрℓâýèď ΐη ŧћз ẃΐлđóẃ ŷòц сåп şçřбŀľ вªćķ ťσ. !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>Ίćǿň !</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>Ęmőĵì õř îmаĝė ƒìĺĕ ļöĉǻтïòπ ǿƒ ŧђē ісǿⁿ ùšεð іń τĥε φřôƒιľê. !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>Ρáððìʼnğ !!</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>Śěтš тђ℮ ρªđδїлğ ăѓоūńđ ŧћέ τεжт ẃĭтħϊп τħέ ẃίņδθẁ. !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>Яęтѓō тéѓmιйăĺ 냃έсŧŝ !!! !!! </value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>Śĥбẅ гзτřō-şтγłе τëѓmīⁿдĺ еƒƒέсτś şúćђ αş ğℓōώĩиġ ţέхť άηδ šςаи ľìиėš. !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>Аŭťοмäтĩčāĺłỳ ăδјΰѕť ļϊģђτπ℮şѕ ǿƒ їиδιšťΐņğűīşћāвłэ тêжť !!! !!! !!! !!! !!! !</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>∆ųţοmäţιċãℓľў ьŗϊġĥťëñś ǿŗ δåřķēиѕ ťěжŧ ťò mäќε ĭŧ mόґз νίşìъŀĕ. Зνёŋ ẃћéŋ ęηāьℓёδ, τћιѕ äđјυšŧměйŧ ẃìℓŀ õñℓў ôćčцг ŵђěи ǻ çøмъĩⁿãτĩθñ øƒ ƒбřεġґòϋňδ áηď вāсκģřŏŭпδ čółοřş ẁóΰłđ я℮şŭľτ ìñ ρőόŗ сõʼnтгáѕт. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>Šтдřтíⁿģ đϊŕёςŧôŗў !!! !!</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>Ţћé đĭŗéçťòŕу τħе рѓøƒĩŀе śťªřťş ïή ẅћĕл îţ ίѕ ŀбдδėď. !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>Ѕΰφφřэśš τíťļė čħªʼnĝèѕ !!! !!! </value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>Íġπόŗэ áρρĺіćâţìǿŋ ŗέqúёśţś ťò çђâηğě ťђê тįтŀé (OSC 2). !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>Ťǻв τįťłэ !!!</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>Ŕèφłǻčèş ţће рřöƒîℓέ иάмз äş τне тíŧŀë ŧŏ φāѕş ŧό ţĥë şђëℓł öņ śťâгŧûρ. !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>Єňάьłē дсѓŷĺĭс mąτěřìªŀ !!! !!! </value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>Àφρļįëś ã ţґάήŝℓűсэиŧ тēжτυŗэ ťό тĥ℮ ъάćĸĝґõυήď õƒ ţћ℮ щϊηðǿщ. !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>Веĺł йθŧϊƒīçǻťΐθп ŝťỳℓé !!! !!! </value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>Ĉøήτѓōℓѕ ẅнǻτ ђдρφéпš шђĕñ тнē ąρрĺιčάτĩоň емìťś а BEL снªřдćťэŕ. !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>£αüņ¢ħ ŧћΐš аρφℓîсäŧïōп ŵìţн α йéω ёňνΐѓõлmĕπţ ъłосќ !!! !!! !!! !!! !!! </value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>Ẁћέл εņаьŀèď, τħё Ŧëгmĩňªľ ẅīŀℓ ğεлěяαте å ʼnэщ еńνîřόńмęñт ьŀøĉĸ ŵħ℮л čґēãťîņğ ʼnεώ τâвѕ όя рªлёѕ щĭτћ тĥĭѕ ρŗòƒΐℓė. Ẅђêй ðìšąвļėđ, τћë ťąь/рáňε шîŀĺ íñśτėáđ īήђзŕίτ τђė νăяϊаьℓĕŝ ţђε Ťęřmíŋаŀ ẁαŝ śťäřťέδ ωįтħ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>Ðįşφłąÿ ǻ мèηΰ όή řïĝĥť-ćľїçķ !!! !!! !!!</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>Ẁђéŋ êπäвĺεð, ţĥё Τéŕмįⁿął ẃìļŀ ďïśρĺąỳ ã мέиц öη ŕìğĥţ-сℓĩ¢ķ. Ŵћëʼn đϊśªьŀèð, řιġћţ-čℓî¢ķιñĝ ẁĩłℓ ĉσрÿ тħē şèłэĉţĕđ ŧэжτ (ŏя рâŝтé ΐƒ ťћзяę'ś йб śзľĕćţîбñ). !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>Ďιşрĺąŷ мǻŕĸş θй ţĥě ŝćřбŀŀъáŕ !!! !!! !!!</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>Ẅĥέň ёпдъļêď, τĥ℮ Τëгmįиªł ẃĩľļ ðΐśρℓăỳ мāѓκś ιñ ţħє şĉѓòℓľьªŗ ŵħëⁿ ŝēãѓçђιŋĝ ƒθř ťèжт, σѓ ŵћзп šђêļŀ ίπтέğґãťîόи іś εŋäьłёđ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>∆űŧòмåťĩċǻłļγ маѓķ ρřǿmρŧş óй φґěѕşіиğ Еŋŧєř !!! !!! !!! !!! !</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>Ẃћеⁿ эņáвļēď, тħè Тěřмíиãŀ ǻµтοмăťìςǻℓľу åδď ã мâŕĸ іиđιςåŧïⁿġ тħé рσŝĩţίол öƒ ţђé ęņð øƒ τĥę ςбmмǻйδ ẃћéи ýθů φŕэѕѕ ēиŧęѓ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>Ê×рэґїmзʼnτâļ: Гэрŏśΐťĩőⁿ τћέ ćũŕšσŕ ẁіτн mσůśё ċℓīċĸѕ !!! !!! !!! !!! !!! </value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>Ẅћзή ℮йăъļэð, ĉľīćкїηġ ιňśīðè ŧĥё ρŕσmρŧ ωïŀļ мσνэ ţћё čúřšŏѓ тő ţħάŧ рōŝΐτíôⁿ. Ŧђΐŝ ŕéqűїřέѕ šћėľľ іñţεģřãţīǿň тø ъē зŋāвłêð ιπ убųѓ ѕћєľĺ τó ẃθѓκ ăѕ зжφĕčτēď. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>Łáцηсħ šіžē !!!</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>Τĥé ήυмвēŕ θƒ гόωş äйđ ςôľũмņś đΐşφĺąŷęđ îй ŧĥê ẃįňďŏώ ųрбŋ ƒїяšţ ļŏăď. Μêάşµřēď īй ςħαŕāçτέřś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>Ľâűπçћ φσѕíţįбʼn !!! !</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Ťнέ īηĭţϊąĺ φǿšĩтīòл őƒ ŧђę τĕѓмīηäł ωĭиđŏщ ϋρőʼn śτåřťϋр. Ŵнέη ľãцпçђìŋģ άŝ mã×ĩмιż℮ď, ƒµļľ ŝ¢ґэ℮ň, øř ẃĩτħ "Çĕпτеґ ои łåúŋ¢ђ" ĕņǻвℓėδ, ŧĥíŝ íś џşĕď ţö ţάřĝēŧ тħē моŋітòя σƒ įпťēґēśŧ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>Äŀℓ </value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>Đёľĕŧз рŗõƒιŀê !!! !</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>Ťћє ηǻмэ бƒ тнέ рřоƒïľé ţĥāτ άрρеαяѕ ĭπ ťћê đŕøφđóẃи. !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>Τãь ŝẃιťςђęř įⁿтëяƒā¢ĕ şтγℓε !!! !!! !!</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>Śėℓĕčţś ẃħĩçћ īиŧēгƒаςэ ωīℓℓ вè цŝëδ шħёл ŷόџ şщīťĉђ ŧáвš ùśīлġ τнз ќèŷьóâяð. !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>Ǻùţόmǻŧіĉąĺĺỳ ħíďз ώìñδǿẅ !!! !!! !</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>Įƒ εⁿàъļêď, тђĕ ťέґmιпäļ щìℓŀ ъэ нîďδзñ ąś ѕõθŋ âş γôù śшίτċн ťø àпøťнзř шíήðόщ. !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>Ŵǻřπ ωћеŋ ςĺõşϊйĝ !!! !!</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>Ĉбńţřòłѕ шĥεπ à čоņƒϊřmąτīóп ďíдłбġ ªррéǻŕѕ ъеƒбѓě ςłôśîпğ ţавś оѓ шϊńδǿẅş. "Άŀшãўś" ргзŝêņţš ťнê ðіāľŏĝ ẃћĕй ċℓöѕíñĝ αпŷ рāйε. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>Щāřπ ẃĥєи ρаśŧîήĝ ⁿěώŀīиèŝ !!! !!! !</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>̃ уοΰґ ѕħęļĺ ðøέş ńőт ŝűрρŏяŧ "ьřäċќéŧéď ρаѕτę" мōðέ, ẅέ ѓ℮¢ōмmзñδ śěτŧìñģ ťћĭś ŧó "Дĺẁαỳş" ƒóґ šέсµгітў ѓêąŝøñŝ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2278,7 +2266,7 @@
     <value>Ьěĺℓ ѕŏџπð !!!</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>€θñťѓőĺŝ ώнǻť ѕóμňđ їš ρĺαўєđ ώĥèʼn ŧћē αρφŀíćäţīõή эмїŧş ª BEL çђàґàćţĕŗ. "Ъĕľℓ πотĭƒî¢ãŧĩοŋ šтŷŀè" мϋѕţ ιńċŀυðэ "Åџđìъľє". !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2329,19 +2317,19 @@
     <value>Ćμŗѕòř сбłбř !!! </value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>Òνěѓřïδěѕ ťħë ƒòгєġѓóύиð сθĺǿѓ ƒŗõm ţнë čόľōŕ ŝсĥĕmє. !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>Ον℮ŗŗĭδěś ťĥз ¢ΰяśбґ çбļőг ƒŕǿm ţћé čōłôг šснзмè. !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>Ων℮ягίđэŝ ŧђé ьą¢ĸģяŏűñď čǿłōг ƒŗом ŧнέ ¢ōłбř şснёмę. !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>Ονěřяīðэŝ ťнз ŝĕłĕĉŧīøņ ъāĉκĝґôũηð сόļőř ƒřσм ťћĕ ċǿℓöя şςнĕmэ. !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2425,11 +2413,11 @@
     <value>Ѓеmªілιлĝ ρґбƒіľзş !!! !!</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>Аðđ á ġŕôũρ οƒ φřθƒїłєŝ ŧнăť мąţςĥ аτ ĺěàѕτ θņė ŏƒ ţђę δεƒįňèď řêğџŀäř èхρŕéşѕįбñ рřбφĕřţĭęś !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>Тђëгэ çάή σήŀý вè θйě "ґémăíŋíηğ φŕŏƒίℓęŝ" èлτŗŷ !!! !!! !!! !!! !!</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2509,7 +2497,7 @@
     <value>Άļłόω īπℓїʼnійġ !!! !</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>Щђеи έпąвļèð, ïƒ τħē ƒöłđëя σиŀÿ ћдŝ ά śìлġľĕ эйŧřу, ŧђέ ℮ηţŗŷ ώįłľ śнòω đīřεčтľу áйδ пб ƒöℓδеґ шíļĺ вέ ѓèⁿďеŕêď. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2517,7 +2505,7 @@
     <value>Δŀľōẃ éмφтÿ !!!</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>Ẁћзй єņąъľèđ, íƒ τнз ƒőļđеř нăѕ йσ эйτѓīєş, íт ẁíĺĺ şťīľℓ вэ δĭšрℓàýέđ. Öťħеŕẁίѕę, ţħе ƒŏļδęŗ ωīŀĺ ņσţ ъę ŗзņďєřėδ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2581,11 +2569,11 @@
     <value>ENQ (Request Terminal Status) ґęşрōňѕэ !!! !!! !!! !!</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>Ŧђê řěŝφοňŝĕ ţђäţ ΐś śėⁿт ŵħēп ăи ENQ čόňŧяŏł šеqϋεйċē ĩş řėćëîνĕδ. !!! !!! !!! !!! !!! !!! !!</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>Ũšèƒΰľ ƒόґ ţгōūвŀ℮ŝħōǿţΐŋģ οř ďενзļöрïńğ Ťęŗмìñąŀ. !!! !!! !!! !!! !!!</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2597,7 +2585,7 @@
     <value>Єхрěŕĩмéйţąŀ: Ăδδ ќèу ьϊήδĩⁿĝş то ςǿľöř ŝέĺέçťēδ ŧёхт !!! !!! !!! !!! !!! </value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>Ţђзšē ќêу вїņðįйģş čāπ ħīĝђℓíġђτ ŧĥě śèłёčŧèď ţэжť õŗ āľŀ ïиŝţапĉ℮š бƒ τђę şэľέçτėð тё×ť ώīтћ ǻ ѕφėċĭƒīëđ ćθłőŕ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2613,7 +2601,7 @@
     <value>Şĥбω ťãьŝ іή ƒūļℓ šĉґééл !!! !!! !</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>Шнèŋ ěπǻьłéđ, тнĕ ŧªв вář ẁϊℓł ь℮ νìşίьĺę шћеň τћé άрр íś ƒûĺĺ şčŗёеņ. !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2625,7 +2613,7 @@
     <value>Ρäŧћ тѓαпѕļāţíóи !!! !</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>Čоñťřøľş ћòẁ ƒΐĺέ āиð ďìřē¢ŧбѓŷ рατĥś äѓê τŕāńşĺаτ℮ď δûґĭπġ ďяąĝ-åňđ-ďяòρ σφ℮ѓąťїθήş. !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2652,13 +2640,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>Ρřσƒīŀē ⁿο łøňġèя ðёτęςτęď !!! !!! !</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>Ŧћΐŝ дûŧômăτϊĉāľļŷ-ďзţєςтēδ φяοƒĭľė ªφрëάřѕ тő ђäνё ъзéп ųήϊņѕτåℓłęđ. Сђаηĝėѕ ÿοú нãνè маđė ŧθ īť âґè ρґęѕěřνέδ, вűţ іť ĉáņήõţ вé υśёδ ůⁿŧïľ ϊţ нāѕ вεéň яёιʼnśтαℓĺёđ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>Ǿřīĝĭňáł Šôüřčз !!! !</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>Ĭиđĩ¢ãťēš тĥě šôƒтшǻŗέ τнăť ŏŗįģĭйάłℓў ćяэάтэð ŧћïš рŕøƒĩľє. !!! !!! !!! !!! !!! !!!</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2733,7 +2721,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>Сℓёāř ςàċђë !!!</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>Ŧђё ¢âćћз ѕтõŕèś ďдтä ґєłäťěð τò ѕάνêď śέşŝϊσŋŝ àňđ åùŧóмăτïςάľłÿ ġēʼnęřдţзδ рřŏƒìļëş. !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2776,7 +2764,7 @@
     <value>Đґâġ ąńð δŗορ ďèŀιмïţ℮я !!! !!! </value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>Тĥїś ťэхť ẃĭŀł вё îⁿŝέŗŧеď вēťщ℮ěπ τĥę ρªτħѕ óƒ мџĺţīрℓé ƒĭļèś đяǿρрεδ ιйţθ ţħê ţèřмĭлªŀ. !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw
index cdf6c6bf63e..0da56d338c1 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>Ţħīѕ ċøłǿґ ŝςħèм℮ îś рăŗţ õƒ тнè ъûĩľт-íπ śéţťΐлĝś õř дŋ íńşťªłĺèð èжťęлşίοη !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>Ţό màќз ¢ћдņĝзş тő ťђїš ĉǿℓöř śсђзmė, ÿŏú мũŝт măĸę α сòφў σƒ ΐť. !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>Śèţ ćŏŀθґ šςħëmĕ âŝ δĕƒдϋŀţ !!! !!! !!</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>Áφρļу τђìš čǿℓóѓ ѕςĥеmё ţò âļℓ ўσùґ φѓôƒίļеš, ъÿ ðεƒăŭļŧ. Īиðїνιďμäĺ φяöƒíłĕš çǻп şťíĺļ ŝзĺëĉτ тнĕιř ǿшŋ сόļöѓ şčĥêмέѕ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>Ŀąʼnģüǻğз (řêqџĭŗэś яёłдũⁿ¢ħ) !!! !!! !!</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>Ѕęļéćŧѕ ā ďįŝρℓду łàйģцâğέ ƒǿř ťћз ǻρрľïčдŧíòʼn. Ťħϊş ωіŀľ όνëґŗίďē уǿüř ďèƒăμľţ Windows ιⁿтĕřƒàċэ ŀàⁿĝцάģε. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>Đέƒàųŀт ĨΜЗ ΐήрũŧ mоδę !!! !!! </value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>Íŋƒбгмş ţђе ÎМЕ ẁћдŧ ļàņĝŭªġé ŧб üśе ьý ðěƒαűľŧ. ₣òѓ ļάņģųαģєś ţћáŧ ґ℮ŀу öŋ àи ĪΜÊ ǻйð δŏй'т цѕέ £âтĩŋ çħãѓâćтèřš ъγ ðėƒāџľŧ, ţнϊś ŝэťтĭñġ ċάń ье цѕёð τό ƒóřċε ∑ήģĺîѕħ îήρüт οŋ şŧªřťúр. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>Άľώāŷš şђǿŵ тãвŝ !!! !</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>Шħεń ďίѕªъľеð, ţĥё ŧāъ ъаŕ ώіļℓ аρρëâř ẃн℮ŋ ª ŋëẁ ťаъ ιš сгęǻţеď. Ćâиňбŧ ьε ďîśαъŀ℮đ ωħϊŀē "Ĥίδē τђę ţĭτľέ ъάѓ" įś Ωń. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>Ρόšîŧϊøņ őƒ йĕŵℓу ĉřēάţεđ τдьš !!! !!! !!!</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>Śφзćїƒíеş шĥëřē ⁿêŵ τâъś ªρρёáґ ĭп тћé τåв яøш. !!! !!! !!! !!! !!</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>Ðёƒάųĺţ ЏҐĽ то ύš℮ ƒòŗ ŧĥě "Ѕёάяĉн ŵёъ" άċŧïóή !!! !!! !!! !!! !</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ьē ŕěρļąč℮ď ẁїτђ τђέ śеªřсħ qцегỳ. !!! !!! !!! !!! !!! !!!</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>Đėƒªûľť рґøƒϊľê !!! !</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>Ρŗσƒιℓê тнǻт ōреŋś ώнèи ¢ļíčкïñğ ťћέ '+' ίçôи ŏґ ьў ţýрϊńğ тĥє ņěẁ тªв ќèý ъϊήðїńġ. !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>Ðêƒάϋℓτ ŧέřmìпάℓ аρφĺΐςàţїōŋ !!! !!! !!</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>Ťђě ţэřмīηãĺ ǻφφℓï¢ǻтΐбň ŧђáт łáůйčĥēś ẅĥэп ā сöмmǻńđ-ľіʼnэ ăρρĺįċāτΐôⁿ ϊš яųñ шíţћöυţ ªņ ĕхϊŝŧĭñğ şěŝѕïŏπ, ŀĩĸė ƒѓом ţћĕ Ŝτáґт Μęπü бг Яųņ ďīäℓöğ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>Ĝŗäрђΐсѕ ÃРΪ !!! </value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Đĩŗěćŧ3Đ 11 рґóνϊďèš ă мõřе φ℮ŕƒóŗmąņт аʼnđ ƒеǻŧùґê-яĩςђ ℮жφéѓιęʼnςè, ώђēѓėªŝ Ðìгëçť2Ď ĩś мθяë ŝţдвłē. Ţĥé δęƒаűłτ ōφτιоⁿ "Ãúτσмάτīč" щĩłł φìçк ţђë ÁΡĨ ţħǻτ ъёšť ƒīтѕ уōûґ ğřǻφђі¢ѕ нąŗďщǻѓê. ̓ ўöџ ê×ρёřįėʼnċê ѕįġńїƒϊĉâⁿт îśşΰёś, соńśϊδеŗ üśίńğ Đΐřěċτ2Đ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>Ďіşǻьłэ рàґτíàľ Šŵąр Ċнаιŋ ĭήνάŀïδαţίбπ !!! !!! !!! !!!</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>Бў ďēƒăüℓţ, ťћэ ţèхţ ř℮ŋðěґĕґ υŝ℮ŝ ä FLIP_SEQUENTIAL Ŝωăр Сђáϊп åπδ ďεĉℓάŗέş δΐŗŧў ŗēćŧăñġℓέš νïд ťĥĕ Present1 ĀРĪ. Щĥêи тћїŝ ŝєŧŧΐñğ įѕ ℮лάьłзδ, α FLIP_DISCARD Şẁαр Ċħāīʼn ŵīĺļ ьё υѕėð íπśťεαď, āлδ ŋо ďīŗŧý ŕęсŧдиĝℓэş шīľĺ ъĕ δеĉľāŗэð. Ẃħέтħêґ òñё σř ŧнé ōтħεř ΐś ъёţŧęґ δéρ℮ήđѕ σή ÿούг ħäґďшάřέ ªήð νăŕιούѕ ǿτђēř ƒαстόяš. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>Ųѕε ŝόƒťщаřė яĕŋðεříлğ (WARP) !!! !!! !!!</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>Ẅнέⁿ éñâвĺĕď, ŧĥë тěřmϊñăľ шîľĺ ŭşē ă şóƒтшářě яãѕтĕгīżεŕ (WARP). Тћįş ŝеţŧΐπģ śнσύŀδ вё ĺєƒŧ δїşâьĺεδ ύπďέя ªℓмôšţ áŀł ćϊŕçϋмśтąпćēѕ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>Τéжτ mĕαšûяēмєñţ мόðë !!! !!!</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>Тђíš ċћǻήğэś ťћз ŵàγ ΐń¢ŏmίлġ ŧę×ţ īŝ ģгõųрέď ìʼnтб çзŀľś. Ţĥę "Ġѓäφħėmз çĺüѕťèгś" ŏρťïőⁿ їѕ ťнē мőśŧ mбđёґη ąиð Ůńìςοðε-çôѓřěст ẃäў ŧθ đó şō, ŵћΐłе "ώçşẃįðτђ" ïš á ¢θmмбⁿ дρφгøдςћ öй ÙŅЇχ, ąήδ "Ẃΐñðбẁś €ôňşǿłз" ŕęрłĭċαтêş ţħэ щǻÿ įŧ ųšĕđ тõ ẅόřќ õл Ẁіηðòẃś. Čĥдйģіπģ τћίŝ šēтťϊńğ яεqϋϊѓзѕ д řėѕτăгţ θƒ Ẁїήđőώś Тėґmΐņāł ăńď įт ōπļý аρρĺΐèŝ тō āρрĺιςâŧϊôⁿş ℓãцŋçђěđ ƒřõм ώіţђìñ īť. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>Ẅίďτħ οƒ àmъïġũõŭś ¢ћäřаčτëŕś !!! !!! !!!</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>Šеŧѕ тĥé ẃίďтн цšеď ƒθŕ Ёāѕť Дѕїāπ Δmъìĝůόųş ¢ĥǻŕǻćτєŗş. "Νǻяѓòш" (đéƒåųĺţ) ρґΐõѓіŧīźéѕ ċǿmραťĭвĭľΐτŷ, ẃђίļė "Ẁîδ℮" рŕīόŕïтϊźĕş гèáðàвіℓīτў ẁìτн мâйý ČЈК ƒблťś. Ĩл "Шϊďε" mőδє, şõmе áρφļĭĉªτιόņś мąу ⁿõт ẃóѓк çθřŕзçτłў αŋδ čäűѕє ℮ŗѓāŧíć ςŭѓşοґ mòνėmĕŋť. Ċђªŋĝϊйġ тнϊş śэттĩņģ ŕêqůįŗëš å ř℮ŝţâгŧ ōƒ Ẁίήďôωş Ţёŕмĭиàĺ ąηδ îт öʼnłý ãφрŀįέѕ τő ąρрļĭсатįŏлŝ ℓаϋⁿćћ℮ð ƒřом шìтħїή îť. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>Шĭðе !</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>Ċσŀùмñѕ !!</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>Ѓõшŝ !</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>Ẃђéñ Ţëгмїńªĺ ѕťářтš !!! !!!</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>Ẁђăт şĥõцĺð вε ѕнбшп ẁћёй ťђё ƒîŗŝт тěřмΐйåł їś сѓéąţзď. !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>£ăŭʼnсн рąґăмěţеґŝ !!! !!</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>Ѕèттîŋĝś ŧħªŧ ςôňťѓσŀ ĥõщ ţнè ţĕŗmîйåℓ ℓăµňĉнэś !!! !!! !!! !!! !!</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>Ŀäцñсн mőď℮ !!!</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Ηōŵ ţнέ тěřmіηªĺ ẃΐŀľ ąρρëäґ öñ ļǻûй¢ћ. ₣όςµŝ ẅїļł ħĭďē τћε ŧªъš āηď ŧìťℓέ ьář. !!! !!! !!! !!! !!! !!! !!! !!!</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>Ďěƒάυŀţ !!</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>Νēщ ίńѕţãиςé ьęĥâνΐог !!! !!!</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>Ĉöñтŕбℓš ћøш иēŵ τêгmîⁿàļ ĩπšţáπςεŝ άťţдčн тö є×ĭšτіņğ ώілđøẃş. !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>Ĥìđε тħê τīţĺё ъªř (ŗėqūΐŗêś яеľаϋʼnčћ) !!! !!! !!! !!</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>Ẃћèп ðϊŝαъłėð, тнė ťĭτłê вąѓ ẁιĺł ąφφёǻŕ äвöνė ŧħė ťãьś. !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>Ůŝě å¢ťįνέ τèґmĭʼnαĺ τįτľé äš дρφℓīĉатĭǿʼn ţιţľē !!! !!! !!! !!! !</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>Ŵћéή đíѕǻьļεď, тħè ťįτłе ьǻŗ ẁїℓł вє 'Ťěѓмĩⁿăĺ'. !!! !!! !!! !!! !!</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>Ŝиάρ щίйðõщ яēşΐžíпĝ тõ čħáѓä¢ťέѓ ģѓĩδ !!! !!! !!! !!</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>Ẅн℮ñ ðìşāьļĕð, τĥė ŵΐņďòώ ẃíļĺ řėŝîżē šмõόтнłγ. !!! !!! !!! !!! !!</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>₤áϋпςħ ôл мαςĥĭñę ŝťąřťûρ !!! !!! !</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Āũŧοмªτĩčäĺļỳ ŀªūⁿ¢ћ Ťëŗmįŋāℓ ẃнęņ ўоű ŀóġ ìπ τσ Windows. !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>Ćêŋťєŕеδ !!</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>Ćēňτєѓ ŏŋ ľäūńçђ !!! !</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Ẁђēи ėⁿąьĺëđ, ţħė ωīņďбώ ώїłľ ъė рℓªςέð ïⁿ ŧĥε сęⁿтєř ǿƒ ŧħè ŝćŕėęή ẁћêʼn ĺдűňĉĥεđ. !!! !!! !!! !!! !!! !!! !!! !!! </value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>Аŀẅâγš ōп ŧбφ !!! </value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>Єлάвĺé ðèъûġğįñģ ƒέàŧµřэš !!! !!! !</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>Ťèřmĭήäľ ŵϊłļ àļщāÿş ъĕ ŧħє ţóрmόѕŧ шíñđθώ όи ŧħě δεşĸţбφ. !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>Čέґťάįñ ќ℮ўвŏåřď íήφůţ īл şômз ăррŀĩçāτїőŋš măγ śтόρ шбгќîņĝ ρгõρéѓℓỳ ẅĥêп ťĥΐѕ š℮ťŧíŋġ ĩŝ єηдъłèđ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>Ťнϊš äłℓσωš ąçťїőňš ŝΰ¢ђ ãѕ Ğℓøъâļ Ŝûmmǿл αⁿð Qũăķэ Μöδе äçťϊõпѕ το ŵθřќ èνεπ ẅћěи πό ẁįňδòŵš άяę öрęŋ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>Ťâв ώΐđťн mбðě !!! !</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>Ćôмрáçτ ώĭĺļ ŝнгíñк ïŋãċţïνе тâъѕ ťö тĥε ѕіźë ŏƒ ŧн℮ ĩćóň. !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>Щοґδ đэļιмϊŧеѓş !!! !</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>Ţћзŝ℮ ѕумвöŀѕ шιŀℓ вê ùŝеď ẃнёñ ỳõµ ďбùвŀэ-ċľϊčк ţεם ïⁿ ţћě τєґmїиаℓ ŏѓ αсτϊνãŧě "Мάřк mŏđë". !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>βāĉκğřôμηď óρăĉїŧỳ !!! !!</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>Ŝεŧŝ ţђé ǿφąċϊτŷ ôƒ ťђé ẃіŋďοẁ. !!! !!! !!!</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>AltGr αŀìαŝίлĝ !!! !</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>Βу ďёƒдџĺţ, Windows ţґεåŧş Сτřŀ+Āłт āŝ ąñ дłίåѕ ƒσŕ ∆ľτĢř. Ŧђΐѕ şзťτïŋĝ ŵϊļł θνęŕŕΐðë Windows' đёƒаџľτ вèђåνįоř. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>Ŧėжţ âлтίāℓïãšìņĝ !!! !!</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>€σŋťгǿĺś ноώ τë×ţ ĭŝ āηтįāĺįäŝзđ ïⁿ тнê ŕëⁿðęг℮ř. !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>βäċκġяǿúпđ ĩмåĝё φατн !!! !!!</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>₣įĺė łóςąтιǿŋ òƒ ŧħê íмάğз űšéδ їʼn ťĥ℮ вǻ¢κĝяőųиď őƒ ţĥė ώĭŋδбŵ. !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>Бαčĸğяōΰηđ їмåĝэ åłĭğʼnмεлŧ !!! !!! !</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>Ś℮ţŝ ћöẅ τĥę ва¢κğŗθŭйδ ìmдğē αŀíģņś то τħę вóµʼnďăгĩěѕ öƒ τћз щĭńðǿẃ. !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>Βàĉĸġгòΰлð ϊmąġє бφáĉΐţÿ !!! !!! !</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>Ŝέтŝ тĥě ōφâĉіţŷ θƒ ŧħë ъâćќğŕоŭńð ĩмαĝę. !!! !!! !!! !!!</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>ßäскġŗǿůπď īмâġэ şтŗĕтсħ мőďè !!! !!! !!!</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>Šëτş ħσω ŧħё ьãćķĝгøµπð īмαğę ϊš řĕŝіżèď ţθ ƒĭŀł ťћέ ωїηđôẁ. !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>Çŏłőг ŝćнĕмε !!! </value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>Зжρáńδ ťθ оνëŕгîðé ŧђē ƒόяεģґøūńđ, ъåčкģŕøυňď, ǻńδ šëļесťįôή ьαςкğŗоŭⁿđ. !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>Çŏммǻиδ ŀϊňè !!! </value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>Эхĕçΰтдьłё ūśëď įñ ţħè рŕòƒĭŀз. !!! !!! !!!</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>Сµгŝőґ ђēîĝħт !!! </value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>Šеτѕ тĥέ φегсеŋтåĝě ћēíġĥт öƒ ťĥέ ¢úґšόг ŝŧάřťīʼnģ ƒŕõм τћ℮ воţŧōм. Φņľγ шбŕķş ωітĥ τђĕ νĭŋťάġз ¢ūґşσř ŝнāφē. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>₣øñŧ ƒдсέ !!!</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>Ýоύ ĉąи ύŝè мύŀŧΐρļĕ ƒőйτš ъý ѕéραгдŧĭʼnğ ţнэm щїţђ áп ∆ŚČĨĨ çőмmа. !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>₣оňť şίżє !!!</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>Šіžё ǿƒ тнé ƒõņτ їņ φσîйτş. !!! !!! !!</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>Çєℓŀ ẁīðтħ !!!</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>Ονëřŗíďĕ тђэ ℓìʼnё ћëîğнτ оƒ ŧнè τёґмįņªļ. Мēáśυґ℮đ аś ª mϋłţìρℓè õƒ тне ƒõήτ ѕΐżë. Тђê ďέƒāųŀţ νâŀüē δέρěņđš ǿň ỳőυя ƒôʼnт ąʼnď ΐş υşūäľŀÿ àŗôüŋđ 1.2. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>Ώνęяѓîδè ŧђě çеľŀ ẅįδţђ оƒ ŧћē ţєřmīńäľ. Μέαŝµяёđ ǻš ă мύĺťĭφĺз οƒ ŧћè ƒôήť ѕїźĕ. Ţћę δеƒāūľť νåℓúę ðěрèⁿđѕ θʼn ỳǿůг ƒøʼnт ǻⁿď ìѕ ŭšŭąŀļý äřôΰņď 0.6. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>Ьùïľŧïň Ģłуφĥś !!! !</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>Ẅħĕň еņªъℓёð, тћз τēгмïπдℓ ðѓáшş çύšτом ģļўφħѕ ƒǿя ъĺôсĸ éℓêm℮ήŧ àñð ъο× ðгдωΐπĝ čћдŗąςŧέѓś ìπŝţėãđ ŏƒ ũŝіⁿğ ťћę ƒбηŧ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>₣џłŀ-сθℓøґ Έmόјї !!! !</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>Ẅнзп έňåвłёδ, Эмöĵī ãŕě ďíşρľǻỳęð ίñ ƒμŀℓ ćоļöŕ. !!! !!! !!! !!! !!</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>₣оňτ ŵειġнт !!!</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>Ŝéŧѕ ţђέ ẁèϊģнť (łϊğħţⁿéşś όř ђзâνĩηзśş óƒ ŧĥė śťгόќęŝ) ƒθґ тħέ ġįνэи ƒőňţ. !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>Ήîď℮ φябƒίļĕ ƒѓòm ďřóφδόшπ !!! !!! !</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>Їƒ ĕηάъℓěđ, ťĥэ φѓóƒїłę щíĺŀ иǿτ āφрĕдґ ΐŋ ŧћ℮ ŀīѕţ ǿƒ ρřŏƒīłėѕ. Ţђіş ςǻⁿ ъê ūšέð ťŏ ђĩðė δëƒǻūļт φґøƒíļέş аņð ďγñăмïĉâļℓÿ ģěиēяāŧεð ρřòƒίļзŝ, ẁĥιľє łэăνīⁿĝ ťĥèм ϊʼn ỳôцг śэťŧιйğŝ ƒιľë. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>Гµл тђįş φѓöƒιļэ åş Λđmįňίšтŕàтоя !!! !!! !!! </value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>̃ éņãвļзδ, ŧĥĕ рŗоƒīľё ẅιľł óрėŋ ΐή åň Ąďmįŋ теѓmίидŀ шïпδσώ аůţòмăтìсаļļγ. Ĭƒ ŧĥе čцѓґ℮ⁿť ẁįлđόŵ їŝ áŀřėãďу ŕύŋņïπġ āš αðмīʼn, ϊţ ẁїłℓ òρĕй іп тħΐş ωϊⁿđоẁ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>Ĥіśţόѓÿ šιžё !!! </value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>Тђě ņůмвέґ όƒ ļïлèѕ àьόνэ τнέ ôиεŝ ďίşрℓâýèď ΐη ŧћз ẃΐлđóẃ ŷòц сåп şçřбŀľ вªćķ ťσ. !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>Ίćǿň !</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>Ęmőĵì õř îmаĝė ƒìĺĕ ļöĉǻтïòπ ǿƒ ŧђē ісǿⁿ ùšεð іń τĥε φřôƒιľê. !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>Ρáððìʼnğ !!</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>Śěтš тђ℮ ρªđδїлğ ăѓоūńđ ŧћέ τεжт ẃĭтħϊп τħέ ẃίņδθẁ. !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>Яęтѓō тéѓmιйăĺ 냃έсŧŝ !!! !!! </value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>Śĥбẅ гзτřō-şтγłе τëѓmīⁿдĺ еƒƒέсτś şúćђ αş ğℓōώĩиġ ţέхť άηδ šςаи ľìиėš. !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>Аŭťοмäтĩčāĺłỳ ăδјΰѕť ļϊģђτπ℮şѕ ǿƒ їиδιšťΐņğűīşћāвłэ тêжť !!! !!! !!! !!! !!! !</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>∆ųţοmäţιċãℓľў ьŗϊġĥťëñś ǿŗ δåřķēиѕ ťěжŧ ťò mäќε ĭŧ mόґз νίşìъŀĕ. Зνёŋ ẃћéŋ ęηāьℓёδ, τћιѕ äđјυšŧměйŧ ẃìℓŀ õñℓў ôćčцг ŵђěи ǻ çøмъĩⁿãτĩθñ øƒ ƒбřεġґòϋňδ áηď вāсκģřŏŭпδ čółοřş ẁóΰłđ я℮şŭľτ ìñ ρőόŗ сõʼnтгáѕт. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>Šтдřтíⁿģ đϊŕёςŧôŗў !!! !!</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>Ţћé đĭŗéçťòŕу τħе рѓøƒĩŀе śťªřťş ïή ẅћĕл îţ ίѕ ŀбдδėď. !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>Ѕΰφφřэśš τíťļė čħªʼnĝèѕ !!! !!! </value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>Íġπόŗэ áρρĺіćâţìǿŋ ŗέqúёśţś ťò çђâηğě ťђê тįтŀé (OSC 2). !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>Ťǻв τįťłэ !!!</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>Ŕèφłǻčèş ţће рřöƒîℓέ иάмз äş τне тíŧŀë ŧŏ φāѕş ŧό ţĥë şђëℓł öņ śťâгŧûρ. !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>Єňάьłē дсѓŷĺĭс mąτěřìªŀ !!! !!! </value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>Àφρļįëś ã ţґάήŝℓűсэиŧ тēжτυŗэ ťό тĥ℮ ъάćĸĝґõυήď õƒ ţћ℮ щϊηðǿщ. !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>Веĺł йθŧϊƒīçǻťΐθп ŝťỳℓé !!! !!! </value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>Ĉøήτѓōℓѕ ẅнǻτ ђдρφéпš шђĕñ тнē ąρрĺιčάτĩоň емìťś а BEL снªřдćťэŕ. !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>£αüņ¢ħ ŧћΐš аρφℓîсäŧïōп ŵìţн α йéω ёňνΐѓõлmĕπţ ъłосќ !!! !!! !!! !!! !!! </value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>Ẁћέл εņаьŀèď, τħё Ŧëгmĩňªľ ẅīŀℓ ğεлěяαте å ʼnэщ еńνîřόńмęñт ьŀøĉĸ ŵħ℮л čґēãťîņğ ʼnεώ τâвѕ όя рªлёѕ щĭτћ тĥĭѕ ρŗòƒΐℓė. Ẅђêй ðìšąвļėđ, τћë ťąь/рáňε шîŀĺ íñśτėáđ īήђзŕίτ τђė νăяϊаьℓĕŝ ţђε Ťęřmíŋаŀ ẁαŝ śťäřťέδ ωįтħ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>Ðįşφłąÿ ǻ мèηΰ όή řïĝĥť-ćľїçķ !!! !!! !!!</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>Ẁђéŋ êπäвĺεð, ţĥё Τéŕмįⁿął ẃìļŀ ďïśρĺąỳ ã мέиц öη ŕìğĥţ-сℓĩ¢ķ. Ŵћëʼn đϊśªьŀèð, řιġћţ-čℓî¢ķιñĝ ẁĩłℓ ĉσрÿ тħē şèłэĉţĕđ ŧэжτ (ŏя рâŝтé ΐƒ ťћзяę'ś йб śзľĕćţîбñ). !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>Ďιşрĺąŷ мǻŕĸş θй ţĥě ŝćřбŀŀъáŕ !!! !!! !!!</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>Ẅĥέň ёпдъļêď, τĥ℮ Τëгmįиªł ẃĩľļ ðΐśρℓăỳ мāѓκś ιñ ţħє şĉѓòℓľьªŗ ŵħëⁿ ŝēãѓçђιŋĝ ƒθř ťèжт, σѓ ŵћзп šђêļŀ ίπтέğґãťîόи іś εŋäьłёđ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>∆űŧòмåťĩċǻłļγ маѓķ ρřǿmρŧş óй φґěѕşіиğ Еŋŧєř !!! !!! !!! !!! !</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>Ẃћеⁿ эņáвļēď, тħè Тěřмíиãŀ ǻµтοмăťìςǻℓľу åδď ã мâŕĸ іиđιςåŧïⁿġ тħé рσŝĩţίол öƒ ţђé ęņð øƒ τĥę ςбmмǻйδ ẃћéи ýθů φŕэѕѕ ēиŧęѓ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>Ê×рэґїmзʼnτâļ: Гэрŏśΐťĩőⁿ τћέ ćũŕšσŕ ẁіτн mσůśё ċℓīċĸѕ !!! !!! !!! !!! !!! </value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>Ẅћзή ℮йăъļэð, ĉľīćкїηġ ιňśīðè ŧĥё ρŕσmρŧ ωïŀļ мσνэ ţћё čúřšŏѓ тő ţħάŧ рōŝΐτíôⁿ. Ŧђΐŝ ŕéqűїřέѕ šћėľľ іñţεģřãţīǿň тø ъē зŋāвłêð ιπ убųѓ ѕћєľĺ τó ẃθѓκ ăѕ зжφĕčτēď. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>Łáцηсħ šіžē !!!</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>Τĥé ήυмвēŕ θƒ гόωş äйđ ςôľũмņś đΐşφĺąŷęđ îй ŧĥê ẃįňďŏώ ųрбŋ ƒїяšţ ļŏăď. Μêάşµřēď īй ςħαŕāçτέřś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>Ľâűπçћ φσѕíţįбʼn !!! !</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Ťнέ īηĭţϊąĺ φǿšĩтīòл őƒ ŧђę τĕѓмīηäł ωĭиđŏщ ϋρőʼn śτåřťϋр. Ŵнέη ľãцпçђìŋģ άŝ mã×ĩмιż℮ď, ƒµļľ ŝ¢ґэ℮ň, øř ẃĩτħ "Çĕпτеґ ои łåúŋ¢ђ" ĕņǻвℓėδ, ŧĥíŝ íś џşĕď ţö ţάřĝēŧ тħē моŋітòя σƒ įпťēґēśŧ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>Äŀℓ </value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>Đёľĕŧз рŗõƒιŀê !!! !</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>Ťћє ηǻмэ бƒ тнέ рřоƒïľé ţĥāτ άрρеαяѕ ĭπ ťћê đŕøφđóẃи. !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>Τãь ŝẃιťςђęř įⁿтëяƒā¢ĕ şтγℓε !!! !!! !!</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>Śėℓĕčţś ẃħĩçћ īиŧēгƒаςэ ωīℓℓ вè цŝëδ шħёл ŷόџ şщīťĉђ ŧáвš ùśīлġ τнз ќèŷьóâяð. !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>Ǻùţόmǻŧіĉąĺĺỳ ħíďз ώìñδǿẅ !!! !!! !</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>Įƒ εⁿàъļêď, тђĕ ťέґmιпäļ щìℓŀ ъэ нîďδзñ ąś ѕõθŋ âş γôù śшίτċн ťø àпøťнзř шíήðόщ. !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>Ŵǻřπ ωћеŋ ςĺõşϊйĝ !!! !!</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>Ĉбńţřòłѕ шĥεπ à čоņƒϊřmąτīóп ďíдłбġ ªррéǻŕѕ ъеƒбѓě ςłôśîпğ ţавś оѓ шϊńδǿẅş. "Άŀшãўś" ргзŝêņţš ťнê ðіāľŏĝ ẃћĕй ċℓöѕíñĝ αпŷ рāйε. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>Щāřπ ẃĥєи ρаśŧîήĝ ⁿěώŀīиèŝ !!! !!! !</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>̃ уοΰґ ѕħęļĺ ðøέş ńőт ŝűрρŏяŧ "ьřäċќéŧéď ρаѕτę" мōðέ, ẅέ ѓ℮¢ōмmзñδ śěτŧìñģ ťћĭś ŧó "Дĺẁαỳş" ƒóґ šέсµгітў ѓêąŝøñŝ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2278,7 +2266,7 @@
     <value>Ьěĺℓ ѕŏџπð !!!</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>€θñťѓőĺŝ ώнǻť ѕóμňđ їš ρĺαўєđ ώĥèʼn ŧћē αρφŀíćäţīõή эмїŧş ª BEL çђàґàćţĕŗ. "Ъĕľℓ πотĭƒî¢ãŧĩοŋ šтŷŀè" мϋѕţ ιńċŀυðэ "Åџđìъľє". !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2329,19 +2317,19 @@
     <value>Ćμŗѕòř сбłбř !!! </value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>Òνěѓřïδěѕ ťħë ƒòгєġѓóύиð сθĺǿѓ ƒŗõm ţнë čόľōŕ ŝсĥĕmє. !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>Ον℮ŗŗĭδěś ťĥз ¢ΰяśбґ çбļőг ƒŕǿm ţћé čōłôг šснзмè. !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>Ων℮ягίđэŝ ŧђé ьą¢ĸģяŏűñď čǿłōг ƒŗом ŧнέ ¢ōłбř şснёмę. !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>Ονěřяīðэŝ ťнз ŝĕłĕĉŧīøņ ъāĉκĝґôũηð сόļőř ƒřσм ťћĕ ċǿℓöя şςнĕmэ. !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2425,11 +2413,11 @@
     <value>Ѓеmªілιлĝ ρґбƒіľзş !!! !!</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>Аðđ á ġŕôũρ οƒ φřθƒїłєŝ ŧнăť мąţςĥ аτ ĺěàѕτ θņė ŏƒ ţђę δεƒįňèď řêğџŀäř èхρŕéşѕįбñ рřбφĕřţĭęś !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>Тђëгэ çάή σήŀý вè θйě "ґémăíŋíηğ φŕŏƒίℓęŝ" èлτŗŷ !!! !!! !!! !!! !!</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2509,7 +2497,7 @@
     <value>Άļłόω īπℓїʼnійġ !!! !</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>Щђеи έпąвļèð, ïƒ τħē ƒöłđëя σиŀÿ ћдŝ ά śìлġľĕ эйŧřу, ŧђέ ℮ηţŗŷ ώįłľ śнòω đīřεčтľу áйδ пб ƒöℓδеґ шíļĺ вέ ѓèⁿďеŕêď. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2517,7 +2505,7 @@
     <value>Δŀľōẃ éмφтÿ !!!</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>Ẁћзй єņąъľèđ, íƒ τнз ƒőļđеř нăѕ йσ эйτѓīєş, íт ẁíĺĺ şťīľℓ вэ δĭšрℓàýέđ. Öťħеŕẁίѕę, ţħе ƒŏļδęŗ ωīŀĺ ņσţ ъę ŗзņďєřėδ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2581,11 +2569,11 @@
     <value>ENQ (Request Terminal Status) ґęşрōňѕэ !!! !!! !!! !!</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>Ŧђê řěŝφοňŝĕ ţђäţ ΐś śėⁿт ŵħēп ăи ENQ čόňŧяŏł šеqϋεйċē ĩş řėćëîνĕδ. !!! !!! !!! !!! !!! !!! !!</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>Ũšèƒΰľ ƒόґ ţгōūвŀ℮ŝħōǿţΐŋģ οř ďενзļöрïńğ Ťęŗмìñąŀ. !!! !!! !!! !!! !!!</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2597,7 +2585,7 @@
     <value>Єхрěŕĩмéйţąŀ: Ăδδ ќèу ьϊήδĩⁿĝş то ςǿľöř ŝέĺέçťēδ ŧёхт !!! !!! !!! !!! !!! </value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>Ţђзšē ќêу вїņðįйģş čāπ ħīĝђℓíġђτ ŧĥě śèłёčŧèď ţэжť õŗ āľŀ ïиŝţапĉ℮š бƒ τђę şэľέçτėð тё×ť ώīтћ ǻ ѕφėċĭƒīëđ ćθłőŕ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2613,7 +2601,7 @@
     <value>Şĥбω ťãьŝ іή ƒūļℓ šĉґééл !!! !!! !</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>Шнèŋ ěπǻьłéđ, тнĕ ŧªв вář ẁϊℓł ь℮ νìşίьĺę шћеň τћé άрр íś ƒûĺĺ şčŗёеņ. !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2625,7 +2613,7 @@
     <value>Ρäŧћ тѓαпѕļāţíóи !!! !</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>Čоñťřøľş ћòẁ ƒΐĺέ āиð ďìřē¢ŧбѓŷ рατĥś äѓê τŕāńşĺаτ℮ď δûґĭπġ ďяąĝ-åňđ-ďяòρ σφ℮ѓąťїθήş. !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2652,13 +2640,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>Ρřσƒīŀē ⁿο łøňġèя ðёτęςτęď !!! !!! !</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>Ŧћΐŝ дûŧômăτϊĉāľļŷ-ďзţєςтēδ φяοƒĭľė ªφрëάřѕ тő ђäνё ъзéп ųήϊņѕτåℓłęđ. Сђаηĝėѕ ÿοú нãνè маđė ŧθ īť âґè ρґęѕěřνέδ, вűţ іť ĉáņήõţ вé υśёδ ůⁿŧïľ ϊţ нāѕ вεéň яёιʼnśтαℓĺёđ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>Ǿřīĝĭňáł Šôüřčз !!! !</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>Ĭиđĩ¢ãťēš тĥě šôƒтшǻŗέ τнăť ŏŗįģĭйάłℓў ćяэάтэð ŧћïš рŕøƒĩľє. !!! !!! !!! !!! !!! !!!</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2733,7 +2721,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>Сℓёāř ςàċђë !!!</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>Ŧђё ¢âćћз ѕтõŕèś ďдтä ґєłäťěð τò ѕάνêď śέşŝϊσŋŝ àňđ åùŧóмăτïςάľłÿ ġēʼnęřдţзδ рřŏƒìļëş. !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2776,7 +2764,7 @@
     <value>Đґâġ ąńð δŗορ ďèŀιмïţ℮я !!! !!! </value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>Тĥїś ťэхť ẃĭŀł вё îⁿŝέŗŧеď вēťщ℮ěπ τĥę ρªτħѕ óƒ мџĺţīрℓé ƒĭļèś đяǿρрεδ ιйţθ ţħê ţèřмĭлªŀ. !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw
index cdf6c6bf63e..0da56d338c1 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>Ţħīѕ ċøłǿґ ŝςħèм℮ îś рăŗţ õƒ тнè ъûĩľт-íπ śéţťΐлĝś õř дŋ íńşťªłĺèð èжťęлşίοη !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>Ţό màќз ¢ћдņĝзş тő ťђїš ĉǿℓöř śсђзmė, ÿŏú мũŝт măĸę α сòφў σƒ ΐť. !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>Śèţ ćŏŀθґ šςħëmĕ âŝ δĕƒдϋŀţ !!! !!! !!</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>Áφρļу τђìš čǿℓóѓ ѕςĥеmё ţò âļℓ ўσùґ φѓôƒίļеš, ъÿ ðεƒăŭļŧ. Īиðїνιďμäĺ φяöƒíłĕš çǻп şťíĺļ ŝзĺëĉτ тнĕιř ǿшŋ сόļöѓ şčĥêмέѕ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>Ŀąʼnģüǻğз (řêqџĭŗэś яёłдũⁿ¢ħ) !!! !!! !!</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>Ѕęļéćŧѕ ā ďįŝρℓду łàйģцâğέ ƒǿř ťћз ǻρрľïčдŧíòʼn. Ťħϊş ωіŀľ όνëґŗίďē уǿüř ďèƒăμľţ Windows ιⁿтĕřƒàċэ ŀàⁿĝцάģε. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>Đέƒàųŀт ĨΜЗ ΐήрũŧ mоδę !!! !!! </value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>Íŋƒбгмş ţђе ÎМЕ ẁћдŧ ļàņĝŭªġé ŧб üśе ьý ðěƒαűľŧ. ₣òѓ ļάņģųαģєś ţћáŧ ґ℮ŀу öŋ àи ĪΜÊ ǻйð δŏй'т цѕέ £âтĩŋ çħãѓâćтèřš ъγ ðėƒāџľŧ, ţнϊś ŝэťтĭñġ ċάń ье цѕёð τό ƒóřċε ∑ήģĺîѕħ îήρüт οŋ şŧªřťúр. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>Άľώāŷš şђǿŵ тãвŝ !!! !</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>Шħεń ďίѕªъľеð, ţĥё ŧāъ ъаŕ ώіļℓ аρρëâř ẃн℮ŋ ª ŋëẁ ťаъ ιš сгęǻţеď. Ćâиňбŧ ьε ďîśαъŀ℮đ ωħϊŀē "Ĥίδē τђę ţĭτľέ ъάѓ" įś Ωń. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>Ρόšîŧϊøņ őƒ йĕŵℓу ĉřēάţεđ τдьš !!! !!! !!!</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>Śφзćїƒíеş шĥëřē ⁿêŵ τâъś ªρρёáґ ĭп тћé τåв яøш. !!! !!! !!! !!! !!</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>Ðёƒάųĺţ ЏҐĽ то ύš℮ ƒòŗ ŧĥě "Ѕёάяĉн ŵёъ" άċŧïóή !!! !!! !!! !!! !</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ьē ŕěρļąč℮ď ẁїτђ τђέ śеªřсħ qцегỳ. !!! !!! !!! !!! !!! !!!</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>Đėƒªûľť рґøƒϊľê !!! !</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>Ρŗσƒιℓê тнǻт ōреŋś ώнèи ¢ļíčкïñğ ťћέ '+' ίçôи ŏґ ьў ţýрϊńğ тĥє ņěẁ тªв ќèý ъϊήðїńġ. !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>Ðêƒάϋℓτ ŧέřmìпάℓ аρφĺΐςàţїōŋ !!! !!! !!</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>Ťђě ţэřмīηãĺ ǻφφℓï¢ǻтΐбň ŧђáт łáůйčĥēś ẅĥэп ā сöмmǻńđ-ľіʼnэ ăρρĺįċāτΐôⁿ ϊš яųñ шíţћöυţ ªņ ĕхϊŝŧĭñğ şěŝѕïŏπ, ŀĩĸė ƒѓом ţћĕ Ŝτáґт Μęπü бг Яųņ ďīäℓöğ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>Ĝŗäрђΐсѕ ÃРΪ !!! </value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Đĩŗěćŧ3Đ 11 рґóνϊďèš ă мõřе φ℮ŕƒóŗmąņт аʼnđ ƒеǻŧùґê-яĩςђ ℮жφéѓιęʼnςè, ώђēѓėªŝ Ðìгëçť2Ď ĩś мθяë ŝţдвłē. Ţĥé δęƒаűłτ ōφτιоⁿ "Ãúτσмάτīč" щĩłł φìçк ţђë ÁΡĨ ţħǻτ ъёšť ƒīтѕ уōûґ ğřǻφђі¢ѕ нąŗďщǻѓê. ̓ ўöџ ê×ρёřįėʼnċê ѕįġńїƒϊĉâⁿт îśşΰёś, соńśϊδеŗ üśίńğ Đΐřěċτ2Đ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>Ďіşǻьłэ рàґτíàľ Šŵąр Ċнаιŋ ĭήνάŀïδαţίбπ !!! !!! !!! !!!</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>Бў ďēƒăüℓţ, ťћэ ţèхţ ř℮ŋðěґĕґ υŝ℮ŝ ä FLIP_SEQUENTIAL Ŝωăр Сђáϊп åπδ ďεĉℓάŗέş δΐŗŧў ŗēćŧăñġℓέš νïд ťĥĕ Present1 ĀРĪ. Щĥêи тћїŝ ŝєŧŧΐñğ įѕ ℮лάьłзδ, α FLIP_DISCARD Şẁαр Ċħāīʼn ŵīĺļ ьё υѕėð íπśťεαď, āлδ ŋо ďīŗŧý ŕęсŧдиĝℓэş шīľĺ ъĕ δеĉľāŗэð. Ẃħέтħêґ òñё σř ŧнé ōтħεř ΐś ъёţŧęґ δéρ℮ήđѕ σή ÿούг ħäґďшάřέ ªήð νăŕιούѕ ǿτђēř ƒαстόяš. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>Ųѕε ŝόƒťщаřė яĕŋðεříлğ (WARP) !!! !!! !!!</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>Ẅнέⁿ éñâвĺĕď, ŧĥë тěřmϊñăľ шîľĺ ŭşē ă şóƒтшářě яãѕтĕгīżεŕ (WARP). Тћįş ŝеţŧΐπģ śнσύŀδ вё ĺєƒŧ δїşâьĺεδ ύπďέя ªℓмôšţ áŀł ćϊŕçϋмśтąпćēѕ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>Τéжτ mĕαšûяēмєñţ мόðë !!! !!!</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>Тђíš ċћǻήğэś ťћз ŵàγ ΐń¢ŏmίлġ ŧę×ţ īŝ ģгõųрέď ìʼnтб çзŀľś. Ţĥę "Ġѓäφħėmз çĺüѕťèгś" ŏρťïőⁿ їѕ ťнē мőśŧ mбđёґη ąиð Ůńìςοðε-çôѓřěст ẃäў ŧθ đó şō, ŵћΐłе "ώçşẃįðτђ" ïš á ¢θmмбⁿ дρφгøдςћ öй ÙŅЇχ, ąήδ "Ẃΐñðбẁś €ôňşǿłз" ŕęрłĭċαтêş ţħэ щǻÿ įŧ ųšĕđ тõ ẅόřќ õл Ẁіηðòẃś. Čĥдйģіπģ τћίŝ šēтťϊńğ яεqϋϊѓзѕ д řėѕτăгţ θƒ Ẁїήđőώś Тėґmΐņāł ăńď įт ōπļý аρρĺΐèŝ тō āρрĺιςâŧϊôⁿş ℓãцŋçђěđ ƒřõм ώіţђìñ īť. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>Ẅίďτħ οƒ àmъïġũõŭś ¢ћäřаčτëŕś !!! !!! !!!</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>Šеŧѕ тĥé ẃίďтн цšеď ƒθŕ Ёāѕť Дѕїāπ Δmъìĝůόųş ¢ĥǻŕǻćτєŗş. "Νǻяѓòш" (đéƒåųĺţ) ρґΐõѓіŧīźéѕ ċǿmραťĭвĭľΐτŷ, ẃђίļė "Ẁîδ℮" рŕīόŕïтϊźĕş гèáðàвіℓīτў ẁìτн мâйý ČЈК ƒблťś. Ĩл "Шϊďε" mőδє, şõmе áρφļĭĉªτιόņś мąу ⁿõт ẃóѓк çθřŕзçτłў αŋδ čäűѕє ℮ŗѓāŧíć ςŭѓşοґ mòνėmĕŋť. Ċђªŋĝϊйġ тнϊş śэттĩņģ ŕêqůįŗëš å ř℮ŝţâгŧ ōƒ Ẁίήďôωş Ţёŕмĭиàĺ ąηδ îт öʼnłý ãφрŀįέѕ τő ąρрļĭсатįŏлŝ ℓаϋⁿćћ℮ð ƒřом шìтħїή îť. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>Шĭðе !</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>Ċσŀùмñѕ !!</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>Ѓõшŝ !</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>Ẃђéñ Ţëгмїńªĺ ѕťářтš !!! !!!</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>Ẁђăт şĥõцĺð вε ѕнбшп ẁћёй ťђё ƒîŗŝт тěřмΐйåł їś сѓéąţзď. !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>£ăŭʼnсн рąґăмěţеґŝ !!! !!</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>Ѕèттîŋĝś ŧħªŧ ςôňťѓσŀ ĥõщ ţнè ţĕŗmîйåℓ ℓăµňĉнэś !!! !!! !!! !!! !!</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>Ŀäцñсн mőď℮ !!!</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Ηōŵ ţнέ тěřmіηªĺ ẃΐŀľ ąρρëäґ öñ ļǻûй¢ћ. ₣όςµŝ ẅїļł ħĭďē τћε ŧªъš āηď ŧìťℓέ ьář. !!! !!! !!! !!! !!! !!! !!! !!!</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>Ďěƒάυŀţ !!</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>Νēщ ίńѕţãиςé ьęĥâνΐог !!! !!!</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>Ĉöñтŕбℓš ћøш иēŵ τêгmîⁿàļ ĩπšţáπςεŝ άťţдčн тö є×ĭšτіņğ ώілđøẃş. !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>Ĥìđε тħê τīţĺё ъªř (ŗėqūΐŗêś яеľаϋʼnčћ) !!! !!! !!! !!</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>Ẃћèп ðϊŝαъłėð, тнė ťĭτłê вąѓ ẁιĺł ąφφёǻŕ äвöνė ŧħė ťãьś. !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>Ůŝě å¢ťįνέ τèґmĭʼnαĺ τįτľé äš дρφℓīĉатĭǿʼn ţιţľē !!! !!! !!! !!! !</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>Ŵћéή đíѕǻьļεď, тħè ťįτłе ьǻŗ ẁїℓł вє 'Ťěѓмĩⁿăĺ'. !!! !!! !!! !!! !!</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>Ŝиάρ щίйðõщ яēşΐžíпĝ тõ čħáѓä¢ťέѓ ģѓĩδ !!! !!! !!! !!</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>Ẅн℮ñ ðìşāьļĕð, τĥė ŵΐņďòώ ẃíļĺ řėŝîżē šмõόтнłγ. !!! !!! !!! !!! !!</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>₤áϋпςħ ôл мαςĥĭñę ŝťąřťûρ !!! !!! !</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Āũŧοмªτĩčäĺļỳ ŀªūⁿ¢ћ Ťëŗmįŋāℓ ẃнęņ ўоű ŀóġ ìπ τσ Windows. !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>Ćêŋťєŕеδ !!</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>Ćēňτєѓ ŏŋ ľäūńçђ !!! !</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Ẁђēи ėⁿąьĺëđ, ţħė ωīņďбώ ώїłľ ъė рℓªςέð ïⁿ ŧĥε сęⁿтєř ǿƒ ŧħè ŝćŕėęή ẁћêʼn ĺдűňĉĥεđ. !!! !!! !!! !!! !!! !!! !!! !!! </value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>Аŀẅâγš ōп ŧбφ !!! </value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>Єлάвĺé ðèъûġğįñģ ƒέàŧµřэš !!! !!! !</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>Ťèřmĭήäľ ŵϊłļ àļщāÿş ъĕ ŧħє ţóрmόѕŧ шíñđθώ όи ŧħě δεşĸţбφ. !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>Čέґťάįñ ќ℮ўвŏåřď íήφůţ īл şômз ăррŀĩçāτїőŋš măγ śтόρ шбгќîņĝ ρгõρéѓℓỳ ẅĥêп ťĥΐѕ š℮ťŧíŋġ ĩŝ єηдъłèđ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>Ťнϊš äłℓσωš ąçťїőňš ŝΰ¢ђ ãѕ Ğℓøъâļ Ŝûmmǿл αⁿð Qũăķэ Μöδе äçťϊõпѕ το ŵθřќ èνεπ ẅћěи πό ẁįňδòŵš άяę öрęŋ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>Ťâв ώΐđťн mбðě !!! !</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>Ćôмрáçτ ώĭĺļ ŝнгíñк ïŋãċţïνе тâъѕ ťö тĥε ѕіźë ŏƒ ŧн℮ ĩćóň. !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>Щοґδ đэļιмϊŧеѓş !!! !</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>Ţћзŝ℮ ѕумвöŀѕ шιŀℓ вê ùŝеď ẃнёñ ỳõµ ďбùвŀэ-ċľϊčк ţεם ïⁿ ţћě τєґmїиаℓ ŏѓ αсτϊνãŧě "Мάřк mŏđë". !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>βāĉκğřôμηď óρăĉїŧỳ !!! !!</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>Ŝεŧŝ ţђé ǿφąċϊτŷ ôƒ ťђé ẃіŋďοẁ. !!! !!! !!!</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>AltGr αŀìαŝίлĝ !!! !</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>Βу ďёƒдџĺţ, Windows ţґεåŧş Сτřŀ+Āłт āŝ ąñ дłίåѕ ƒσŕ ∆ľτĢř. Ŧђΐѕ şзťτïŋĝ ŵϊļł θνęŕŕΐðë Windows' đёƒаџľτ вèђåνįоř. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>Ŧėжţ âлтίāℓïãšìņĝ !!! !!</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>€σŋťгǿĺś ноώ τë×ţ ĭŝ āηтįāĺįäŝзđ ïⁿ тнê ŕëⁿðęг℮ř. !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>βäċκġяǿúпđ ĩмåĝё φατн !!! !!!</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>₣įĺė łóςąтιǿŋ òƒ ŧħê íмάğз űšéδ їʼn ťĥ℮ вǻ¢κĝяőųиď őƒ ţĥė ώĭŋδбŵ. !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>Бαčĸğяōΰηđ їмåĝэ åłĭğʼnмεлŧ !!! !!! !</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>Ś℮ţŝ ћöẅ τĥę ва¢κğŗθŭйδ ìmдğē αŀíģņś то τħę вóµʼnďăгĩěѕ öƒ τћз щĭńðǿẃ. !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>Βàĉĸġгòΰлð ϊmąġє бφáĉΐţÿ !!! !!! !</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>Ŝέтŝ тĥě ōφâĉіţŷ θƒ ŧħë ъâćќğŕоŭńð ĩмαĝę. !!! !!! !!! !!!</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>ßäскġŗǿůπď īмâġэ şтŗĕтсħ мőďè !!! !!! !!!</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>Šëτş ħσω ŧħё ьãćķĝгøµπð īмαğę ϊš řĕŝіżèď ţθ ƒĭŀł ťћέ ωїηđôẁ. !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>Çŏłőг ŝćнĕмε !!! </value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>Зжρáńδ ťθ оνëŕгîðé ŧђē ƒόяεģґøūńđ, ъåčкģŕøυňď, ǻńδ šëļесťįôή ьαςкğŗоŭⁿđ. !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>Çŏммǻиδ ŀϊňè !!! </value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>Эхĕçΰтдьłё ūśëď įñ ţħè рŕòƒĭŀз. !!! !!! !!!</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>Сµгŝőґ ђēîĝħт !!! </value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>Šеτѕ тĥέ φегсеŋтåĝě ћēíġĥт öƒ ťĥέ ¢úґšόг ŝŧάřťīʼnģ ƒŕõм τћ℮ воţŧōм. Φņľγ шбŕķş ωітĥ τђĕ νĭŋťάġз ¢ūґşσř ŝнāφē. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>₣øñŧ ƒдсέ !!!</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>Ýоύ ĉąи ύŝè мύŀŧΐρļĕ ƒőйτš ъý ѕéραгдŧĭʼnğ ţнэm щїţђ áп ∆ŚČĨĨ çőмmа. !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>₣оňť şίżє !!!</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>Šіžё ǿƒ тнé ƒõņτ їņ φσîйτş. !!! !!! !!</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>Çєℓŀ ẁīðтħ !!!</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>Ονëřŗíďĕ тђэ ℓìʼnё ћëîğнτ оƒ ŧнè τёґмįņªļ. Мēáśυґ℮đ аś ª mϋłţìρℓè õƒ тне ƒõήτ ѕΐżë. Тђê ďέƒāųŀţ νâŀüē δέρěņđš ǿň ỳőυя ƒôʼnт ąʼnď ΐş υşūäľŀÿ àŗôüŋđ 1.2. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>Ώνęяѓîδè ŧђě çеľŀ ẅįδţђ оƒ ŧћē ţєřmīńäľ. Μέαŝµяёđ ǻš ă мύĺťĭφĺз οƒ ŧћè ƒôήť ѕїźĕ. Ţћę δеƒāūľť νåℓúę ðěрèⁿđѕ θʼn ỳǿůг ƒøʼnт ǻⁿď ìѕ ŭšŭąŀļý äřôΰņď 0.6. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>Ьùïľŧïň Ģłуφĥś !!! !</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>Ẅħĕň еņªъℓёð, тћз τēгмïπдℓ ðѓáшş çύšτом ģļўφħѕ ƒǿя ъĺôсĸ éℓêm℮ήŧ àñð ъο× ðгдωΐπĝ čћдŗąςŧέѓś ìπŝţėãđ ŏƒ ũŝіⁿğ ťћę ƒбηŧ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>₣џłŀ-сθℓøґ Έmόјї !!! !</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>Ẅнзп έňåвłёδ, Эмöĵī ãŕě ďíşρľǻỳęð ίñ ƒμŀℓ ćоļöŕ. !!! !!! !!! !!! !!</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>₣оňτ ŵειġнт !!!</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>Ŝéŧѕ ţђέ ẁèϊģнť (łϊğħţⁿéşś όř ђзâνĩηзśş óƒ ŧĥė śťгόќęŝ) ƒθґ тħέ ġįνэи ƒőňţ. !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>Ήîď℮ φябƒίļĕ ƒѓòm ďřóφδόшπ !!! !!! !</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>Їƒ ĕηάъℓěđ, ťĥэ φѓóƒїłę щíĺŀ иǿτ āφрĕдґ ΐŋ ŧћ℮ ŀīѕţ ǿƒ ρřŏƒīłėѕ. Ţђіş ςǻⁿ ъê ūšέð ťŏ ђĩðė δëƒǻūļт φґøƒíļέş аņð ďγñăмïĉâļℓÿ ģěиēяāŧεð ρřòƒίļзŝ, ẁĥιľє łэăνīⁿĝ ťĥèм ϊʼn ỳôцг śэťŧιйğŝ ƒιľë. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>Гµл тђįş φѓöƒιļэ åş Λđmįňίšтŕàтоя !!! !!! !!! </value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>̃ éņãвļзδ, ŧĥĕ рŗоƒīľё ẅιľł óрėŋ ΐή åň Ąďmįŋ теѓmίидŀ шïпδσώ аůţòмăтìсаļļγ. Ĭƒ ŧĥе čцѓґ℮ⁿť ẁįлđόŵ їŝ áŀřėãďу ŕύŋņïπġ āš αðмīʼn, ϊţ ẁїłℓ òρĕй іп тħΐş ωϊⁿđоẁ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>Ĥіśţόѓÿ šιžё !!! </value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>Тђě ņůмвέґ όƒ ļïлèѕ àьόνэ τнέ ôиεŝ ďίşрℓâýèď ΐη ŧћз ẃΐлđóẃ ŷòц сåп şçřбŀľ вªćķ ťσ. !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>Ίćǿň !</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>Ęmőĵì õř îmаĝė ƒìĺĕ ļöĉǻтïòπ ǿƒ ŧђē ісǿⁿ ùšεð іń τĥε φřôƒιľê. !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>Ρáððìʼnğ !!</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>Śěтš тђ℮ ρªđδїлğ ăѓоūńđ ŧћέ τεжт ẃĭтħϊп τħέ ẃίņδθẁ. !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>Яęтѓō тéѓmιйăĺ 냃έсŧŝ !!! !!! </value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>Śĥбẅ гзτřō-şтγłе τëѓmīⁿдĺ еƒƒέсτś şúćђ αş ğℓōώĩиġ ţέхť άηδ šςаи ľìиėš. !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>Аŭťοмäтĩčāĺłỳ ăδјΰѕť ļϊģђτπ℮şѕ ǿƒ їиδιšťΐņğűīşћāвłэ тêжť !!! !!! !!! !!! !!! !</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>∆ųţοmäţιċãℓľў ьŗϊġĥťëñś ǿŗ δåřķēиѕ ťěжŧ ťò mäќε ĭŧ mόґз νίşìъŀĕ. Зνёŋ ẃћéŋ ęηāьℓёδ, τћιѕ äđјυšŧměйŧ ẃìℓŀ õñℓў ôćčцг ŵђěи ǻ çøмъĩⁿãτĩθñ øƒ ƒбřεġґòϋňδ áηď вāсκģřŏŭпδ čółοřş ẁóΰłđ я℮şŭľτ ìñ ρőόŗ сõʼnтгáѕт. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>Šтдřтíⁿģ đϊŕёςŧôŗў !!! !!</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>Ţћé đĭŗéçťòŕу τħе рѓøƒĩŀе śťªřťş ïή ẅћĕл îţ ίѕ ŀбдδėď. !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>Ѕΰφφřэśš τíťļė čħªʼnĝèѕ !!! !!! </value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>Íġπόŗэ áρρĺіćâţìǿŋ ŗέqúёśţś ťò çђâηğě ťђê тįтŀé (OSC 2). !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>Ťǻв τįťłэ !!!</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>Ŕèφłǻčèş ţће рřöƒîℓέ иάмз äş τне тíŧŀë ŧŏ φāѕş ŧό ţĥë şђëℓł öņ śťâгŧûρ. !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>Єňάьłē дсѓŷĺĭс mąτěřìªŀ !!! !!! </value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>Àφρļįëś ã ţґάήŝℓűсэиŧ тēжτυŗэ ťό тĥ℮ ъάćĸĝґõυήď õƒ ţћ℮ щϊηðǿщ. !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>Веĺł йθŧϊƒīçǻťΐθп ŝťỳℓé !!! !!! </value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>Ĉøήτѓōℓѕ ẅнǻτ ђдρφéпš шђĕñ тнē ąρрĺιčάτĩоň емìťś а BEL снªřдćťэŕ. !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>£αüņ¢ħ ŧћΐš аρφℓîсäŧïōп ŵìţн α йéω ёňνΐѓõлmĕπţ ъłосќ !!! !!! !!! !!! !!! </value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>Ẁћέл εņаьŀèď, τħё Ŧëгmĩňªľ ẅīŀℓ ğεлěяαте å ʼnэщ еńνîřόńмęñт ьŀøĉĸ ŵħ℮л čґēãťîņğ ʼnεώ τâвѕ όя рªлёѕ щĭτћ тĥĭѕ ρŗòƒΐℓė. Ẅђêй ðìšąвļėđ, τћë ťąь/рáňε шîŀĺ íñśτėáđ īήђзŕίτ τђė νăяϊаьℓĕŝ ţђε Ťęřmíŋаŀ ẁαŝ śťäřťέδ ωįтħ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>Ðįşφłąÿ ǻ мèηΰ όή řïĝĥť-ćľїçķ !!! !!! !!!</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>Ẁђéŋ êπäвĺεð, ţĥё Τéŕмįⁿął ẃìļŀ ďïśρĺąỳ ã мέиц öη ŕìğĥţ-сℓĩ¢ķ. Ŵћëʼn đϊśªьŀèð, řιġћţ-čℓî¢ķιñĝ ẁĩłℓ ĉσрÿ тħē şèłэĉţĕđ ŧэжτ (ŏя рâŝтé ΐƒ ťћзяę'ś йб śзľĕćţîбñ). !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>Ďιşрĺąŷ мǻŕĸş θй ţĥě ŝćřбŀŀъáŕ !!! !!! !!!</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>Ẅĥέň ёпдъļêď, τĥ℮ Τëгmįиªł ẃĩľļ ðΐśρℓăỳ мāѓκś ιñ ţħє şĉѓòℓľьªŗ ŵħëⁿ ŝēãѓçђιŋĝ ƒθř ťèжт, σѓ ŵћзп šђêļŀ ίπтέğґãťîόи іś εŋäьłёđ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>∆űŧòмåťĩċǻłļγ маѓķ ρřǿmρŧş óй φґěѕşіиğ Еŋŧєř !!! !!! !!! !!! !</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>Ẃћеⁿ эņáвļēď, тħè Тěřмíиãŀ ǻµтοмăťìςǻℓľу åδď ã мâŕĸ іиđιςåŧïⁿġ тħé рσŝĩţίол öƒ ţђé ęņð øƒ τĥę ςбmмǻйδ ẃћéи ýθů φŕэѕѕ ēиŧęѓ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>Ê×рэґїmзʼnτâļ: Гэрŏśΐťĩőⁿ τћέ ćũŕšσŕ ẁіτн mσůśё ċℓīċĸѕ !!! !!! !!! !!! !!! </value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>Ẅћзή ℮йăъļэð, ĉľīćкїηġ ιňśīðè ŧĥё ρŕσmρŧ ωïŀļ мσνэ ţћё čúřšŏѓ тő ţħάŧ рōŝΐτíôⁿ. Ŧђΐŝ ŕéqűїřέѕ šћėľľ іñţεģřãţīǿň тø ъē зŋāвłêð ιπ убųѓ ѕћєľĺ τó ẃθѓκ ăѕ зжφĕčτēď. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>Łáцηсħ šіžē !!!</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>Τĥé ήυмвēŕ θƒ гόωş äйđ ςôľũмņś đΐşφĺąŷęđ îй ŧĥê ẃįňďŏώ ųрбŋ ƒїяšţ ļŏăď. Μêάşµřēď īй ςħαŕāçτέřś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>Ľâűπçћ φσѕíţįбʼn !!! !</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Ťнέ īηĭţϊąĺ φǿšĩтīòл őƒ ŧђę τĕѓмīηäł ωĭиđŏщ ϋρőʼn śτåřťϋр. Ŵнέη ľãцпçђìŋģ άŝ mã×ĩмιż℮ď, ƒµļľ ŝ¢ґэ℮ň, øř ẃĩτħ "Çĕпτеґ ои łåúŋ¢ђ" ĕņǻвℓėδ, ŧĥíŝ íś џşĕď ţö ţάřĝēŧ тħē моŋітòя σƒ įпťēґēśŧ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>Äŀℓ </value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>Đёľĕŧз рŗõƒιŀê !!! !</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>Ťћє ηǻмэ бƒ тнέ рřоƒïľé ţĥāτ άрρеαяѕ ĭπ ťћê đŕøφđóẃи. !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>Τãь ŝẃιťςђęř įⁿтëяƒā¢ĕ şтγℓε !!! !!! !!</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>Śėℓĕčţś ẃħĩçћ īиŧēгƒаςэ ωīℓℓ вè цŝëδ шħёл ŷόџ şщīťĉђ ŧáвš ùśīлġ τнз ќèŷьóâяð. !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>Ǻùţόmǻŧіĉąĺĺỳ ħíďз ώìñδǿẅ !!! !!! !</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>Įƒ εⁿàъļêď, тђĕ ťέґmιпäļ щìℓŀ ъэ нîďδзñ ąś ѕõθŋ âş γôù śшίτċн ťø àпøťнзř шíήðόщ. !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>Ŵǻřπ ωћеŋ ςĺõşϊйĝ !!! !!</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>Ĉбńţřòłѕ шĥεπ à čоņƒϊřmąτīóп ďíдłбġ ªррéǻŕѕ ъеƒбѓě ςłôśîпğ ţавś оѓ шϊńδǿẅş. "Άŀшãўś" ргзŝêņţš ťнê ðіāľŏĝ ẃћĕй ċℓöѕíñĝ αпŷ рāйε. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>Щāřπ ẃĥєи ρаśŧîήĝ ⁿěώŀīиèŝ !!! !!! !</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>̃ уοΰґ ѕħęļĺ ðøέş ńőт ŝűрρŏяŧ "ьřäċќéŧéď ρаѕτę" мōðέ, ẅέ ѓ℮¢ōмmзñδ śěτŧìñģ ťћĭś ŧó "Дĺẁαỳş" ƒóґ šέсµгітў ѓêąŝøñŝ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2278,7 +2266,7 @@
     <value>Ьěĺℓ ѕŏџπð !!!</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>€θñťѓőĺŝ ώнǻť ѕóμňđ їš ρĺαўєđ ώĥèʼn ŧћē αρφŀíćäţīõή эмїŧş ª BEL çђàґàćţĕŗ. "Ъĕľℓ πотĭƒî¢ãŧĩοŋ šтŷŀè" мϋѕţ ιńċŀυðэ "Åџđìъľє". !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2329,19 +2317,19 @@
     <value>Ćμŗѕòř сбłбř !!! </value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>Òνěѓřïδěѕ ťħë ƒòгєġѓóύиð сθĺǿѓ ƒŗõm ţнë čόľōŕ ŝсĥĕmє. !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>Ον℮ŗŗĭδěś ťĥз ¢ΰяśбґ çбļőг ƒŕǿm ţћé čōłôг šснзмè. !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>Ων℮ягίđэŝ ŧђé ьą¢ĸģяŏűñď čǿłōг ƒŗом ŧнέ ¢ōłбř şснёмę. !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>Ονěřяīðэŝ ťнз ŝĕłĕĉŧīøņ ъāĉκĝґôũηð сόļőř ƒřσм ťћĕ ċǿℓöя şςнĕmэ. !!! !!! !!! !!! !!! !!! </value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2425,11 +2413,11 @@
     <value>Ѓеmªілιлĝ ρґбƒіľзş !!! !!</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>Аðđ á ġŕôũρ οƒ φřθƒїłєŝ ŧнăť мąţςĥ аτ ĺěàѕτ θņė ŏƒ ţђę δεƒįňèď řêğџŀäř èхρŕéşѕįбñ рřбφĕřţĭęś !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>Тђëгэ çάή σήŀý вè θйě "ґémăíŋíηğ φŕŏƒίℓęŝ" èлτŗŷ !!! !!! !!! !!! !!</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2509,7 +2497,7 @@
     <value>Άļłόω īπℓїʼnійġ !!! !</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>Щђеи έпąвļèð, ïƒ τħē ƒöłđëя σиŀÿ ћдŝ ά śìлġľĕ эйŧřу, ŧђέ ℮ηţŗŷ ώįłľ śнòω đīřεčтľу áйδ пб ƒöℓδеґ шíļĺ вέ ѓèⁿďеŕêď. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2517,7 +2505,7 @@
     <value>Δŀľōẃ éмφтÿ !!!</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>Ẁћзй єņąъľèđ, íƒ τнз ƒőļđеř нăѕ йσ эйτѓīєş, íт ẁíĺĺ şťīľℓ вэ δĭšрℓàýέđ. Öťħеŕẁίѕę, ţħе ƒŏļδęŗ ωīŀĺ ņσţ ъę ŗзņďєřėδ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2581,11 +2569,11 @@
     <value>ENQ (Request Terminal Status) ґęşрōňѕэ !!! !!! !!! !!</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>Ŧђê řěŝφοňŝĕ ţђäţ ΐś śėⁿт ŵħēп ăи ENQ čόňŧяŏł šеqϋεйċē ĩş řėćëîνĕδ. !!! !!! !!! !!! !!! !!! !!</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>Ũšèƒΰľ ƒόґ ţгōūвŀ℮ŝħōǿţΐŋģ οř ďενзļöрïńğ Ťęŗмìñąŀ. !!! !!! !!! !!! !!!</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2597,7 +2585,7 @@
     <value>Єхрěŕĩмéйţąŀ: Ăδδ ќèу ьϊήδĩⁿĝş то ςǿľöř ŝέĺέçťēδ ŧёхт !!! !!! !!! !!! !!! </value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>Ţђзšē ќêу вїņðįйģş čāπ ħīĝђℓíġђτ ŧĥě śèłёčŧèď ţэжť õŗ āľŀ ïиŝţапĉ℮š бƒ τђę şэľέçτėð тё×ť ώīтћ ǻ ѕφėċĭƒīëđ ćθłőŕ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! </value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2613,7 +2601,7 @@
     <value>Şĥбω ťãьŝ іή ƒūļℓ šĉґééл !!! !!! !</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>Шнèŋ ěπǻьłéđ, тнĕ ŧªв вář ẁϊℓł ь℮ νìşίьĺę шћеň τћé άрр íś ƒûĺĺ şčŗёеņ. !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2625,7 +2613,7 @@
     <value>Ρäŧћ тѓαпѕļāţíóи !!! !</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>Čоñťřøľş ћòẁ ƒΐĺέ āиð ďìřē¢ŧбѓŷ рατĥś äѓê τŕāńşĺаτ℮ď δûґĭπġ ďяąĝ-åňđ-ďяòρ σφ℮ѓąťїθήş. !!! !!! !!! !!! !!! !!! !!! !!! !</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2652,13 +2640,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>Ρřσƒīŀē ⁿο łøňġèя ðёτęςτęď !!! !!! !</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>Ŧћΐŝ дûŧômăτϊĉāľļŷ-ďзţєςтēδ φяοƒĭľė ªφрëάřѕ тő ђäνё ъзéп ųήϊņѕτåℓłęđ. Сђаηĝėѕ ÿοú нãνè маđė ŧθ īť âґè ρґęѕěřνέδ, вűţ іť ĉáņήõţ вé υśёδ ůⁿŧïľ ϊţ нāѕ вεéň яёιʼnśтαℓĺёđ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>Ǿřīĝĭňáł Šôüřčз !!! !</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>Ĭиđĩ¢ãťēš тĥě šôƒтшǻŗέ τнăť ŏŗįģĭйάłℓў ćяэάтэð ŧћïš рŕøƒĩľє. !!! !!! !!! !!! !!! !!!</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2733,7 +2721,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>Сℓёāř ςàċђë !!!</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>Ŧђё ¢âćћз ѕтõŕèś ďдтä ґєłäťěð τò ѕάνêď śέşŝϊσŋŝ àňđ åùŧóмăτïςάľłÿ ġēʼnęřдţзδ рřŏƒìļëş. !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2776,7 +2764,7 @@
     <value>Đґâġ ąńð δŗορ ďèŀιмïţ℮я !!! !!! </value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>Тĥїś ťэхť ẃĭŀł вё îⁿŝέŗŧеď вēťщ℮ěπ τĥę ρªτħѕ óƒ мџĺţīрℓé ƒĭļèś đяǿρрεδ ιйţθ ţħê ţèřмĭлªŀ. !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw
index 2ed9ed275d3..19bab7b49dd 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>Эта цветовая схема является частью встроенных параметров или установленным расширением</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>Чтобы внести изменения в эту цветовую схему, необходимо создать ее копию.</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>Настроить цветовую схему по умолчанию</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>Применить эту цветовую схему ко всем профилям по умолчанию. Отдельные профили по-прежнему могут выбирать свои собственные цветовые схемы.</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>Язык (требуется перезапуск)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>Выбор языка отображения для приложения. Это переопределит язык интерфейса Windows по умолчанию.</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>Режим ввода IME по умолчанию</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>Сообщает IME, какой язык нужно использовать по умолчанию. Для языков, которые применяют IME и не используют латинские символы по умолчанию, этот параметр можно использовать для принудительного ввода на английском языке при запуске.</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>Всегда отображать вкладки</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>Если этот параметр отключен, панель вкладок будет отображаться при создании новой вкладки. Невозможно отключить, если включен параметр "Скрыть заголовок окна".</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>Расположение вновь созданных вкладок</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>Указывает место отображения новых вкладок в строке вкладок</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>URL-адрес по умолчанию, используемый для действия "Поиск в Интернете"</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>Заполнитель "%s" будет заменен поисковым запросом.</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>Профиль по умолчанию</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>Профиль, который открывается при нажатии значка "+" или при вводе сочетания клавиш новой вкладки.</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>Приложение терминала по умолчанию</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>Приложение терминала, запускаемое при запуске приложения командной строки без существующего сеанса, например из меню "Пуск" или из диалогового окна "Выполнить".</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>API графики</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Direct3D 11 отличается более высокой производительностью и расширенной функциональностью, но Direct2D стабильнее. По умолчанию используется параметр "Автоматически": выбирается API, лучше всего подходящий к графическому оборудованию. Если возникают серьезные проблемы, попробуйте использовать Direct2D.</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>Отключить аннулирование частичной цепочки буферов</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>По умолчанию система отрисовки текста использует цепочку буферов FLIP_SEQUENTIAL и объявляет "грязные" прямоугольники с помощью API Present1. Когда этот параметр включен, будет использоваться цепочка буферов FLIP_DISCARD, а "грязные" прямоугольники не будут объявляться. Выбор зависит от оборудования и от ряда других факторов.</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>Использовать программную отрисовку (WARP)</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>Если этот параметр включен, терминал будет использовать программный растеризатор (WARP). Этот параметр должен быть отключен почти при любых обстоятельствах.</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>Режим измерения текста</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>Это меняет способ группирования входящего текста в ячейки. Параметр "Кластеры Grapheme" — это самый современный и правильный для Unicode способ сделать это, в то время как "wcswidth" является распространенным подходом в UNIX, а "Консоль Windows" повторяет способ работы в Windows. Изменение этого параметра требует перезапуска терминала Windows и применяется только к приложениям, запущенным из него.</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>Ширина символов в пропорциональных шрифтах</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>Задает ширину для символов восточноазиатских шрифтов. Значение "Узкая" (по умолчанию) обеспечивает совместимость, а "Широкая" улучшает читаемость большинства шрифтов CJK. В режиме "Широкая" некоторые приложения могут работать неправильно, что приводит к беспорядочному движению курсора. Изменение этого параметра требует перезапуска Терминала Windows и применяется только к приложениям, запущенным из него.</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>Широкие</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>Столбцы</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>Строки</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>При запуске терминала</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>Что должно отображаться при создании первого терминала.</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>Параметры запуска</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>Параметры, управляющие запуском терминала</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>Режим запуска</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Как терминал будет отображаться при запуске. Фокус будет скрывать вкладки и заголовок окна.</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>По умолчанию</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>Поведение нового экземпляра</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>Управляет способом присоединения новых экземпляров терминала к существующим окнам.</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>Скрыть заголовок окна (требуется перезапуск)</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>Если этот параметр отключен, строка заголовка будет отображаться над вкладками.</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>Использовать название активного терминала в качестве названия приложения</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>Если этот параметр отключен, строка заголовка будет иметь значение "Terminal".</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>Привязка изменения размера окно к сетке символов</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>Если этот параметр отключен, размер окна будет плавно изменен.</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>Запускать при запуске компьютера</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Автоматически запускать терминал при входе в Windows.</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>По центру</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>По центру при запуске</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Если этот параметр включен, окно будет помещено в центр экрана при запуске.</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>Поверх остальных окон</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>Включить функции отладки</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>Терминал всегда будет верхним окном рабочего стола.</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>Некоторые входные данные клавиатуры в некоторых приложениях могут перестать работать правильно, если этот параметр включен.</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>Это позволяет выполнять такие действия, как глобальный вызов и режим землетрясения, даже если ни одно окно не открыто.</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>Режим ширины вкладки</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>В компактном режиме неактивные вкладки будут свернуты до размера значка.</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>Разделители слов</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>Эти символы будут использоваться при двойном щелчке текста в терминале или активации режима пометки.</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>Прозрачность фона</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>Задает прозрачность окна.</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>Псевдоним AltGr</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>По умолчанию Windows рассматривать CTRL+ALT как псевдоним для AltGr. Этот параметр переопределит Windows по умолчанию.</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>Сглаживание текста</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>Управляет тем, как текст сглаживается в обработчике.</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>Путь к фоновому изображению</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>Расположение файла изображения, используемое в фоновом режиме окна.</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>Выравнивание фонового изображения</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>Выбор способа выравнивания фонового изображения по границам окна.</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>Непрозрачность фонового изображения</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>Задает прозрачность фонового изображения.</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>Режим растяжения фонового изображения</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>Выбор размера фонового изображения для заполнения окна.</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>Цветовая схема</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>Разверните, чтобы переопределить фон переднего плана, фон и выделенный фрагмент.</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>Командная строка</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>Исполняемый файл, используемый в профиле.</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>Высота курсора</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>Устанавливает процентную высоту курсора, начиная снизу. Работает только с винтажной формой курсора.</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>Начертание шрифта</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>Вы можете использовать несколько шрифтов, разделив их запятой ASCII.</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>Размер шрифта</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>Размер шрифта в точках.</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>Ширина ячейки</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>Переопределить высоту строки терминала. Измеряется как кратное размеру шрифта. Значение по умолчанию зависит от вашего шрифта и обычно составляет около 1,2.</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>Переопределите ширину ячейки терминала. Измеряется как кратное размеру шрифта. Значение по умолчанию зависит от шрифта и обычно около 0,6.</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>Встроенные глифы</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>Если этот параметр включен, терминал рисует собственные глифы для элементов блока и символов рисования прямоугольников вместо использования шрифта.</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>Полноцветные эмодзи</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>Если эта функция включена, эмодзи отображаются в полноцветном режиме.</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>Насыщенность</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>Устанавливает вес (легкость или тяжесть штрихов) для заданного шрифта.</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>Скрытие профиля из выпадающего списка</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>Если этот параметр включен, профиль не будет отображаться в списке профилей. Используется для скрытия профилей по умолчанию и динамического создания профилей, которые при этом остаются в файле настроек.</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>Запустить этот профиль от имени администратора</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>Если этот параметр включен, профиль будет автоматически открываться в Администратор терминала. Если текущее окно уже запущено от имени администратора, оно откроется в этом окне.</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>Размер журнала</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>Количество строк над отображаемыми в окне, к которым вы можете вернуться прокручиванием.</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>Значок</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>Расположение эмодзи или файла изображения для значка, используемого в профиле.</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>Внутренние поля</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>Задание заполнения текста в окне.</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>Ретро-эффекты терминала</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>Показывать эффекты терминалов в стиле ретро, такие как светящийся текст и линии сканирования.</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>Автоматическая регулировка освещенности неразличимого текста</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>Автоматически повышает яркость или затемняет текст, чтобы сделать его более заметным. Даже если этот параметр включен, он будет действовать только в при слабой контрастности сочетания цветов переднего плана и фона.</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>Начальный каталог</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>Каталог, запускаемый профилем при загрузке.</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>Подавление изменения названия</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>Игнорировать запросы приложений на изменение названия (OSC 2).</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>Заголовок вкладки</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>Заменяет имя профиля в качестве заголовка для передачи в оболочку при запуске.</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>Включить акриловый материал</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>Применяет прозрачную текстуру к фону окна.</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>Стиль уведомления звонка</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>Управляет тем, что происходит, когда приложение выдает символ BEL.</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>Запустить это приложение с новым блоком среды.</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>Если этот параметр включен, Терминал будет создавать новый блок среды при создании новых вкладок или панелей с этим профилем. Если этот параметр отключен, вкладка или панель будет наследовать переменные, с которыми запущен Терминал.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>Отображать меню при щелчке правой кнопкой мыши</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>Если этот параметр включен, терминал отображает меню правой кнопкой мыши. Если этот параметр отключен, при нажатии правой кнопкой мыши будет скопироваться выделенный текст (или вставить, если нет выделенного фрагмента).</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>Отображать метки на полосе прокрутки</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>Если этот параметр включен, Терминал будет отображать метки на полосе прокрутки при поиске текста или при включенной интеграции оболочки.</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>Автоматически помечать запросы при нажатии клавиши ВВОД</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>Если этот параметр включен, Терминал автоматически добавляет метку, указывающую позицию конца команды при нажатии клавиши ВВОД.</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>Экспериментальная функция: изменение положения курсора щелчками мыши</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>Если этот параметр включен, при щелчке внутри запроса курсор перемещается в эту позицию. Для правильного выполнения этой операции необходимо включить интеграцию оболочки в вашей оболочке.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>Размер для запуска</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>Количество строк или столбцов, отображаемых в окне при первой загрузке. Измеряется знаками.</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>Положение запуска</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Начальное положение окна терминала при запуске. При запуске в развернутом полноэкранном режиме или с включенным параметром "По центру при запуске" эта настройка используется для выбора целевого монитора.</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>Все</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>Удалить профиль</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>Имя профиля, отображаемого в раскрывающемся списке.</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>Стиль интерфейса переключателя вкладок</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>Выбирает, какой интерфейс будет использоваться при переключении вкладок с помощью клавиатуры.</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>Автоматически скрывать окно</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>Если этот параметр включен, терминал будет скрыт при переключении на другое окно.</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>Предупреждать при закрытии</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>Определяет, когда появляется диалоговое окно подтверждения перед закрытием вкладок или окон. "Всегда" — диалог отображается при закрытии любой панели.</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>Предупреждать при вставке новых строк</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>Если ваша оболочка не поддерживает режим "вставки в квадратных скобках", рекомендуется присвоить этому параметру значение "Всегда" по соображениям безопасности.</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2274,7 +2262,7 @@
     <value>Звон колокольчика</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>Указывает, какой звук воспроизводится, когда приложение генерирует символ BEL (колокольчик). В "Стиле уведомлений колокольчика" должен быть включен параметр "Слышно".</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2325,19 +2313,19 @@
     <value>Цвет курсора</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>Переопределяет цвет переднего плана из цветовой схемы.</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>Переопределяет цвет курсора из цветовой схемы.</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>Переопределяет цвет фона из цветовой схемы.</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>Переопределяет цвет фона выделения из цветовой схемы.</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2421,11 +2409,11 @@
     <value>Оставшиеся профили</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>Добавить группу профилей, соответствующих хотя бы одному из определенных свойств регулярного выражения</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>Может быть только одна запись "оставшиеся профили"</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2505,7 +2493,7 @@
     <value>Разрешить встраивание</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>Если этот параметр включен, если папка содержит только одну запись, запись будет отображаться напрямую, а папка не будет отображаться.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2513,7 +2501,7 @@
     <value>Разрешить пустое</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>Если этот параметр включен, папка не содержит записей, она будет отображаться. В противном случае папка не будет отображаться.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2577,11 +2565,11 @@
     <value>Ответ на ENQ (Request Terminal Status)</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>Ответ, который отправляется при получении последовательности управления ENQ.</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>Это полезно для устранения неполадок и разработки терминала.</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2593,7 +2581,7 @@
     <value>Экспериментальная функция: добавление привязок к ключам для изменения цвета выбранного текста</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>Эти привязки ключей могут выделять указанным цветом выбранный текст или все вхождения выбранного текста.</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2609,7 +2597,7 @@
     <value>Показывать вкладки в полноэкранном режиме</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>Если этот параметр включен, панель вкладок будет отображаться, когда приложение будет полноэкранным.</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2621,7 +2609,7 @@
     <value>Преобразование пути</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>Управляет преобразованием путей к файлам и каталогам во время операций перетаскивания.</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2648,13 +2636,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>Профиль больше не обнаруживается</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>Похоже, этот автоматически обнаруженный профиль удален. Внесенные вами изменения сохранены, но их нельзя использовать до переустановки.</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>Первоисточник</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>Указывает программное обеспечение, которое изначально создало этот профиль.</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2729,7 +2717,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>Очистить кэш</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>В кэше хранятся данные, связанные с сохраненными сеансами и автоматически созданными профилями.</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2772,7 +2760,7 @@
     <value>Перетащите разделитель</value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>Этот текст будет вставлен между путями нескольких файлов, перетащенных в терминал.</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/sr-Cyrl-RS/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/sr-Cyrl-RS/Resources.resw
index 018ecfb2d36..3d1bdf21898 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/sr-Cyrl-RS/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/sr-Cyrl-RS/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>Ова шема боја је део уграђених подешавања или инсталираног проширења</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>Ако желите да измените ову шему боја, прво морате да направите њену копију.</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>Постави шему боја као подразумевану</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>Ова шема боја се, као подразумевана, примењује на све ваше профиле. Појединачни профили још увек могу да бирају сопствене шеме боја.</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>Језик (потребно је поновно покретање)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>Избор језика приказа апликације. Ово ће да преиначи ваш подразумевани језик Windows интерфејса.</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>Подразумевани режим IME уноса</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>Обавештава IME који језик да користи подразумевано. За језике који се ослањају на IME и подразумевано не користе латиничне карактере, ово подешавање може да се употреби тако да се приликом покретања форсира унос на енглеском језику.</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>Увек прикажи картице</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>Када је искључено, линија са картицама ће се појавити када се креира нова картица. Не може да се искључи када је укључено „Сакриј насловну линију”.</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>Позиција новокреираних картица</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>Наводи место на линији картица на којем се појављују картице које се креирају.</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>Подразумевани URL који се користи за „Претражи веб” акцију.</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>Чувар места „%s” ће се заменити са упитом претраге.</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>Подразумевани профил</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>Профил који се отвара када се кликне икона ’+’ или куцањем пречице за нову картицу.</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>Подразумевана терминалска апликација</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>Терминалска апликација која се покреће када се апликација из командне линије покрене без постојеће сесије, као, на пример, из Старт менија или из дијалога Покрени.</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>Графички API</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Direct3D 11 нуди боље перформансе и богатије искуство, док је Direct2D стабилнији. Подразумевана опција „Аутоматски” ће изабрати API који најбоље одговара вашем графичком хардверу. Ако искусите озбиљне проблеме, размотрите могућност да користите Direct2D.</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>Искључи делимичну Swap Chain инвалидацију</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>Подразумевано, исцртавач текста користи FLIP_SEQUENTIAL Swap Chain и декларише прљаве правоугаонике користећи Present1 API. Када се ово подешавање укључи, уместо њега се користи FLIP_DISCARD Swap Chain и не декларишу се прљави правоугаоници. Да ли је боље једно или друго, зависи од вашег хардвера и бројних других фактора.</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>Користи софтверско исцртавање (WARP)</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>Када је укључено, терминал ће да користи софтверски исцртавач (WARP). Ово подешавање би требало да остане искључено у скоро свим случајевима.</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>Режим мерења текста</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>Ово мења начин на који се долазећи текст групише у ћелије. Опција „Скупине графема” је најмодернији, Unicode-исправни начин да се то ради, док је „wcswidth” уобичајен приступ на UNIX систему, а „Windows Console” реплицира начин на који је радило на Windows. Измена овог подешавања захтева поновно покретање програма Windows Терминал и примењује се само на апликације које су покренуте унутар њега.</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -371,11 +371,11 @@
   <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
     <value>Windows Console</value>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>Колоне</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>Редови</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -423,7 +423,7 @@
     <value>Када се Терминал покрене</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>Шта би требало да се прикаже када се креира први терминал.</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -446,18 +446,14 @@
     <value>Параметри покретања</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>Подешавања која контролишу како се покреће терминал</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>Режим при покретању</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Како ће се терминал приказати приликом покретања. Фокус ће сакрити линију картица и насловну линију.</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>Подразумевани</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -474,7 +470,7 @@
     <value>Понашање нове инстанце</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>Контролише како се нове инстанце терминала каче на постојеће прозоре.</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -494,7 +490,7 @@
     <value>Сакриј насловну линију (потребно је поновно покретање)</value>
     <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>Када је искључено, линија наслова ће се појавити изнад картица.</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -506,7 +502,7 @@
     <value>Користи наслов активног терминала као наслов апликације</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>Када је искључено, линија наслова ће да буде ’Терминал’.</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -514,7 +510,7 @@
     <value>Ограничи промену величине прозора на мрежу карактера</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>Када је искључено, промена величине прозора ће бити глатка.</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -522,22 +518,18 @@
     <value>Покрени приликом стартовања машине</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Терминал се аутоматски покреће када се пријавите на Windows.</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>Центрирано</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>Прозор се центрира приликом покретања</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Када је укључено, прозор ће се приликом покретања поставити у центар екрана.</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>Увек на врху</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -562,15 +554,15 @@
     <value>Укључи функције за отклањање грешака</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>Терминал ће увек бити изнад свих осталих прозора на радној површини.</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>Одређени унос тастатуром у неким апликацијама ће можда престати да ради исправно када се укључи ово подешавање.</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>Ово омогућава да акције као што су Global Summon и Quake Режим раде чак и када нема отворених прозора.</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -578,7 +570,7 @@
     <value>Режим ширине картица</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>Компактни ће да скупи неактивне картице на величину иконе.</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -626,7 +618,7 @@
     <value>Граничници речи</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>Ови симболи ће се користити када извршите двоструки клик на текст у терминалу или активирате „Режим избора”.</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -682,7 +674,7 @@
     <value>Непрозирност позадине</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>Поставља непрозирност прозора.</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -698,7 +690,7 @@
     <value>AltGr алијас</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>Windows подразумевано третира Ctrl+Alt као алијас за AltGr. Ово подешавање ће да преиначи подразумевано Windows понашање.</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -710,7 +702,7 @@
     <value>Умекшавање текста</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>Контролише начин на који исцртавач умекшава назубљеност ивица текста.</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -742,7 +734,7 @@
     <value>Путања до слике позадине</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>Локација фајла слике која се користи као позадина прозора.</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -754,7 +746,7 @@
     <value>Поравнање слике позадине</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>Подешава како се слика позадине поравнава са границама прозора.</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -823,7 +815,7 @@
     <value>Непрозирност слике позадине</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>Поставља непрозирност слике позадине.</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -835,7 +827,7 @@
     <value>Режим истезања слике позадине</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>Подешава како се мења величина слике позадине тако да испуни прозор.</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -883,7 +875,7 @@
     <value>Шема боја</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>Развијте да преиначите боје предњег плана, позадине и избора.</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -899,7 +891,7 @@
     <value>Командна линија</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>Извршни фајл који се користи у профилу.</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -911,7 +903,7 @@
     <value>Висина курсора</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>Поставља проценат висине курсора почевши од дна. Функционише само са старинским обликом курсора.</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -971,7 +963,7 @@
     <value>Фонт текста</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>Можете да наведете више фонтова тако што их раздвојите ASCII запетом.</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -982,7 +974,7 @@
     <value>Величина фонта</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>Величина фонта у типографским тачкама.</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1002,11 +994,11 @@
     <value>Ширина ћелије</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>Преиначује висину линије терминала. Изражава се као умножак величине фонта. Подразумевана вредност зависи од фонта који користите, и обично је око 1.2.</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>Преиначује ширину ћелије терминала. Изражава се као умножак величине фонта. Подразумевана вредност зависи од фонта који користите, и обично је око 0.6.</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1022,7 +1014,7 @@
     <value>Уграђени глифови</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>Када је укључено, терминал користи произвољне глифове за блок елемент карактере и карактере који се користе за исцртавање оквира, уместо оних из фонта.</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1030,7 +1022,7 @@
     <value>Емођи у пуној боји</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>Када је укључено, Емођији се приказују у пуној боји.</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1046,7 +1038,7 @@
     <value>Тежина фонта</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>Поставља тежину (дебљину потеза) за дати фонт.</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1078,7 +1070,7 @@
     <value>Сакриј профил из падајуће листе</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>Ако је укључено, овај профил се неће појављивати у листи профила. Ово може да се употреби за сакривање подразумеваних профила и динамички генерисаних профила, мада се још увек чувају у фајлу подешавања.</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1086,7 +1078,7 @@
     <value>Покрећи овај профил као администратор</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>Ако је укључено, профил ће се аутоматски отварати у Админ терминалском прозору. Ако се текући прозор већ извршава као админ, отвориће се у том прозору.</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1098,7 +1090,7 @@
     <value>Величина историје</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>Број линија изнад оних приказаних у прозору, на које можете да се скролујете.</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1118,7 +1110,7 @@
     <value>Икона</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>Емођи или локација фајла слике иконе која се користи у профилу.</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1130,7 +1122,7 @@
     <value>Испуна</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>Поставља испуну око текста унутар прозора.</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1138,7 +1130,7 @@
     <value>Ретро терминал ефекти</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>Приказује ефекте терминала у ретро стилу, као што су текст који сија и линије скенирања.</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1146,7 +1138,7 @@
     <value>Аутоматски подеси светлину текста који се не разазнаје</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>Аутоматски посветљава или затамњује текст тако да постане видљивији. Чак и када је укључено, ово подешавање ће се примењивати само када комбинација боја позадине и предњег плана даје лош контраст.</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1186,7 +1178,7 @@
     <value>Почетни директоријум</value>
     <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>Директоријум у којем профил почиње онда када се учита.</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1206,7 +1198,7 @@
     <value>Не приказуј измене наслова</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>Захтеви апликације за промену наслова (OSC 2) се игноришу.</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1218,7 +1210,7 @@
     <value>Наслов картице</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>Замењује име профила као наслов који се прослеђује љуски приликом покретања.</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1238,7 +1230,7 @@
     <value>Укључи акрилни материјал</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>Примењује провидну текстуру на позадину прозора.</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1302,7 +1294,7 @@
     <value>Стил обавештења звонцем</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>Контролише шта се дешава када апликација емитује BEL карактер.</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1310,7 +1302,7 @@
     <value>Покрени ову апликацију са новим блоком окружења</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>Када је укључено, Терминал ће да генерише нови блок окружења када креира нове картице или панеле са овим профилом. Када је искључено, картица/панел ће уместо тога да наследи променљиве са којима је покренут Терминал.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1318,7 +1310,7 @@
     <value>Прикажи мени када се изврши десни клик</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>Када је укључено, Терминал ће приказати мени када се изврши десни клик. Када је искључено, десни клик ће да копира изабрани текст (или да налепи ако нема изабраног текста).</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1326,7 +1318,7 @@
     <value>Прикажи маркере на скрол линији</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>Када је укључено, Терминал ће током претраге текста да прикаже маркере на скрол линији, или када је укључена интеграција са љуском.</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1334,7 +1326,7 @@
     <value>Аутоматски означи одзиве приликом притиска на Ентер</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>Када је укључено, Терминал аутоматски додаје маркер који означава позицију краја команде када притиснете Ентер.</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1342,7 +1334,7 @@
     <value>Експериментално: мењај позицију курсора кликовима мишем</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>Када је укључено, клик унутар одзива ће да помери курсор на ту позицију. Да би ово функционисало како се очекује, потребно је да у вашој љусци буде укључена интеграција љуске.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1510,18 +1502,14 @@
     <value>Величина при покретању</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>Број редова и колона који се приказује у прозору приликом првог учитавања. Мерено у карактерима.</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>Позиција при покретању</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Почетна позиција прозора терминала приликом покретања. Када се покреће као увећано, у пуном екрану, или са укљученим „Центрирано”, ово се користи за циљање монитора од интереса.</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>Све</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1554,7 +1542,7 @@
     <value>Обриши профил</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>Име профила које се појављује у падајућој листи.</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1638,7 +1626,7 @@
     <value>Стил интерфејса пребацивача картица</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>Бира интерфејс који ће се користити када тастатуром пребацујете картице.</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2154,7 +2142,7 @@
     <value>Аутоматски сакриј прозор</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>Ако је укључено, терминал ће се сакрити чим се пребаците на други прозор.</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2179,7 +2167,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>Упозори када се покуша налепљивање карактера „прелом реда”</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>Ако ваша љуска не подржава режим „ограђеног налепљивања”, препоручујемо да из разлога безбедности поставите ово на „Увек”.</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2227,7 +2215,7 @@
     <value>Звук звонца</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>Контролише који звук се пушта када апликација емитује BEL карактер. „Стил обавештења звонцем” мора да укључи „Звучно”.</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2278,19 +2266,19 @@
     <value>Боја курсора</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>Преиначује боју предњег плана из шеме боја.</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>Преиначује боју курсора из шеме боја.</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>Преиначује боју позадине из шеме боја.</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>Преиначује боју позадине избора из шеме боја.</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2374,11 +2362,11 @@
     <value>Преостали профили</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>Додаје групу профила који задовољавају барем једну од особина дефинисаних регуларним изразом</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>Може да постоји само једна ставка „преостали профили”</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2458,7 +2446,7 @@
     <value>Дозволи приказ у линији</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>Када се укључи, у случају да фолдер има само једну ставку, она ће се приказати директно и неће се исцртавати фолдер</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2466,7 +2454,7 @@
     <value>Дозволи празне</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>Када је укључено, фолдер ће се приказати и када нема ставки. У супротном, фолдер се неће исцртавати.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2530,11 +2518,11 @@
     <value>ENQ (Request Terminal Status) одговор</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>Одговор који се шаље приликом пријема ENQ контролног низа.</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>Корисно је када се отклањају грешке или програмира Терминал.</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2546,7 +2534,7 @@
     <value>Експериментално: Додај тастерске пречице за бојење изабраног текста</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>Ове пречице могу да истакну изабрани текст или сва појављивања изабраног текста задатом бојом.</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2562,7 +2550,7 @@
     <value>Прикажи картице у приказу пуног екрана</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>Када је укључено, линија са картицама ће се видети када је апликација у режиму пуног екрана.</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2574,7 +2562,7 @@
     <value>Превод путање</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>Контролише како се приликом операција превлачења-и-отпуштања преводе путање директоријума и фајлова.</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2601,13 +2589,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>Профил се више не детектује</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>Изгледа да је овај аутоматски детектовани профил уклоњен. Измене које сте начинили над њим су сачуване, али се он не може користити све док се поново не инсталира.</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>Оригинални извор</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>Означава софтвер који је оригинално креирао овај профил.</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2682,7 +2670,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>Очисти кеш</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>Кеш чува податке у вези са сачуваним сесијама и аутоматски генерисаним профилима.</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/uk-UA/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/uk-UA/Resources.resw
index 5aead1f5efb..2d2b16c847a 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/uk-UA/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/uk-UA/Resources.resw
@@ -138,7 +138,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>Ця колірна схема є частиною вбудованих налаштувань або встановленого розширення</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>Щоб внести зміни в цю колірну схему, необхідно зробити її копію.</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -149,7 +149,7 @@
     <value>Встановити колірну схему як типову</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>Застосовати цю колірну схему до всіх ваших типових профілів. Окремі профілі можуть вибирати власні колірні схеми.</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -241,7 +241,7 @@
     <value>Мова (потрібно перезапустити)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>Вибір мови відображення для програми. Це замінить вибрану мову інтерфейсу Windows.</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -253,7 +253,7 @@
     <value>Стандартний режим введення IME</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>Повідомляє IME, яку мову використовувати як типову. Для мов, які покладаються на IME і не використовують латинські символи в своїй основі, цей параметр можна використовувати для примусового введення англійською під час запуску.</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -266,7 +266,7 @@
     <value>Завжди показувати вкладки</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>Якщо вимкнено, панель вкладок з'являтиметься під час створення нової вкладки. Неможливо вимкнути, якщо параметр "Приховати заголовок вікна" увімкнено.</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -274,7 +274,7 @@
     <value>Розташування новостворених вкладок</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>Визначає позицію нових вкладок в рядку вкладок.</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -298,7 +298,7 @@
     <value>Типова URL-адреса для дії "Пошук в Інтернеті"</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>Значення "%s" буде замінено на пошуковий запит.</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -318,7 +318,7 @@
     <value>Основний профіль</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>Профіль, який відкривається після кліку по "+" або натисканням сполучення клавіш нової вкладки.</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -326,7 +326,7 @@
     <value>Типова програма терміналу</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>Програма терміналу, яка запускається, коли програма командного рядка запускається без наявного сеансу, наприклад із меню "Пуск" або діалогового вікна "Виконати".</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -334,7 +334,7 @@
     <value>Графічний API</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Direct3D 11 забезпечує більш продуктивний і багатофункціональний досвід, тоді як Direct2D більш стабільний. Типовий параметр "Автоматично" вибере API, який найкраще підходить для вашого графічного обладнання. Якщо у вас виникли серйозні проблеми, спробуйте Direct2D.</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -351,7 +351,7 @@
     <value>Вимкнути часткову інвалідацію ланцюжка обміну</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>Типовий засіб візуалізації тексту використовує ланцюжок обміну FLIP_SEQUENTIAL і оголошує "брудні" прямокутники через API Present1. Якщо цей параметр увімкнено, замість нього використовуватиметься ланцюжок обміну FLIP_DISCARD, і "брудні" прямокутники не оголошуватимуться. Те чи інше краще, залежить від вашого апаратного забезпечення та інших факторів.</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -359,7 +359,7 @@
     <value>Використовувати програмний рендеринг (WARP)</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>Якщо ввімкнено, термінал використовуватиме програмний растеризатор (WARP). Цей параметр слід залишати вимкненим майже за будь-яких обставин.</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -367,7 +367,7 @@
     <value>Режим вимірювання тексту</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>Це змінює спосіб групування вхідного тексту в клітинки. Параметр "Кластери графем" є найсучаснішим і правильним для Unicode способом зробити це, тоді як "wcswidth" є поширеним підходом у UNIX, а "Консоль Windows" повторює спосіб, яким він працював у Windows. Зміна цього параметра потребує перезапуску терміналу Windows, і це стосується лише програм, запущених із нього.</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -381,11 +381,11 @@
   <data name="Globals_TextMeasurement_Console.Text" xml:space="preserve">
     <value>Консоль Windows</value>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>Стовпці</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>Рядки</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -441,7 +441,7 @@
     <value>Коли термінал запускається</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>Що має бути показано при створенні першого терміналу.</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -464,7 +464,7 @@
     <value>Режим запуску</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchMode.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchMode.Description" xml:space="preserve">
     <value>Як виглядатиме термінал після запуску. Фокус приховає вкладки та рядок заголовка.</value>
     <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
   </data>
@@ -472,18 +472,14 @@
     <value>Параметри запуску</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>Параметри, які керують запуском терміналу</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>Режим запуску</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Як виглядатиме термінал після запуску. Фокус приховає вкладки та рядок заголовка.</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>Типово</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -500,7 +496,7 @@
     <value>Поведінка нового екземпляру</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>Керує тим, як нові екземпляри терміналу приєднуються до існуючих вікон.</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -520,7 +516,7 @@
     <value>Приховати рядок заголовка (потрібно перезапустити)</value>
     <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>Якщо вимкнено, рядок заголовка з'являтиметься над вкладками.</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -532,7 +528,7 @@
     <value>Використовувати назву активного терміналу як назву програми</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>Якщо вимкнено, рядок заголовка матиме вигляд "Термінал".</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -540,7 +536,7 @@
     <value>Зміна розміру вікна прив'язана до сітки символів</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>Якщо вимкнено, розмір вікна змінюватиметься плавно.</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -548,22 +544,18 @@
     <value>Запуск під час старту ПК</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>Автоматично запускати термінал під час входу в Windows.</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>По центру</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>Центрувати при запуску</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Якщо ввімкнено, під час запуску вікно буде розміщено в центрі екрану.</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>Завжди поверх інших вікон</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -588,15 +580,15 @@
     <value>Увімкнути функції налагодження</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>Термінал завжди буде поверх інших вікон на робочому столі.</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>Певний ввід з клавіатури в деяких програмах може не працювати належним чином, якщо цей параметр увімкнено.</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>Це дозволяє таким діям, як Global Summon і Quake Mode, працювати, навіть якщо вікна не відкриті.</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -604,7 +596,7 @@
     <value>Режим ширини вкладки</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>Компактний зменшить неактивні вкладки до розміру піктограми.</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -652,7 +644,7 @@
     <value>Роздільники слів</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>Ці символи використовуватимуться, коли ви двічі клацаєте текст у терміналі або активуєте "Режим позначення".</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -704,7 +696,7 @@
     <value>Прозорість фону</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>Встановлює прозорість вікна.</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -720,7 +712,7 @@
     <value>Псевдонім AltGr</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>Загалом Windows розглядає Ctrl+Alt як псевдонім для AltGr. Цей параметр замінить типову поведінку Windows.</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -732,7 +724,7 @@
     <value>Згладжування тексту</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>Контролює спосіб згладжування тексту в візуалізації.</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -764,7 +756,7 @@
     <value>Шлях фонового зображення</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>Розташування файлу зображення, яке використовується для фону вікна.</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -776,7 +768,7 @@
     <value>Вирівнювання фонового зображення</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>Встановлює, як фонове зображення вирівнюється в межах вікна.</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>Прозорість фонового зображення</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>Встановлює прозорість фонового зображення.</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>Режим розтягування фонового зображення</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>Встановлює спосіб зміни розміру фонового зображення для заповнення вікна.</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>Колірна схема</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>Розгорнути, щоб замінити передній план, фон і фон виділення.</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>Командний рядок</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>Виконуваний файл, який використовувати в профілі.</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>Висота курсору</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>Встановлює висоту курсору у відсотках, починаючи знизу. Працює лише із формою курсору "вінтаж".</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>Шрифт</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>Ви можете використовувати кілька шрифтів, розділяючи їх ASCII-комою.</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>Розмір шрифту</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>Розмір шрифту в пунктах.</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>Ширина комірки</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>Перевизначити висоту рядка терміналу. Вимірюється як кратне розміру шрифту. Типове значення залежить від вашого шрифту і зазвичай становить близько 1.2.</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>Перевизначити ширину комірки терміналу. Вимірюється як кратне розміру шрифту. Типове значення залежить від вашого шрифту та зазвичай становить близько 0.6.</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>Вбудовані гліфи</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>Якщо ввімкнено, термінал малює спеціальні гліфи для блокових елементів і символів малювання рамок замість використання шрифту.</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>Повнокольоровий Emoji</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>Якщо ввімкнено, Emoji відображаються в повному кольорі.</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>Товщина шрифту</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>Встановлює товщину (тонкі або товсті штрихи) для даного шрифту.</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1101,7 +1093,7 @@
     <value>Приховати профіль із спадного меню</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>Якщо ввімкнено, профіль не відображатиметься у списку профілів. Це можна використовувати, щоб приховати типові і динамічно створені профілі, залишивши їх у файлі налаштувань.</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1109,7 +1101,7 @@
     <value>Запускати цей профіль як Адміністратор</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>Якщо ввімкнено, профіль автоматично відкриватиметься у вікні терміналу Адміністратора. Якщо поточне вікно вже запущено від імені Адміністратора, воно відкриється в цьому вікні.</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1121,7 +1113,7 @@
     <value>Розмір історії</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>Кількість рядків над тими, що відображаються у вікні, до яких можна повернутися.</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1141,7 +1133,7 @@
     <value>Значок</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>Розташування емодзі або файлу зображення, що використовуватиметься у профілі.</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>Відступ</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>Встановлює відступ навколо тексту у вікні.</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>Ретро ефекти терміналу</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>Показувати ефекти для терміналу в ретро-стилі такі як, наприклад, підсвічений текст і черезрядкове сканування.</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1173,7 +1165,7 @@
     <value>Автоматично регулювати яскравість нерозбірливого тексту</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>Автоматично освітлює або затемнює текст, щоб зробити його більш помітним. Навіть якщо ввімкнено, це налаштування буде застосовано лише тоді, коли комбінація кольорів переднього плану та фону призведе до поганого контрасту.</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1213,7 +1205,7 @@
     <value>Каталог при запуску</value>
     <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>Початковий каталог при відкритті профілю.</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1241,7 +1233,7 @@
     <value>Заблокувати зміни назви</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>Ігнорувати запити програми на зміну назви (OSC 2).</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1253,7 +1245,7 @@
     <value>Назва вкладки</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>Замінює назву профілю як заголовок, який передається в оболонку під час запуску.</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1273,7 +1265,7 @@
     <value>Включити акриловий матеріал</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>Застосовує напівпрозору текстуру до фону вікна.</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>Стиль сповіщень дзвоника</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>Керує тим, що відбувається, коли програма видає символ BEL.</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>Запустити цю програму з новим блоком середовища</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>Якщо ввімкнено, термінал генеруватиме новий блок середовища під час створення нових вкладок або панелей із цим профілем. Якщо вимкнено, вкладка/панель натомість успадковуватиме змінні, з якими було запущено термінал.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>Відображати меню при натисканні правої кнопки миші</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>Якщо ввімкнено, термінал відображатиме меню під час натискання правої кнопки миші. Якщо вимкнено, клацання правою кнопкою миші скопіює виділений текст (або вставить, якщо його немає).</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>Відображення позначок на смузі прокрутки</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>Якщо ввімкнено, термінал відображатиме позначки на смузі прокрутки під час пошуку тексту або коли ввімкнено інтеграцію оболонки.</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1369,7 +1361,7 @@
     <value>Автоматично позначати підказки після натискання Enter</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>Якщо ввімкнено, термінал автоматично додає позначку, що вказує на позицію кінця команди, коли ви натискаєте клавішу Enter.</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1377,7 +1369,7 @@
     <value>Експериментально: Зміна положення курсора клацанням миші</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>Якщо ввімкнено, клацання всередині вводу перемістить курсор у цю позицію. Це вимагає, щоб інтеграція оболонки була ввімкнена у вашій оболонці, щоб працювати належним чином.</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1549,18 +1541,14 @@
     <value>Розмір при запуску</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>Кількість рядків і стовпців, які відображаються у вікні під час першого завантаження. Вимірюється в символах.</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>Стартова позиція</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Початкова позиція вікна терміналу під час запуску. Під час запуску в розгорнутому режимі, на весь екран або з увімкненим параметром "Центрувати під час запуску", використовується для націлювання на монітор, який вас цікавить.</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>Всі</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1604,7 +1592,7 @@
     <value>Видалити профіль</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>Ім'я профілю, що з'являється у спадному списку.</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1696,7 +1684,7 @@
     <value>Стиль інтерфейсу перемикача вкладок</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>Вибирає, який інтерфейс використовуватиметься під час перемикання вкладок за допомогою клавіатури.</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -1904,7 +1892,7 @@
     <value>Автоматично приховувати вікно</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>Якщо ввімкнено, термінал буде приховано, щойно ви перейдете до іншого вікна.</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -1937,7 +1925,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>Попереджати під час вставки нового рядка</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>Якщо ваша оболонка не підтримує режим "вставлення в дужках", радимо встановити для цього значення "Завжди" з міркувань безпеки.</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -1985,7 +1973,7 @@
     <value>Звук дзвоника</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>Контролює, який звук відтворюється, коли програма видає символ BEL. "Стиль сповіщень дзвіночком" повинен містити "Звук".</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2040,19 +2028,19 @@
     <value>Колір курсору</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>Перевизначає колір переднього фону з колірної схеми.</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>Перевизначає колір курсора з колірної схеми.</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>Замінює колір фону з колірної схеми.</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>Замінює колір фону виділеного тексту з колірної схеми.</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2148,11 +2136,11 @@
     <value>Профілі, що залишилися</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>Додайте групу профілів, які відповідають принаймні одній із визначених властивостей регулярного виразу</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>Може бути лише один запис "профілів, що залишилися".</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2224,7 +2212,7 @@
     <value>Дозволити вбудовування</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>Якщо ввімкнено, якщо папка містить лише один запис, запис відображатиметься безпосередньо, а папка не відображатиметься.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2232,7 +2220,7 @@
     <value>Дозволити пусту</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>Якщо ввімкнено, папка, не маючи записів, все одно буде відображатися. Інакше папка не буде показана.</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2296,11 +2284,11 @@
     <value>Відповідь ENQ (Request Terminal Status).</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>Відповідь, що надсилається, коли отримано керуючу послідовність ENQ.</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>Корисно для усунення несправностей або розробки терміналу.</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2312,7 +2300,7 @@
     <value>Експериментально: додати прив'язки клавіш для застосування кольорів для виділеного тексту</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>Ці прив'язки клавіш можуть підсвічувати виділений текст або всі екземпляри виділеного тексту вказаним кольором.</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2328,7 +2316,7 @@
     <value>Показувати вкладки на весь екран</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>Якщо ввімкнено, панель вкладок буде видно, коли програма розгорнута на весь екран.</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2340,7 +2328,7 @@
     <value>Трансформування шляху</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>Контролює спосіб конвертування шляху до файлів і каталогів під час операції перетягування.</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2367,13 +2355,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>Профіль більше не виявлено</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>Схоже, цей автоматично визначений профіль було видалено. Зміни, внесені в нього, зберігаються, але ним не можна користуватися, доки його не буде перевстановлено.</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>Першоджерело</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>Вказує програмне забезпечення, яке початково створило цей профіль.</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2448,7 +2436,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>Очистити кеш</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>У кеші зберігаються дані про збережені сесії та автоматично згенеровані профілі.</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw
index 9b5a5fab209..966dcd5d522 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>此配色方案是内置设置或已安装扩展的一部分</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>若要对此配色方案进行更改，必须复制该配色方案。</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>将配色方案设置为默认</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>默认情况下，将此配色方案应用于所有配置文件。单个配置文件仍然可以选择自己的配色方案。</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>语言(需要重新启动)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>选择应用程序的显示语言。这将覆盖默认的 Windows 界面语言。</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>默认输入法输入模式</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>告知输入法默认使用的语言。对于依赖于输入法且默认不使用拉丁字符的语言，此设置可用于在启动时强制进行英语输入。</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>始终显示选项卡</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>禁用后，创建新选项卡时将显示选项卡栏。当“隐藏标题栏”处于打开状态时，无法禁用。</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>新建选项卡的位置</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>指定新选项卡在选项卡行中的显示位置。</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>用于“搜索 Web”操作的默认 URL</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>占位符 "%s" 将替换为搜索查询。</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>默认配置文件</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>单击 '+' 图标或通过键入新的选项卡键绑定时打开的配置文件。</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>默认终端应用程序</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>当命令行应用程序在没有现有会话(例如从“开始菜单”或“运行”对话框)运行时启动的终端应用程序。</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>图形 API</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Direct3D 11 提供性能更佳且功能更丰富的体验，而 Direct2D 则更稳定。默认选项“自动”将选择最适合你的图形硬件的 API。如果遇到严重问题，请考虑使用 Direct2D。</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>禁用部分交换链失效</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>默认情况下，文本呈现器使用 FLIP_SEQUENTIAL 交换链并通过 Present1 API 声明脏矩形。启用此设置时，将改用 FLIP_DISCARD 交换链，并且不会声明脏矩形。一个或另一个是否更依赖于你的硬件和各种其他因素。</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>使用软件渲染(WARP)</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>启用后，终端将使用软件光栅 (WARP)。几乎在所有情况下都应禁用此设置。</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>文本度量模式</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>这会更改传入文本分组到单元格中的方式。“Grapheme 群集”选项是执行此操作的最新式和 Unicode 正确的方法，而“wcswidth”是 UNIX 上的常见方法，“Windows 控制台”复制了它在 Windows 上的工作方式。更改此设置需要重启Windows 终端且仅适用于从其内部启动的应用程序。</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>模糊字符的宽度</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>设置东亚模糊字符的宽度。"窄"模式(默认)优先考虑兼容性，而"宽"模式优先考虑很多中日韩字体的可读性。在"宽"模式下，某些应用程序可能无法正常工作，并导致光标不规则移动。更改此设置需要重启 Windows 终端，而且仅适用于从终端中启动的应用程序。</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>宽</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>列</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>行</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>在终端启动时</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>创建第一个终端时应显示的内容。</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>启动参数</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>控制终端启动方式的设置</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>启动模式</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>终端在启动时的显示方式。专注将隐藏选项卡和标题栏。</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>默认</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>新建实例行为</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>控制新终端实例如何附加到现有窗口。</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>隐藏标题栏（需要重新启动）</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>禁用后，标题栏将显示在选项卡上方。</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>使用活动的终端标题作为应用程序标题</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>禁用后，标题栏将为“终端”。</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>将窗口大小调整为字符网格对齐</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>禁用后，窗口将平滑调整大小。</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>在计算机启动时启动</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>登录到 Windows 时自动启动终端。</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>居中</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>在启动时居中</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>启用后，启动时窗口将放置在屏幕中心。</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>置于顶层</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>启用调试功能</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>终端将始终是桌面上最顶部的窗口。</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>启用此设置后，某些应用程序中的某些键盘输入可能会停止正常工作。</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>通过此设置，即使没有打开任何窗口，全局召唤等操作和震动模式操作也可以正常工作。</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>选项卡宽度</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>紧凑会将停用的选项卡缩小为图标大小。</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>单词分隔符</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>在终端中双击文本或激活“标记模式”时，将使用这些符号。</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>背景不透明度</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>设置窗口的不透明度。</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>AltGr 别名</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>默认情况下，Windows将Ctrl+Alt视为 AltGr 的别名。此设置将替代Windows的默认行为。</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>文本抗锯齿</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>控制文本在渲染器中消除锯齿的方式。</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>背景图像路径</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>窗口背景中所用图像的文件位置。</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>背景图像对齐</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>设置背景图像与窗口边界的对齐方式。</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>背景图像不透明度</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>设置背景图像的不透明度。</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>背景图像拉伸模式</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>设置如何调整背景图像的大小以填充窗口。</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>配色方案</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>展开以覆盖前景、背景和选择背景。</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>命令行</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>在配置文件中所使用的可执行文件。</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>光标高度</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>设置光标从底部开始的百分比高度。仅适用于复古光标形状。</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>字体</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>通过使用 ASCII 逗号分隔多个字体，可以使用这些字体。</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>字号</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>以磅为单位中字体的大小。</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>单元格宽度</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>重写终端的行高。以字体大小的倍数度量。默认值取决于字体，通常约为 1.2。</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>覆盖终端的单元格宽度。以字号的倍数度量。默认值取决于字体，通常约为 0.6。</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>内置字形</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>启用后，终端会使用自定义字形来绘制块元素和框线绘图字符，而不是使用字体。</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>全色表情符号</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>启用后，表情符号将以全色显示。</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>字体粗细</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>设置指定字体的粗细（笔画的轻重）。</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>从下拉菜单中隐藏</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>如果启用，配置文件将不会显示在配置文件列表中。这可用于隐藏默认配置文件和动态生成的配置文件，同时将它们保留在设置文件中。</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>以管理员身份运行此配置文件</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>如果启用，配置文件将在管理员终端窗口中自动打开。如果当前窗口已以管理员身份运行，它将在此窗口中打开。</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>历史记录大小</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>可向后滚动到的窗口中显示的行数。</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>图标</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>配置文件中所使用图标的表情符号或图像文件位置。</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>边框间距</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>设置窗口中文本周围的边距。</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>复古风格的终端效果</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>显示怀旧式终端效果，例如，光亮文本和扫描线条。</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>自动调整无法区分的文本的亮度</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>自动使文本变亮或变暗，使其更可见。即使启用后，仅当前景和背景颜色的组合导致对比度较差时，才会进行此调整。</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>正在启动目录</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>加载配置文件时启动的目录。</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>禁止更改标题</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>忽略应用程序请求以更改标题 (OSC 2)。</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>选项卡标题</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>将配置文件名称替换为标题，以在启动时传递给 shell。</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>启用亚克力材料</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>将半透明纹理应用于窗口背景。</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>铃声通知样式</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>控制当应用程序发出 BEL 字符时将执行的操作。</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>使用新环境块启动此应用程序</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>启用后，使用此配置文件创建新选项卡或窗格时，终端将生成新的环境块。禁用后，选项卡/窗格将改为继承终端启动时所用的变量。</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>右键单击时显示菜单</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>启用后，终端将在右键单击时显示菜单。禁用后，右键单击将复制所选文本 (，如果没有选择) 则粘贴。</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>在滚动条上显示标记</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>启用后，终端将在搜索文本或启用 shell 集成时在滚动条中显示标记。</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>按 Enter 时自动标记提示</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>启用后，终端在按 Enter 时自动添加一个指示命令结尾位置的标记。</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>实验性: 通过鼠标单击重新定位光标</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>启用后，在提示中单击会将光标移动到该位置。这需要在 shell 中启用 shell 集成才能按预期工作。</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>启动大小</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>首次加载时在窗口中显示的行数和列数。以字符度量。</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>启动位置</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>启动时终端窗口的初始位置。在以最大化、全屏模式启动或启用“启动时居中”时，这用于面向感兴趣的监视器。</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>全部</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>删除配置文件</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>下拉列表中显示的配置文件的名称。</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>选项卡切换界面样式</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>选择使用键盘切换选项卡时将使用的接口。</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>自动隐藏窗口</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>如果启用，则在切换到另一个窗口后，终端将立即隐藏。</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>关闭时发出警告</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>控制在关闭选项卡或窗口之前何时显示确认对话框。“始终”在关闭任何窗格时显示对话框。</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>粘贴新行时发出警告</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>如果 shell 不支持“括号粘贴”模式，出于安全原因，建议将其设置为“始终”。</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2274,7 +2262,7 @@
     <value>铃声</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>控制当应用程序发出 BEL 字符时播放的声音。“铃声通知样式”必须包含“可听”。</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2325,19 +2313,19 @@
     <value>光标颜色</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>替代配色方案中的前景色。</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>替代配色方案中的光标颜色。</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>替代配色方案中的背景色。</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>替代配色方案中所选内容的背景色。</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2421,11 +2409,11 @@
     <value>剩余配置文件</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>添加至少匹配一个定义正则表达式属性的配置文件组</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>只能有一个“剩余配置文件”条目</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2505,7 +2493,7 @@
     <value>允许内联</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>启用后，如果文件夹只有一个条目，则该条目将直接显示，并且不会呈现任何文件夹。</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2513,7 +2501,7 @@
     <value>允许为空</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>启用后，如果文件夹没有条目，仍将显示该文件夹。否则，将不会呈现该文件夹。</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2577,11 +2565,11 @@
     <value>ENQ (Request Terminal Status)响应</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>收到 ENQ 控制序列时发送的响应。</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>对于故障排除或开发终端非常有用。</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2593,7 +2581,7 @@
     <value>实验性： 将键绑定添加到所选文本的颜色</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>这些键绑定可以突出显示所选文本或具有指定颜色的所选文本的所有实例。</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2609,7 +2597,7 @@
     <value>全屏显示选项卡</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>启用后，当应用处于全屏状态时，选项卡栏将可见。</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2621,7 +2609,7 @@
     <value>路径转换</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>控制在拖放操作期间如何转换文件和目录路径。</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2648,13 +2636,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>不再检测到配置文件</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>此自动检测到的配置文件似乎已被卸载。你对其所做的更改将被保留，但在重新安装之前无法使用。</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>原始源</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>指示最初创建此配置文件的软件。</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2729,7 +2717,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>清除缓存</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>缓存会存储与已保存会话及自动生成的配置文件相关的数据。</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2772,7 +2760,7 @@
     <value>拖放分隔符</value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>此文本将在放置到终端的多个文件的路径之间插入。</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
index ed47981d0ef..f1d8c918aeb 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -132,7 +132,7 @@
   <data name="ColorScheme_InboxSchemeDuplicate.Header" xml:space="preserve">
     <value>此色彩配置是內建設定或已安裝擴充功能的一部分</value>
   </data>
-  <data name="ColorScheme_InboxSchemeDuplicate.HelpText" xml:space="preserve">
+  <data name="ColorScheme_InboxSchemeDuplicate.Description" xml:space="preserve">
     <value>若要變更此色彩配置，您必須製作色彩配置的複本。</value>
   </data>
   <data name="ColorScheme_DuplicateButton.Content" xml:space="preserve">
@@ -143,7 +143,7 @@
     <value>將色彩配置設為預設</value>
     <comment>This is the header for a control that allows the user to set the currently selected color scheme as their default.</comment>
   </data>
-  <data name="ColorScheme_SetAsDefault.HelpText" xml:space="preserve">
+  <data name="ColorScheme_SetAsDefault.Description" xml:space="preserve">
     <value>根據預設，將此色彩配置套用至您的所有設定檔。個別設定檔仍然可以選取各自的色彩配置。</value>
     <comment>A description explaining how this control changes the user's default color scheme.</comment>
   </data>
@@ -235,7 +235,7 @@
     <value>語言 (需要重新啟動)</value>
     <comment>The header for a control allowing users to choose the app's language.</comment>
   </data>
-  <data name="Globals_Language.HelpText" xml:space="preserve">
+  <data name="Globals_Language.Description" xml:space="preserve">
     <value>選取應用程式的顯示語言。這將會覆寫您的預設 Windows 介面語言。</value>
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
@@ -247,7 +247,7 @@
     <value>預設 IME 輸入模式</value>
     <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultInputScope.Description" xml:space="preserve">
     <value>通知 IME 預設使用的語言。對於依賴 IME 且預設不使用拉丁字元的語言，此設定可用來強制啟動英文輸入。</value>
   </data>
   <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
@@ -260,7 +260,7 @@
     <value>永遠顯示索引標籤</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
   </data>
-  <data name="Globals_AlwaysShowTabs.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysShowTabs.Description" xml:space="preserve">
     <value>若停用，建立新索引標籤時，將會顯示索引標籤列。當 [隱藏標題列] 開啟時，無法停用。</value>
     <comment>A description for what the "always show tabs" setting does. Presented near "Globals_AlwaysShowTabs.Header". This setting cannot be disabled while "Globals_ShowTitlebar.Header" is enabled.</comment>
   </data>
@@ -268,7 +268,7 @@
     <value>新建立索引標籤的位置</value>
     <comment>Header for a control to select position of newly created tabs.</comment>
   </data>
-  <data name="Globals_NewTabPosition.HelpText" xml:space="preserve">
+  <data name="Globals_NewTabPosition.Description" xml:space="preserve">
     <value>指定新索引標籤在索引標籤列中出現的位置。</value>
     <comment>A description for what the "Position of newly created tabs" setting does.</comment>
   </data>
@@ -292,7 +292,7 @@
     <value>用於「搜尋 Web」動作的預設 URL</value>
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
+  <data name="Globals_SearchWebDefaultQueryUrl.Description" xml:space="preserve">
     <value>預留位置 "%s" 將以搜尋查詢取代。</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
@@ -308,7 +308,7 @@
     <value>預設設定檔</value>
     <comment>Header for a control to select your default profile from the list of profiles you've created.</comment>
   </data>
-  <data name="Globals_DefaultProfile.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultProfile.Description" xml:space="preserve">
     <value>按一下 '+' 圖示或輸入新索引標籤的按鍵繫結時所開啟的設定檔。</value>
     <comment>A description for what the default profile is and when it's used.</comment>
   </data>
@@ -316,7 +316,7 @@
     <value>預設終端應用程式</value>
     <comment>Header for a drop down that permits the user to select which installed Terminal application will launch when command line tools like CMD are run from the Windows Explorer run box or start menu or anywhere else that they do not already have a graphical window assigned.</comment>
   </data>
-  <data name="Globals_DefaultTerminal.HelpText" xml:space="preserve">
+  <data name="Globals_DefaultTerminal.Description" xml:space="preserve">
     <value>當執行命令列應用程式且不使用現有工作模式而啟動的終端機應用程式 (例如從 [開始] 功能表或 [執行] 對話方塊)。</value>
     <comment>A description to clarify that the dropdown choice for default terminal will tell the operating system which Terminal application (Windows Terminal, the preview build, the legacy inbox window, or a 3rd party one) to use when starting a command line tool like CMD or Powershell that does not already have a window.</comment>
   </data>
@@ -324,7 +324,7 @@
     <value>圖形 API</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
+  <data name="Globals_GraphicsAPI.Description" xml:space="preserve">
     <value>Direct3D 11 提供更具效能且功能更豐富的體驗，而 Direct2D 則較穩定。預設選項 [自動] 會挑選最適合您圖形硬體的 API。如果您遇到重大問題，請考慮使用 Direct2D。</value>
   </data>
   <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
@@ -341,7 +341,7 @@
     <value>停用部分 [交換鏈結] 失效</value>
     <comment>"Swap Chain" is an official technical term by Microsoft. This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_DisablePartialInvalidation.HelpText" xml:space="preserve">
+  <data name="Globals_DisablePartialInvalidation.Description" xml:space="preserve">
     <value>根據預設，文字轉譯器會使用 FLIP_SEQUENTIAL 交換鏈結，並透過 Present1 API 宣告變更的矩形。啟用此設定時，將改為使用 FLIP_DISCARD 交換鏈結，而且不會宣告任何已變更的矩形。一個或另一個比較好取決於您的硬體和各種其他因素。</value>
     <comment>{Locked="Present1","FLIP_DISCARD","FLIP_SEQUENTIAL"}</comment>
   </data>
@@ -349,7 +349,7 @@
     <value>使用軟體呈現 (WARP)</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform". This text is shown next to a toggle.</comment>
   </data>
-  <data name="Globals_SoftwareRendering.HelpText" xml:space="preserve">
+  <data name="Globals_SoftwareRendering.Description" xml:space="preserve">
     <value>啟用時，終端機將使用軟體點陣器 (WARP)。在幾乎所有情況下，此設定都應該保留停用。</value>
     <comment>{Locked="WARP"} WARP is the "Windows Advanced Rasterization Platform".</comment>
   </data>
@@ -357,7 +357,7 @@
     <value>文字測量模式</value>
     <comment>This text is shown next to a list of choices.</comment>
   </data>
-  <data name="Globals_TextMeasurement.HelpText" xml:space="preserve">
+  <data name="Globals_TextMeasurement.Description" xml:space="preserve">
     <value>這會變更內送文字群組到儲存格的方式。[Grapheme 叢集] 選項是最新式且更正確的 Unicode 方法，而 “wcswidth” 是 UNIX 的常見方法，而 [Windows 控制台] 則會復寫它在 Windows 上運作的方式。變更此設定需要重新啟動Windows 終端機，且只適用於從其中啟動的應用程式。</value>
   </data>
   <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
@@ -375,7 +375,7 @@
     <value>模糊字元寬度</value>
     <comment>A label for a drop down selector, referring to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_AmbiguousWidth.HelpText" xml:space="preserve">
+  <data name="Globals_AmbiguousWidth.Description" xml:space="preserve">
     <value>設定東亞模糊字元的寬度。「窄」(預設) 以相容性為優先，而「寬」則以多數中日韓字型的可讀性為優先。在「寬」模式下，部分應用程式可能無法正常運作，導致游標移動異常。變更此設定後，需重新啟動 Windows 終端機，且僅適用於從 Windows 終端機內啟動的應用程式。</value>
   </data>
   <data name="Globals_AmbiguousWidth_Narrow.Text" xml:space="preserve">
@@ -386,11 +386,11 @@
     <value>寬</value>
     <comment>As in "wide width". Refers to the East Asian Ambiguous Width Unicode specification.</comment>
   </data>
-  <data name="Globals_InitialCols.Text" xml:space="preserve">
+  <data name="Globals_InitialCols.Header" xml:space="preserve">
     <value>欄</value>
     <comment>Header for a control to choose the number of columns in the terminal's text grid.</comment>
   </data>
-  <data name="Globals_InitialRows.Text" xml:space="preserve">
+  <data name="Globals_InitialRows.Header" xml:space="preserve">
     <value>列</value>
     <comment>Header for a control to choose the number of rows in the terminal's text grid.</comment>
   </data>
@@ -438,7 +438,7 @@
     <value>終端機啟動時</value>
     <comment>Header for a control to select how the terminal should load its first window.</comment>
   </data>
-  <data name="Globals_FirstWindowPreference.HelpText" xml:space="preserve">
+  <data name="Globals_FirstWindowPreference.Description" xml:space="preserve">
     <value>建立第一個終端機時應顯示的內容。</value>
   </data>
   <data name="Globals_FirstWindowPreferenceDefaultProfile.Content" xml:space="preserve">
@@ -461,18 +461,14 @@
     <value>啟動參數</value>
     <comment>Header for a set of settings that determine how terminal launches. These settings include the launch mode, launch position and whether the terminal should center itself on launch.</comment>
   </data>
-  <data name="Globals_LaunchParameters.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchParameters.Description" xml:space="preserve">
     <value>控制終端機啟動方式的設定</value>
     <comment>A description for what the "launch parameters" expander contains. Presented near "Globals_LaunchParameters.Header".</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.Text" xml:space="preserve">
+  <data name="Globals_LaunchModeSetting.Header" xml:space="preserve">
     <value>啟動模式</value>
     <comment>Header for a control to select what mode to launch the terminal in.</comment>
   </data>
-  <data name="Globals_LaunchModeSetting.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>啟動時終端機的顯示方式。焦點將會隱藏索引標籤和標題列。</value>
-    <comment>'Focus' must match &lt;Globals_LaunchModeFocus.Content&gt;.</comment>
-  </data>
   <data name="Globals_LaunchModeDefault.Content" xml:space="preserve">
     <value>預設</value>
     <comment>An option to choose from for the "launch mode" setting. Default option.</comment>
@@ -489,7 +485,7 @@
     <value>新執行個體行為</value>
     <comment>Header for a control to select how new app instances are handled.</comment>
   </data>
-  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+  <data name="Globals_WindowingBehavior.Description" xml:space="preserve">
     <value>控制新的終端機執行個體附加到現有視窗的方式。</value>
     <comment>A description for what the "windowing behavior" setting does. Presented near "Globals_WindowingBehavior.Header".</comment>
   </data>
@@ -509,7 +505,7 @@
     <value>隱藏標題列 (需要重新啟動)</value>
     <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
   </data>
-  <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitlebar.Description" xml:space="preserve">
     <value>停用時，標題列會出現在索引標籤上方。</value>
     <comment>A description for what the "show titlebar" setting does. Presented near "Globals_ShowTitlebar.Header".</comment>
   </data>
@@ -521,7 +517,7 @@
     <value>使用作用中的終端機標題做為應用程式標題</value>
     <comment>Header for a control to toggle whether the terminal's title is shown as the application title, or not.</comment>
   </data>
-  <data name="Globals_ShowTitleInTitlebar.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTitleInTitlebar.Description" xml:space="preserve">
     <value>停用時，標題列會是 [Windows 終端機]。</value>
     <comment>A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"}</comment>
   </data>
@@ -529,7 +525,7 @@
     <value>將視窗大小調整為字元格線</value>
     <comment>Header for a control to toggle whether the terminal snaps the window to the character grid when resizing, or not.</comment>
   </data>
-  <data name="Globals_SnapToGridOnResize.HelpText" xml:space="preserve">
+  <data name="Globals_SnapToGridOnResize.Description" xml:space="preserve">
     <value>停用時，視窗將會順暢地調整大小。</value>
     <comment>A description for what the "snap to grid on resize" setting does. Presented near "Globals_SnapToGridOnResize.Header".</comment>
   </data>
@@ -537,22 +533,18 @@
     <value>在電腦啟動時啟動</value>
     <comment>Header for a control to toggle whether the app should launch when the user's machine starts up, or not.</comment>
   </data>
-  <data name="Globals_StartOnUserLogin.HelpText" xml:space="preserve">
+  <data name="Globals_StartOnUserLogin.Description" xml:space="preserve">
     <value>當您登入Windows時，會自動啟動終端機。</value>
     <comment>A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". {Locked="Windows"}</comment>
   </data>
   <data name="Globals_CenterOnLaunchCentered" xml:space="preserve">
     <value>置中對齊</value>
-    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Text".</comment>
+    <comment>Shorthand, explanatory text displayed when the user has enabled the feature indicated by "Globals_CenterOnLaunch.Header".</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.Text" xml:space="preserve">
+  <data name="Globals_CenterOnLaunch.Header" xml:space="preserve">
     <value>啟動時置中</value>
     <comment>Header for a control to toggle whether the app should launch in the center of the screen, or not.</comment>
   </data>
-  <data name="Globals_CenterOnLaunch.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>啟用後，啟動時視窗將位於螢幕中央。</value>
-    <comment>A description for what the "center on launch" setting does. Presented near "Globals_CenterOnLaunch.Header".</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.Header" xml:space="preserve">
     <value>最上層顯示</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
@@ -581,15 +573,15 @@
     <value>啟用偵錯功能</value>
     <comment>Header for a control to toggle debug features.</comment>
   </data>
-  <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
+  <data name="Globals_AlwaysOnTop.Description" xml:space="preserve">
     <value>終端機永遠是桌面最上方的視窗。</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
+  <data name="Profile_ForceVTInput.Description" xml:space="preserve">
     <value>啟用此設定時，某些應用程式中的某些鍵盤輸入可能會停止正常運作。</value>
     <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
   </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
+  <data name="Globals_AllowHeadless.Description" xml:space="preserve">
     <value>這可允許全域傳送與「受擷取模式」等動作運作，即使沒有開啟視窗也可運作。</value>
     <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
   </data>
@@ -597,7 +589,7 @@
     <value>索引標籤寬度模式</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
   </data>
-  <data name="Globals_TabWidthMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabWidthMode.Description" xml:space="preserve">
     <value>精簡會將非使用中索引標籤縮小成圖示的大小。</value>
     <comment>A description for what the "tab width mode" setting does. Presented near "Globals_TabWidthMode.Header". 'Compact' must match the value for &lt;Globals_TabWidthModeCompact.Content&gt;.</comment>
   </data>
@@ -645,7 +637,7 @@
     <value>文字分隔符號</value>
     <comment>Header for a control to determine what delimiters to use to identify separate words during word selection.</comment>
   </data>
-  <data name="Globals_WordDelimiters.HelpText" xml:space="preserve">
+  <data name="Globals_WordDelimiters.Description" xml:space="preserve">
     <value>當您按兩下終端機中的文字或啟用「標記模式」時，將會使用到這些符號。</value>
     <comment>A description for what the "word delimiters" setting does. Presented near "Globals_WordDelimiters.Header". "Mark" is used in the sense of "choosing something to interact with."</comment>
   </data>
@@ -701,7 +693,7 @@
     <value>背景不透明度</value>
     <comment>Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
   </data>
-  <data name="Profile_Opacity.HelpText" xml:space="preserve">
+  <data name="Profile_Opacity.Description" xml:space="preserve">
     <value>設定視窗的不透明度。</value>
     <comment>A description for what the "opacity" setting does. Presented near "Profile_Opacity.Header".</comment>
   </data>
@@ -717,7 +709,7 @@
     <value>AltGr 別名</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
   </data>
-  <data name="Profile_AltGrAliasing.HelpText" xml:space="preserve">
+  <data name="Profile_AltGrAliasing.Description" xml:space="preserve">
     <value>根據預設，Windows會將Ctrl+Alt視為 AltGr 的別名。此設定將會覆寫Windows的預設行為。</value>
     <comment>A description for what the "AltGr aliasing" setting does. Presented near "Profile_AltGrAliasing.Header". {Locked="Windows"}</comment>
   </data>
@@ -729,7 +721,7 @@
     <value>文字消除鋸齒</value>
     <comment>Header for a control to select the graphical anti-aliasing format of text.</comment>
   </data>
-  <data name="Profile_AntialiasingMode.HelpText" xml:space="preserve">
+  <data name="Profile_AntialiasingMode.Description" xml:space="preserve">
     <value>控制轉譯器中文字的鋸齒消除方式。</value>
     <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
   </data>
@@ -761,7 +753,7 @@
     <value>背景影像路徑</value>
     <comment>Header for a control to determine the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImage.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImage.Description" xml:space="preserve">
     <value>視窗背景中所使用之圖像的檔案位置。</value>
     <comment>A description for what the "background image path" setting does. Presented near "Profile_BackgroundImage".</comment>
   </data>
@@ -773,7 +765,7 @@
     <value>背景影像對齊</value>
     <comment>Header for a control to choose the visual alignment of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageAlignment.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageAlignment.Description" xml:space="preserve">
     <value>設定背景影像與視窗邊界對齊的程度。</value>
     <comment>A description for what the "background image alignment" setting does. Presented near "Profile_BackgroundImageAlignment".</comment>
   </data>
@@ -842,7 +834,7 @@
     <value>背景影像不透明度</value>
     <comment>Header for a control to choose the opacity of the image presented on the background of the app.</comment>
   </data>
-  <data name="Profile_BackgroundImageOpacity.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageOpacity.Description" xml:space="preserve">
     <value>設定背景影像的不透明度。</value>
     <comment>A description for what the "background image opacity" setting does. Presented near "Profile_BackgroundImageOpacity".</comment>
   </data>
@@ -854,7 +846,7 @@
     <value>背景影像延伸模式</value>
     <comment>Header for a control to choose the stretch mode of the image presented on the background of the app. Stretch mode is how the image is resized to fill its allocated space.</comment>
   </data>
-  <data name="Profile_BackgroundImageStretchMode.HelpText" xml:space="preserve">
+  <data name="Profile_BackgroundImageStretchMode.Description" xml:space="preserve">
     <value>設定背景圖像調整大小以填滿視窗。</value>
     <comment>A description for what the "background image stretch mode" setting does. Presented near "Profile_BackgroundImageStretchMode".</comment>
   </data>
@@ -902,7 +894,7 @@
     <value>色彩配置</value>
     <comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
   </data>
-  <data name="Profile_ColorScheme.HelpText" xml:space="preserve">
+  <data name="Profile_ColorScheme.Description" xml:space="preserve">
     <value>展開以覆寫前景、背景和選取範圍背景。</value>
     <comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
   </data>
@@ -918,7 +910,7 @@
     <value>命令列</value>
     <comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
   </data>
-  <data name="Profile_Commandline.HelpText" xml:space="preserve">
+  <data name="Profile_Commandline.Description" xml:space="preserve">
     <value>用於設定檔中的可執行檔。</value>
     <comment>A description for what the "command line" setting does. Presented near "Profile_Commandline".</comment>
   </data>
@@ -930,7 +922,7 @@
     <value>游標高度</value>
     <comment>Header for a control to determine the height of the text cursor.</comment>
   </data>
-  <data name="Profile_CursorHeight.HelpText" xml:space="preserve">
+  <data name="Profile_CursorHeight.Description" xml:space="preserve">
     <value>從底部開始設定游標的百分比高度。僅適用于復古游標形狀。</value>
     <comment>A description for what the "cursor height" setting does. Presented near "Profile_CursorHeight".</comment>
   </data>
@@ -990,7 +982,7 @@
     <value>字體</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
-  <data name="Profile_FontFace.HelpText" xml:space="preserve">
+  <data name="Profile_FontFace.Description" xml:space="preserve">
     <value>您可以使用 ASCII 逗號分隔多個字型。</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
@@ -1001,7 +993,7 @@
     <value>字型大小</value>
     <comment>Name for a control to determine the size of the text in the app.</comment>
   </data>
-  <data name="Profile_FontSize.HelpText" xml:space="preserve">
+  <data name="Profile_FontSize.Description" xml:space="preserve">
     <value>字體大小以點為單位。</value>
     <comment>A description for what the "font size" setting does. Presented near "Profile_FontSize".</comment>
   </data>
@@ -1021,11 +1013,11 @@
     <value>儲存格寬度</value>
     <comment>Header for a control that sets the text character width.</comment>
   </data>
-  <data name="Profile_LineHeight.HelpText" xml:space="preserve">
+  <data name="Profile_LineHeight.Description" xml:space="preserve">
     <value>覆寫終端機的行高。以字型大小的倍數表示。預設值取決於您的字型，通常大約是 1.2。</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
+  <data name="Profile_CellWidth.Description" xml:space="preserve">
     <value>覆寫終端機的單元格寬度。以字型大小的倍數表示。預設值取決於您的字型，通常大約是0.6。</value>
     <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
   </data>
@@ -1041,7 +1033,7 @@
     <value>內建自符</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
   </data>
-  <data name="Profile_EnableBuiltinGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableBuiltinGlyphs.Description" xml:space="preserve">
     <value>啟用時，終端機會為區塊元素和方塊繪圖字元繪製自訂字符，而非使用字型。</value>
     <comment>A longer description of the "Profile_EnableBuiltinGlyphs" toggle. "glyphs", "block element" and "box drawing characters" are technical terms from the Unicode specification.</comment>
   </data>
@@ -1049,7 +1041,7 @@
     <value>全彩表情圖示</value>
     <comment>The main label of a toggle. When enabled, certain characters (emoji in this case) are displayed with multiple colors.</comment>
   </data>
-  <data name="Profile_EnableColorGlyphs.HelpText" xml:space="preserve">
+  <data name="Profile_EnableColorGlyphs.Description" xml:space="preserve">
     <value>啟用時，表情圖示會以全彩顯示。</value>
     <comment>A longer description of the "Profile_EnableColorGlyphs" toggle.</comment>
   </data>
@@ -1065,7 +1057,7 @@
     <value>字型粗細</value>
     <comment>Header for a control to select the weight (i.e. bold, thin, etc.) of the text in the app.</comment>
   </data>
-  <data name="Profile_FontWeight.HelpText" xml:space="preserve">
+  <data name="Profile_FontWeight.Description" xml:space="preserve">
     <value>為指定的字型設定權數 (筆觸的亮度或重度)。</value>
     <comment>A description for what the "font weight" setting does. Presented near "Profile_FontWeight".</comment>
   </data>
@@ -1097,7 +1089,7 @@
     <value>在下拉式清單中隱藏設定檔</value>
     <comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
   </data>
-  <data name="Profile_Hidden.HelpText" xml:space="preserve">
+  <data name="Profile_Hidden.Description" xml:space="preserve">
     <value>如果啟用，設定檔將不會顯示在設定檔清單中。這可用來隱藏預設設定檔和動態產生的設定檔，同時將它們留在您的設定檔案中。</value>
     <comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
   </data>
@@ -1105,7 +1097,7 @@
     <value>以系統管理員身分執行此設定檔</value>
     <comment>Header for a control to toggle whether the profile should always open elevated (in an admin window)</comment>
   </data>
-  <data name="Profile_Elevate.HelpText" xml:space="preserve">
+  <data name="Profile_Elevate.Description" xml:space="preserve">
     <value>如果啟用，配置檔將會自動在 管理員 終端機視窗中開啟。如果目前的視窗已以系統管理員身分執行，則會在此視窗中開啟。</value>
     <comment>A description for what the "elevate" setting does. Presented near "Profile_Elevate".</comment>
   </data>
@@ -1117,7 +1109,7 @@
     <value>記錄大小</value>
     <comment>Name for a control to determine how many lines of text can be saved in a session. In terminals, the "history" is the output generated within your session.</comment>
   </data>
-  <data name="Profile_HistorySize.HelpText" xml:space="preserve">
+  <data name="Profile_HistorySize.Description" xml:space="preserve">
     <value>視窗中顯示的行數，您可以在視窗中顯示。</value>
     <comment>A description for what the "history size" setting does. Presented near "Profile_HistorySize".</comment>
   </data>
@@ -1137,7 +1129,7 @@
     <value>圖示</value>
     <comment>Name for a control to determine what icon can be used to represent this profile.</comment>
   </data>
-  <data name="Profile_Icon.HelpText" xml:space="preserve">
+  <data name="Profile_Icon.Description" xml:space="preserve">
     <value>設定檔中所用圖示的表情圖示或影像檔案位置。</value>
     <comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
   </data>
@@ -1149,7 +1141,7 @@
     <value>邊框間距</value>
     <comment>Header for a control to determine the amount of space between text in a terminal and the edge of the window. The space can be any combination of the top, bottom, left, and right side of the window.</comment>
   </data>
-  <data name="Profile_Padding.HelpText" xml:space="preserve">
+  <data name="Profile_Padding.Description" xml:space="preserve">
     <value>設定視窗內文字的邊框間距。</value>
     <comment>A description for what the "padding" setting does. Presented near "Profile_Padding".</comment>
   </data>
@@ -1157,7 +1149,7 @@
     <value>懷舊的終端機效果</value>
     <comment>Header for a control to toggle classic CRT display effects, which gives the terminal a retro look.</comment>
   </data>
-  <data name="Profile_RetroTerminalEffect.HelpText" xml:space="preserve">
+  <data name="Profile_RetroTerminalEffect.Description" xml:space="preserve">
     <value>顯示懷舊風格的終端效果 (例如發光文字和掃描線)。</value>
     <comment>A description for what the "retro terminal effects" setting does. Presented near "Profile_RetroTerminalEffect". "Retro" is a common English prefix that suggests a nostalgic, dated appearance.</comment>
   </data>
@@ -1165,7 +1157,7 @@
     <value>自動調整無法分辨的文字亮度</value>
     <comment>Header for a control to toggle if we should adjust the foreground color's lightness to make it more visible when necessary, based on the background color.</comment>
   </data>
-  <data name="Profile_AdjustIndistinguishableColors.HelpText" xml:space="preserve">
+  <data name="Profile_AdjustIndistinguishableColors.Description" xml:space="preserve">
     <value>自動讓文字變亮或變暗，使其更加清楚可見。即使已啟用，只有在前景和背景色彩的組合會導致不良對比時，才能進行此調整。</value>
     <comment>A description for what the "adjust indistinguishable colors" setting does. Presented near "Profile_AdjustIndistinguishableColors".</comment>
   </data>
@@ -1205,7 +1197,7 @@
     <value>起始目錄</value>
     <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
   </data>
-  <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
+  <data name="Profile_StartingDirectory.Description" xml:space="preserve">
     <value>載入時，設定檔起始的目錄。</value>
     <comment>A description for what the "starting directory" setting does. Presented near "Profile_StartingDirectory".</comment>
   </data>
@@ -1225,7 +1217,7 @@
     <value>禁止標題變更</value>
     <comment>Header for a control to toggle changes in the app title.</comment>
   </data>
-  <data name="Profile_SuppressApplicationTitle.HelpText" xml:space="preserve">
+  <data name="Profile_SuppressApplicationTitle.Description" xml:space="preserve">
     <value>忽略應用程式要求以變更標題 (OSC 2)。</value>
     <comment>A description for what the "suppress application title" setting does. Presented near "Profile_SuppressApplicationTitle". "OSC 2" is a technical term that is understood in the industry. {Locked="OSC 2"}</comment>
   </data>
@@ -1237,7 +1229,7 @@
     <value>索引標籤標題</value>
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_TabTitle.HelpText" xml:space="preserve">
+  <data name="Profile_TabTitle.Description" xml:space="preserve">
     <value>在啟動時將設定檔名稱取代為要傳遞到殼層的標題。</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
@@ -1257,7 +1249,7 @@
     <value>啟用壓克力材料</value>
     <comment>Header for a control to toggle the use of acrylic material for the background. "Acrylic material" is a Microsoft-specific term: https://docs.microsoft.com/en-us/windows/apps/design/style/acrylic</comment>
   </data>
-  <data name="Profile_UseAcrylic.HelpText" xml:space="preserve">
+  <data name="Profile_UseAcrylic.Description" xml:space="preserve">
     <value>在視窗的背景套用半透明的紋理。</value>
     <comment>A description for what the "Profile_UseAcrylic" setting does.</comment>
   </data>
@@ -1321,7 +1313,7 @@
     <value>鈴聲通知樣式</value>
     <comment>Header for a control to select the how the app notifies the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellStyle.HelpText" xml:space="preserve">
+  <data name="Profile_BellStyle.Description" xml:space="preserve">
     <value>控制應用程式發出 BEL 字元時要採取的動作。</value>
     <comment>A description for what the "bell style" setting does. Presented near "Profile_BellStyle".{Locked="BEL"}</comment>
   </data>
@@ -1329,7 +1321,7 @@
     <value>使用新的環境區塊啟動此應用程式</value>
     <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
   </data>
-  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
+  <data name="Profile_ReloadEnvVars.Description" xml:space="preserve">
     <value>啟用時，終端機將在使用此設定檔建立新索引標籤或窗格時產生新的環境區塊。停用時，索引標籤/窗格將改為繼承終端機啟動時的變數。</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
   </data>
@@ -1337,7 +1329,7 @@
     <value>在以滑鼠右鍵按一下時顯示選單</value>
     <comment>This controls how a right-click behaves in the terminal</comment>
   </data>
-  <data name="Profile_RightClickContextMenu.HelpText" xml:space="preserve">
+  <data name="Profile_RightClickContextMenu.Description" xml:space="preserve">
     <value>啟用時，終端機會在單擊滑鼠右鍵時顯示功能表。停用時，若沒有選取專案)，按鼠右鍵將會複製選取的文字 (或貼上。</value>
     <comment>A description for what the "Display a menu on right-click" setting does. Presented near "Profile_RightClickContextMenu".</comment>
   </data>
@@ -1345,7 +1337,7 @@
     <value>在捲軸上顯示標記</value>
     <comment>"Marks" are small visual indicators that can help the user identify the position of useful info in the scrollbar</comment>
   </data>
-  <data name="Profile_ShowMarks.HelpText" xml:space="preserve">
+  <data name="Profile_ShowMarks.Description" xml:space="preserve">
     <value>啟用時，當搜尋文字或啟用殼層整合時，終端機會在滾動條中顯示標記。</value>
     <comment>A description for what the "Display marks on the scrollbar" setting does. Presented near "Profile_ShowMarks".</comment>
   </data>
@@ -1353,7 +1345,7 @@
     <value>按下 Enter 鍵時自動標記提示</value>
     <comment>"Enter" is the enter/return key on the keyboard. This will add a mark indicating the position of a shell prompt when the user presses enter.</comment>
   </data>
-  <data name="Profile_AutoMarkPrompts.HelpText" xml:space="preserve">
+  <data name="Profile_AutoMarkPrompts.Description" xml:space="preserve">
     <value>啟用時，當您按下 Enter 時，終端機會自動新增指示命令結尾位置的標記。</value>
     <comment>A description for what the "Automatically mark prompts on pressing Enter" setting does. Presented near "Profile_AutoMarkPrompts".</comment>
   </data>
@@ -1361,7 +1353,7 @@
     <value>實驗性: 使用滑鼠點擊來調整游標位置</value>
     <comment>This allows the user to move the text cursor just by clicking with the mouse.</comment>
   </data>
-  <data name="Profile_RepositionCursorWithMouse.HelpText" xml:space="preserve">
+  <data name="Profile_RepositionCursorWithMouse.Description" xml:space="preserve">
     <value>啟用時，按一下提示內部就會將游標移到該位置。這需要啟用您殼層中的殼層整合，才能如預期地運作。</value>
     <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_RepositionCursorWithMouse".</comment>
   </data>
@@ -1529,18 +1521,14 @@
     <value>啟動大小</value>
     <comment>Header for a group of settings that control the size of the app. Presented near "Globals_InitialCols" and "Globals_InitialRows".</comment>
   </data>
-  <data name="Globals_LaunchSize.HelpText" xml:space="preserve">
+  <data name="Globals_LaunchSize.Description" xml:space="preserve">
     <value>第一次載入時顯示在視窗中的列和欄數目。以字元數測量。</value>
     <comment>A description for what the "rows" and "columns" settings do. Presented near "Globals_LaunchSize.Header".</comment>
   </data>
-  <data name="Globals_LaunchPosition.Text" xml:space="preserve">
+  <data name="Globals_LaunchPosition.Header" xml:space="preserve">
     <value>啟動位置</value>
     <comment>Header for a group of settings that control the launch position of the app. Presented near "Globals_InitialPosX" and "Globals_InitialPosY".</comment>
   </data>
-  <data name="Globals_LaunchPosition.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>啟動時終端機視窗的初始位置。當以最大化、全螢幕或啟用「啟動時置中」啟動時，這將用於定位感興趣的監視器。</value>
-    <comment>A description for what the "X position" and "Y position" settings do. Presented near "Globals_LaunchPosition.Header".</comment>
-  </data>
   <data name="Profile_BellStyleAll.Content" xml:space="preserve">
     <value>全部</value>
     <comment>An option to choose from for the "bell style" setting. When selected, a combination of the other bell styles is used to notify the user.</comment>
@@ -1577,7 +1565,7 @@
     <value>刪除設定檔</value>
     <comment>Button label that deletes the current profile that is being viewed.</comment>
   </data>
-  <data name="Profile_Name.HelpText" xml:space="preserve">
+  <data name="Profile_Name.Description" xml:space="preserve">
     <value>出現在下拉式清單中的設定檔名稱。</value>
     <comment>A description for what the "name" setting does. Presented near "Profile_Name".</comment>
   </data>
@@ -1661,7 +1649,7 @@
     <value>索引標籤切換器介面樣式</value>
     <comment>Header for a control to choose how the tab switcher operates.</comment>
   </data>
-  <data name="Globals_TabSwitcherMode.HelpText" xml:space="preserve">
+  <data name="Globals_TabSwitcherMode.Description" xml:space="preserve">
     <value>選取當您使用鍵盤切換索引標籤時要使用的介面。</value>
     <comment>A description for what the "tab switcher mode" setting does. Presented near "Globals_TabSwitcherMode.Header".</comment>
   </data>
@@ -2185,7 +2173,7 @@
     <value>自動隱藏視窗</value>
     <comment>Header for a control to toggle the "Automatically hide window" setting. If enabled, the terminal will be hidden as soon as you switch to another window.</comment>
   </data>
-  <data name="Globals_AutoHideWindow.HelpText" xml:space="preserve">
+  <data name="Globals_AutoHideWindow.Description" xml:space="preserve">
     <value>如果啟用，當您切換到其他視窗時，就會立即隱藏終端機。</value>
     <comment>A description for what the "Automatically hide window" setting does.</comment>
   </data>
@@ -2205,7 +2193,7 @@
     <value>關閉時警告</value>
     <comment>Header for a dropdown controlling when to show a confirmation dialog before closing.</comment>
   </data>
-  <data name="Globals_ConfirmOnClose.HelpText" xml:space="preserve">
+  <data name="Globals_ConfirmOnClose.Description" xml:space="preserve">
     <value>控制在關閉索引標籤或視窗之前出現確認對話方塊的時間。[永遠] 會在關閉任何窗格時顯示對話方塊。</value>
     <comment>Help text associated with Globals_ConfirmOnClose. "Always" refers to Globals_ConfirmOnCloseAlways.Content.</comment>
   </data>
@@ -2230,7 +2218,7 @@
   <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
     <value>在貼上新行列時警告</value>
   </data>
-  <data name="Globals_WarnAboutMultiLinePaste.HelpText" xml:space="preserve">
+  <data name="Globals_WarnAboutMultiLinePaste.Description" xml:space="preserve">
     <value>如果您的殼層不支援「括號貼上」模式，基於安全性考量，我們建議您將此設定為「一律」。</value>
     <comment>"bracketed paste" is a technical term referring to escape sequences. "Always" is a setting, as in "Always VS Never".</comment>
   </data>
@@ -2274,7 +2262,7 @@
     <value>鈴鐺音效</value>
     <comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
   </data>
-  <data name="Profile_BellSound.HelpText" xml:space="preserve">
+  <data name="Profile_BellSound.Description" xml:space="preserve">
     <value>控制應用程式發出 BEL 字元時播放的音效。「鈴聲通知樣式」必須包含「可聽」。</value>
     <comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
   </data>
@@ -2325,19 +2313,19 @@
     <value>游標色彩</value>
     <comment>Header for a control to determine the color of the cursor.</comment>
   </data>
-  <data name="Profile_Foreground.HelpText" xml:space="preserve">
+  <data name="Profile_Foreground.Description" xml:space="preserve">
     <value>覆寫色彩配置中的前景色彩。</value>
     <comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
   </data>
-  <data name="Profile_CursorColor.HelpText" xml:space="preserve">
+  <data name="Profile_CursorColor.Description" xml:space="preserve">
     <value>覆寫色彩配置中的游標色彩。</value>
     <comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
   </data>
-  <data name="Profile_Background.HelpText" xml:space="preserve">
+  <data name="Profile_Background.Description" xml:space="preserve">
     <value>覆寫色彩配置的背景色彩。</value>
     <comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
   </data>
-  <data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
+  <data name="Profile_SelectionBackground.Description" xml:space="preserve">
     <value>覆寫色彩配置中選取的背景色彩。</value>
     <comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
   </data>
@@ -2421,11 +2409,11 @@
     <value>剩餘的設定檔</value>
     <comment>Header for a control that adds any remaining profiles to the new tab menu.</comment>
   </data>
-  <data name="NewTabMenu_AddMatchProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddMatchProfiles.Description" xml:space="preserve">
     <value>新增至少符合其中一個已定義正則表達式屬性的配置檔群組</value>
     <comment>Additional information for a control that adds a terminal profile matcher to the new tab menu. Presented near "NewTabMenu_AddMatchProfiles".</comment>
   </data>
-  <data name="NewTabMenu_AddRemainingProfiles.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_AddRemainingProfiles.Description" xml:space="preserve">
     <value>只能有一個「剩餘配置檔」專案</value>
     <comment>Additional information for a control that adds any remaining profiles to the new tab menu. Presented near "NewTabMenu_AddRemainingProfiles".</comment>
   </data>
@@ -2505,7 +2493,7 @@
     <value>允許內嵌</value>
     <comment>Header for a control that allows the nested entries to be presented inline rather than with a folder.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderInlining.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderInlining.Description" xml:space="preserve">
     <value>啟用時，如果資料夾只有一個專案，則專案會直接顯示，而且不會轉譯資料夾。</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderInlining.Header".</comment>
   </data>
@@ -2513,7 +2501,7 @@
     <value>允許空白</value>
     <comment>Header for a control that allows the current folder entry to be empty.</comment>
   </data>
-  <data name="NewTabMenu_CurrentFolderAllowEmpty.HelpText" xml:space="preserve">
+  <data name="NewTabMenu_CurrentFolderAllowEmpty.Description" xml:space="preserve">
     <value>啟用時，如果資料夾沒有專案，它仍會顯示。否則，將不會轉譯資料夾。</value>
     <comment>Additional text displayed near "NewTabMenu_CurrentFolderAllowEmpty.Header".</comment>
   </data>
@@ -2577,11 +2565,11 @@
     <value>ENQ (Request Terminal Status) 回應</value>
     <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
+  <data name="Profile_AnswerbackMessage.Description" xml:space="preserve">
     <value>接收到 ENQ 控制順序時所傳送的回應。</value>
     <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
   </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
+  <data name="Globals_DebugFeaturesEnabled.Description" xml:space="preserve">
     <value>適用於疑難排解或開發終端機。</value>
     <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
   </data>
@@ -2593,7 +2581,7 @@
     <value>實驗性： 將按鍵系結新增到選取文字的色彩</value>
     <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
   </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
+  <data name="Globals_EnableColorSelection.Description" xml:space="preserve">
     <value>這些索引鍵系結可以醒目提示選取文字或具有指定色彩之選取文字的所有實例。</value>
     <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
   </data>
@@ -2609,7 +2597,7 @@
     <value>以全螢幕顯示索引標籤</value>
     <comment>Header for a control to toggle if the app should show the tabs when in full screen state.</comment>
   </data>
-  <data name="Globals_ShowTabsFullscreen.HelpText" xml:space="preserve">
+  <data name="Globals_ShowTabsFullscreen.Description" xml:space="preserve">
     <value>啟用時，當應用程式使用全螢幕時，將會顯示索引標籤。</value>
     <comment>A description for what the "show tabs in full screen" setting does.</comment>
   </data>
@@ -2621,7 +2609,7 @@
     <value>路徑翻譯</value>
     <comment>Name for a control to select how file and directory paths are translated.</comment>
   </data>
-  <data name="Profile_PathTranslationStyle.HelpText" xml:space="preserve">
+  <data name="Profile_PathTranslationStyle.Description" xml:space="preserve">
     <value>控制在拖放操作期間如何翻譯檔案和目錄路徑。</value>
     <comment>A description for what the "path translation" setting does. Presented near "Profile_PathTranslationStyle.Header".</comment>
   </data>
@@ -2648,13 +2636,13 @@
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">
     <value>已不再偵測到設定檔</value>
   </data>
-  <data name="Profile_Delete_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Delete_Orphaned.Description" xml:space="preserve">
     <value>這個自動偵測到的配置檔似乎已卸載。您對它的變更會被保留，但是在重新安裝之前無法使用。</value>
   </data>
   <data name="Profile_Source_Orphaned.Header" xml:space="preserve">
     <value>原始來源</value>
   </data>
-  <data name="Profile_Source_Orphaned.HelpText" xml:space="preserve">
+  <data name="Profile_Source_Orphaned.Description" xml:space="preserve">
     <value>指示原始建立此配置檔的軟體。</value>
   </data>
   <data name="Profile_TabTitleNone" xml:space="preserve">
@@ -2729,7 +2717,7 @@
   <data name="Settings_ResetApplicationState.Header" xml:space="preserve">
     <value>清除快取</value>
   </data>
-  <data name="Settings_ResetApplicationState.HelpText" xml:space="preserve">
+  <data name="Settings_ResetApplicationState.Description" xml:space="preserve">
     <value>快取會儲存與已儲存之工作階段和自動產生設定檔相關的資料。</value>
   </data>
   <data name="Settings_ResetToDefaultSettingsButton.Content" xml:space="preserve">
@@ -2772,7 +2760,7 @@
     <value>拖放分隔符號</value>
     <comment>Header for a control to set the delimiter used when dragging multiple files into the terminal.</comment>
   </data>
-  <data name="Profile_DragDropDelimiter.HelpText" xml:space="preserve">
+  <data name="Profile_DragDropDelimiter.Description" xml:space="preserve">
     <value>這些文字會插入多個丟入終端機的檔案路徑之間。</value>
     <comment>A description for what the "drag drop delimiter" setting does.</comment>
   </data>
diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp b/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp
deleted file mode 100644
index 4bac3ead42b..00000000000
--- a/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "SettingContainer.h"
-#include "SettingContainer.g.cpp"
-
-using namespace winrt::Windows::UI::Xaml;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    DependencyProperty SettingContainer::_HeaderProperty{ nullptr };
-    DependencyProperty SettingContainer::_HelpTextProperty{ nullptr };
-    DependencyProperty SettingContainer::_FontIconGlyphProperty{ nullptr };
-    DependencyProperty SettingContainer::_CurrentValueProperty{ nullptr };
-    DependencyProperty SettingContainer::_CurrentValueTemplateProperty{ nullptr };
-    DependencyProperty SettingContainer::_CurrentValueAccessibleNameProperty{ nullptr };
-    DependencyProperty SettingContainer::_HasSettingValueProperty{ nullptr };
-    DependencyProperty SettingContainer::_SettingOverrideSourceProperty{ nullptr };
-    DependencyProperty SettingContainer::_StartExpandedProperty{ nullptr };
-
-    SettingContainer::SettingContainer()
-    {
-        _InitializeProperties();
-    }
-
-    void SettingContainer::_InitializeProperties()
-    {
-        // Initialize any SettingContainer dependency properties here.
-        // This performs a lazy load on these properties, instead of
-        // initializing them when the DLL loads.
-        if (!_HeaderProperty)
-        {
-            _HeaderProperty =
-                DependencyProperty::Register(
-                    L"Header",
-                    xaml_typename<IInspectable>(),
-                    xaml_typename<Editor::SettingContainer>(),
-                    PropertyMetadata{ nullptr });
-        }
-        if (!_HelpTextProperty)
-        {
-            _HelpTextProperty =
-                DependencyProperty::Register(
-                    L"HelpText",
-                    xaml_typename<hstring>(),
-                    xaml_typename<Editor::SettingContainer>(),
-                    PropertyMetadata{ box_value(L""), PropertyChangedCallback{ &SettingContainer::_OnHelpTextChanged } });
-        }
-        if (!_FontIconGlyphProperty)
-        {
-            _FontIconGlyphProperty =
-                DependencyProperty::Register(
-                    L"FontIconGlyph",
-                    xaml_typename<hstring>(),
-                    xaml_typename<Editor::SettingContainer>(),
-                    PropertyMetadata{ box_value(L"") });
-        }
-        if (!_CurrentValueProperty)
-        {
-            _CurrentValueProperty =
-                DependencyProperty::Register(
-                    L"CurrentValue",
-                    xaml_typename<IInspectable>(),
-                    xaml_typename<Editor::SettingContainer>(),
-                    PropertyMetadata{ nullptr, PropertyChangedCallback{ &SettingContainer::_OnCurrentValueChanged } });
-        }
-        if (!_CurrentValueTemplateProperty)
-        {
-            _CurrentValueTemplateProperty =
-                DependencyProperty::Register(
-                    L"CurrentValueTemplate",
-                    xaml_typename<Windows::UI::Xaml::DataTemplate>(),
-                    xaml_typename<Editor::SettingContainer>(),
-                    PropertyMetadata{ nullptr });
-        }
-        if (!_CurrentValueAccessibleNameProperty)
-        {
-            _CurrentValueAccessibleNameProperty =
-                DependencyProperty::Register(
-                    L"CurrentValueAccessibleName",
-                    xaml_typename<Windows::UI::Xaml::DataTemplate>(),
-                    xaml_typename<Editor::SettingContainer>(),
-                    PropertyMetadata{ box_value(L""), PropertyChangedCallback{ &SettingContainer::_OnCurrentValueChanged } });
-        }
-        if (!_HasSettingValueProperty)
-        {
-            _HasSettingValueProperty =
-                DependencyProperty::Register(
-                    L"HasSettingValue",
-                    xaml_typename<bool>(),
-                    xaml_typename<Editor::SettingContainer>(),
-                    PropertyMetadata{ box_value(false), PropertyChangedCallback{ &SettingContainer::_OnHasSettingValueChanged } });
-        }
-        if (!_SettingOverrideSourceProperty)
-        {
-            _SettingOverrideSourceProperty =
-                DependencyProperty::Register(
-                    L"SettingOverrideSource",
-                    xaml_typename<IInspectable>(),
-                    xaml_typename<Editor::SettingContainer>(),
-                    PropertyMetadata{ nullptr, PropertyChangedCallback{ &SettingContainer::_OnHasSettingValueChanged } });
-        }
-        if (!_StartExpandedProperty)
-        {
-            _StartExpandedProperty =
-                DependencyProperty::Register(
-                    L"StartExpanded",
-                    xaml_typename<bool>(),
-                    xaml_typename<Editor::SettingContainer>(),
-                    PropertyMetadata{ box_value(false) });
-        }
-    }
-
-    void SettingContainer::_OnCurrentValueChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& /*e*/)
-    {
-        const auto& obj{ d.try_as<Editor::SettingContainer>() };
-        get_self<SettingContainer>(obj)->_UpdateCurrentValueAutoProp();
-    }
-
-    void SettingContainer::_OnHasSettingValueChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*args*/)
-    {
-        // update visibility for override message and reset button
-        const auto& obj{ d.try_as<Editor::SettingContainer>() };
-        get_self<SettingContainer>(obj)->_UpdateOverrideSystem();
-    }
-
-    void SettingContainer::_OnHelpTextChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*args*/)
-    {
-        // update visibility for override message and reset button
-        const auto& obj{ d.try_as<Editor::SettingContainer>() };
-        get_self<SettingContainer>(obj)->_UpdateHelpText();
-    }
-
-    void SettingContainer::_UpdateHelpText()
-    {
-        // Get the correct base to apply automation properties to
-        std::vector<DependencyObject> base;
-        base.reserve(2);
-        if (const auto& child{ GetTemplateChild(L"Expander") })
-        {
-            if (const auto& expander{ child.try_as<Microsoft::UI::Xaml::Controls::Expander>() })
-            {
-                base.push_back(child);
-            }
-        }
-        if (const auto& content{ Content() })
-        {
-            const auto& panel{ content.try_as<Controls::Panel>() };
-            const auto& obj{ content.try_as<DependencyObject>() };
-            if (!panel && obj)
-            {
-                base.push_back(obj);
-            }
-        }
-
-        for (const auto& obj : base)
-        {
-            // apply header and current value as name (automation property)
-            Automation::AutomationProperties::SetName(obj, _GenerateAccessibleName());
-
-            // apply help text as tooltip and full description (automation property)
-            if (const auto& helpText{ HelpText() }; !helpText.empty())
-            {
-                Automation::AutomationProperties::SetFullDescription(obj, helpText);
-            }
-            else
-            {
-                Controls::ToolTipService::SetToolTip(obj, nullptr);
-                Automation::AutomationProperties::SetFullDescription(obj, L"");
-            }
-        }
-
-        const auto textBlockHidden = HelpText().empty();
-        if (const auto& child{ GetTemplateChild(L"HelpTextBlock") })
-        {
-            if (const auto& textBlock{ child.try_as<Controls::TextBlock>() })
-            {
-                textBlock.Visibility(textBlockHidden ? Visibility::Collapsed : Visibility::Visible);
-            }
-        }
-    }
-
-    void SettingContainer::OnApplyTemplate()
-    {
-        if (const auto& child{ GetTemplateChild(L"ResetButton") })
-        {
-            if (const auto& button{ child.try_as<Controls::Button>() })
-            {
-                // Apply click handler for the reset button.
-                // When clicked, we dispatch the bound ClearSettingValue event,
-                // resulting in inheriting the setting value from the parent.
-                button.Click([=](auto&&, auto&&) {
-                    ClearSettingValue.raise(*this, nullptr);
-
-                    // move the focus to the child control
-                    if (const auto& content{ Content() })
-                    {
-                        if (const auto& control{ content.try_as<Controls::Control>() })
-                        {
-                            control.Focus(FocusState::Programmatic);
-                            return;
-                        }
-                        else if (const auto& panel{ content.try_as<Controls::Panel>() })
-                        {
-                            for (const auto& panelChild : panel.Children())
-                            {
-                                if (const auto& panelControl{ panelChild.try_as<Controls::Control>() })
-                                {
-                                    panelControl.Focus(FocusState::Programmatic);
-                                    return;
-                                }
-                            }
-                        }
-                        // if we get here, we didn't find something to reasonably focus to.
-                    }
-                });
-
-                // apply name (automation property)
-                Automation::AutomationProperties::SetName(child, RS_(L"SettingContainer_OverrideMessageBaseLayer"));
-            }
-        }
-
-        _UpdateOverrideSystem();
-        _UpdateHelpText();
-    }
-
-    void SettingContainer::SetExpanded(bool expanded)
-    {
-        if (const auto& child{ GetTemplateChild(L"Expander") })
-        {
-            if (const auto& expander{ child.try_as<Microsoft::UI::Xaml::Controls::Expander>() })
-            {
-                expander.IsExpanded(expanded);
-            }
-        }
-    }
-
-    // Method Description:
-    // - Updates the override system visibility and text
-    // Arguments:
-    // - <none>
-    void SettingContainer::_UpdateOverrideSystem()
-    {
-        if (const auto& child{ GetTemplateChild(L"ResetButton") })
-        {
-            if (const auto& button{ child.try_as<Controls::Button>() })
-            {
-                if (HasSettingValue())
-                {
-                    // We want to be smart about showing the override system.
-                    // Don't just show it if the user explicitly set the setting.
-                    // If the tooltip is empty, we'll hide the entire override system.
-
-                    const auto& settingSrc{ SettingOverrideSource() };
-                    const auto tooltip{ _GenerateOverrideMessage(settingSrc) };
-
-                    Controls::ToolTipService::SetToolTip(button, box_value(tooltip));
-                    button.Visibility(tooltip.empty() ? Visibility::Collapsed : Visibility::Visible);
-                }
-                else
-                {
-                    // a value is not being overridden; hide the override system
-                    button.Visibility(Visibility::Collapsed);
-                }
-            }
-        }
-    }
-
-    void SettingContainer::_UpdateCurrentValueAutoProp()
-    {
-        if (const auto& child{ GetTemplateChild(L"Expander") })
-        {
-            if (const auto& expander{ child.try_as<Microsoft::UI::Xaml::Controls::Expander>() })
-            {
-                Automation::AutomationProperties::SetName(expander, _GenerateAccessibleName());
-            }
-        }
-    }
-
-    // Method Description:
-    // - Helper function for generating the override message
-    // Arguments:
-    // - profile: the profile that defines the setting (aka SettingOverrideSource)
-    // Return Value:
-    // - text specifying where the setting was defined. If empty, we don't want to show the system.
-    hstring SettingContainer::_GenerateOverrideMessage(const IInspectable& settingOrigin)
-    {
-        // We only get here if the user had an override in place.
-        auto originTag{ Model::OriginTag::None };
-        winrt::hstring source;
-
-        if (const auto& profile{ settingOrigin.try_as<Model::Profile>() })
-        {
-            source = profile.Source();
-            originTag = profile.Origin();
-        }
-        else if (const auto& appearanceConfig{ settingOrigin.try_as<Model::AppearanceConfig>() })
-        {
-            const auto profile = appearanceConfig.SourceProfile();
-            source = profile.Source();
-            originTag = profile.Origin();
-        }
-
-        // We will display arrows for all origins, and informative tooltips for Fragments and Generated
-        if (originTag == Model::OriginTag::Fragment || originTag == Model::OriginTag::Generated)
-        {
-            // from a fragment extension or generated profile
-            return hstring{ RS_fmt(L"SettingContainer_OverrideMessageFragmentExtension", source) };
-        }
-        return RS_(L"SettingContainer_OverrideMessageBaseLayer");
-    }
-
-    // Method Description:
-    // - Helper function for generating the accessible name
-    // Return Value:
-    // - text specifying the accessible name. Includes header and current value, if available.
-    hstring SettingContainer::_GenerateAccessibleName()
-    {
-        hstring name{};
-        if (const auto& header{ Header() })
-        {
-            if (const auto headerText{ header.try_as<hstring>() })
-            {
-                name = *headerText;
-            }
-
-            // append current value to the name, if it exists
-            if (const auto currentValAccessibleName{ CurrentValueAccessibleName() }; !currentValAccessibleName.empty())
-            {
-                // prefer CurrentValueAccessibleName, if it exists
-                name = name + L": " + currentValAccessibleName;
-            }
-            else if (const auto& currentVal{ CurrentValue() })
-            {
-                // the accessible name was not defined, so try to
-                // extract the value directly from the CurrentValue property
-                if (const auto currentValText{ currentVal.try_as<hstring>() })
-                {
-                    name = name + L": " + *currentValText;
-                }
-            }
-        }
-        return name;
-    }
-}
diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainer.h b/src/cascadia/TerminalSettingsEditor/SettingContainer.h
deleted file mode 100644
index 9c77a838e0e..00000000000
--- a/src/cascadia/TerminalSettingsEditor/SettingContainer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- SettingContainer
-
-Abstract:
-- This is a XAML container that wraps settings in the Settings UI.
-  It interacts with the inheritance logic from the TerminalSettingsModel
-  and represents it in the Settings UI.
-
-Author(s):
-- Carlos Zamora - January 2021
-
---*/
-
-#pragma once
-
-#include "SettingContainer.g.h"
-#include "Utils.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct SettingContainer : SettingContainerT<SettingContainer>
-    {
-    public:
-        SettingContainer();
-
-        void OnApplyTemplate();
-
-        void SetExpanded(bool expanded);
-
-        til::typed_event<Editor::SettingContainer, Windows::Foundation::IInspectable> ClearSettingValue;
-
-        DEPENDENCY_PROPERTY(Windows::Foundation::IInspectable, Header);
-        DEPENDENCY_PROPERTY(hstring, HelpText);
-        DEPENDENCY_PROPERTY(hstring, FontIconGlyph);
-        DEPENDENCY_PROPERTY(Windows::Foundation::IInspectable, CurrentValue);
-        DEPENDENCY_PROPERTY(Windows::UI::Xaml::DataTemplate, CurrentValueTemplate);
-        DEPENDENCY_PROPERTY(hstring, CurrentValueAccessibleName);
-        DEPENDENCY_PROPERTY(bool, HasSettingValue);
-        DEPENDENCY_PROPERTY(bool, StartExpanded);
-        DEPENDENCY_PROPERTY(IInspectable, SettingOverrideSource);
-
-    private:
-        static void _InitializeProperties();
-        static void _OnCurrentValueChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
-        static void _OnHasSettingValueChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
-        static void _OnHelpTextChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
-        static hstring _GenerateOverrideMessage(const IInspectable& settingOrigin);
-        hstring _GenerateAccessibleName();
-        void _UpdateOverrideSystem();
-        void _UpdateHelpText();
-        void _UpdateCurrentValueAutoProp();
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(SettingContainer);
-}
diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainer.idl b/src/cascadia/TerminalSettingsEditor/SettingContainer.idl
deleted file mode 100644
index 143d49b919f..00000000000
--- a/src/cascadia/TerminalSettingsEditor/SettingContainer.idl
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    [default_interface] runtimeclass SettingContainer : Windows.UI.Xaml.Controls.ContentControl
-    {
-        SettingContainer();
-
-        void SetExpanded(Boolean expanded);
-
-        IInspectable Header;
-        static Windows.UI.Xaml.DependencyProperty HeaderProperty { get; };
-
-        String HelpText;
-        static Windows.UI.Xaml.DependencyProperty HelpTextProperty { get; };
-
-        String FontIconGlyph;
-        static Windows.UI.Xaml.DependencyProperty FontIconGlyphProperty { get; };
-
-        IInspectable CurrentValue;
-        static Windows.UI.Xaml.DependencyProperty CurrentValueProperty { get; };
-
-        Windows.UI.Xaml.DataTemplate CurrentValueTemplate;
-        static Windows.UI.Xaml.DependencyProperty CurrentValueTemplateProperty { get; };
-
-        String CurrentValueAccessibleName;
-        static Windows.UI.Xaml.DependencyProperty CurrentValueAccessibleNameProperty { get; };
-
-        Boolean HasSettingValue;
-        static Windows.UI.Xaml.DependencyProperty HasSettingValueProperty { get; };
-
-        IInspectable SettingOverrideSource;
-        static Windows.UI.Xaml.DependencyProperty SettingOverrideSourceProperty { get; };
-
-        Boolean StartExpanded;
-        static Windows.UI.Xaml.DependencyProperty StartExpandedProperty { get; };
-
-        event Windows.Foundation.TypedEventHandler<SettingContainer, Object> ClearSettingValue;
-    };
-}
diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
index 280dba68ad1..134a3fa0457 100644
--- a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
+++ b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
@@ -18,8 +18,6 @@
             </Style>
             <SolidColorBrush x:Key="SubgroupHeaderBrush"
                              Color="{StaticResource TextFillColorSecondary}" />
-            <StaticResource x:Key="ExpanderHeaderBorderBrush"
-                            ResourceKey="CardStrokeColorDefaultBrush" />
 
             <StaticResource x:Key="SettingContainerErrorSeverityBackgroundBrush"
                             ResourceKey="SystemFillColorCriticalBackgroundBrush" />
@@ -31,28 +29,14 @@
             <StaticResource x:Key="SettingContainerWarningSeverityIconBackground"
                             ResourceKey="SystemFillColorCautionBrush" />
 
-            <StaticResource x:Key="SettingContainerErrorSeverityIconForeground"
-                            ResourceKey="TextFillColorInverseBrush" />
-            <StaticResource x:Key="SettingContainerWarningSeverityIconForeground"
-                            ResourceKey="TextFillColorInverseBrush" />
-
-            <StaticResource x:Key="SettingContainerTitleForeground"
-                            ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="SettingContainerMessageForeground"
-                            ResourceKey="TextFillColorPrimaryBrush" />
-
             <StaticResource x:Key="SettingContainerResetButtonIconForeground"
                             ResourceKey="SystemAccentColorDark2" />
-
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
             <Style x:Key="SecondaryTextBlockStyle"
                    TargetType="TextBlock" />
-            <!--  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="SettingContainerErrorSeverityBackgroundBrush"
                             ResourceKey="SystemColorWindowColorBrush" />
@@ -64,16 +48,6 @@
             <StaticResource x:Key="SettingContainerWarningSeverityIconBackground"
                             ResourceKey="SystemColorHighlightColorBrush" />
 
-            <StaticResource x:Key="SettingContainerErrorSeverityIconForeground"
-                            ResourceKey="SystemColorHighlightTextColorBrush" />
-            <StaticResource x:Key="SettingContainerWarningSeverityIconForeground"
-                            ResourceKey="SystemColorHighlightTextColorBrush" />
-
-            <StaticResource x:Key="SettingContainerTitleForeground"
-                            ResourceKey="SystemColorWindowTextColorBrush" />
-            <StaticResource x:Key="SettingContainerMessageForeground"
-                            ResourceKey="SystemColorWindowTextColorBrush" />
-
             <StaticResource x:Key="SettingContainerResetButtonIconForeground"
                             ResourceKey="SystemAccentColorLight1" />
         </ResourceDictionary>
@@ -84,8 +58,6 @@
             </Style>
             <SolidColorBrush x:Key="SubgroupHeaderBrush"
                              Color="{StaticResource TextFillColorSecondary}" />
-            <StaticResource x:Key="ExpanderHeaderBorderBrush"
-                            ResourceKey="CardStrokeColorDefaultBrush" />
 
             <StaticResource x:Key="SettingContainerErrorSeverityBackgroundBrush"
                             ResourceKey="SystemFillColorCriticalBackgroundBrush" />
@@ -97,36 +69,16 @@
             <StaticResource x:Key="SettingContainerWarningSeverityIconBackground"
                             ResourceKey="SystemFillColorCautionBrush" />
 
-            <StaticResource x:Key="SettingContainerErrorSeverityIconForeground"
-                            ResourceKey="TextFillColorInverseBrush" />
-            <StaticResource x:Key="SettingContainerWarningSeverityIconForeground"
-                            ResourceKey="TextFillColorInverseBrush" />
-
-            <StaticResource x:Key="SettingContainerTitleForeground"
-                            ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="SettingContainerMessageForeground"
-                            ResourceKey="TextFillColorPrimaryBrush" />
-
             <StaticResource x:Key="SettingContainerResetButtonIconForeground"
                             ResourceKey="SystemAccentColorLight2" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
-    <FontWeight x:Key="SettingContainerTitleFontWeight">SemiBold</FontWeight>
-
-    <x:String x:Key="SettingContainerIconBackgroundGlyph">&#xF136;</x:String>
     <x:String x:Key="SettingContainerErrorIconGlyph">&#xF13D;</x:String>
     <x:String x:Key="SettingContainerWarningIconGlyph">&#xF13C;</x:String>
 
-    <Thickness x:Key="SettingContainerIconMargin">0,4,8,4</Thickness>
     <x:Double x:Key="SettingContainerIconFontSize">16</x:Double>
 
-    <Style x:Key="StackPanelInExpanderStyle"
-           TargetType="StackPanel">
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Padding" Value="0,12,0,12" />
-    </Style>
-
     <Style x:Key="SettingContainerResetButtonStyle"
            BasedOn="{StaticResource DefaultButtonStyle}"
            TargetType="Button">
@@ -145,18 +97,6 @@
         <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
     </Style>
 
-    <Style x:Key="NonExpanderGrid"
-           TargetType="Grid">
-        <Setter Property="Background" Value="{ThemeResource ExpanderHeaderBackground}" />
-        <Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
-        <Setter Property="MinHeight" Value="64" />
-        <Setter Property="BorderThickness" Value="{ThemeResource ExpanderHeaderBorderThickness}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
-        <Setter Property="Padding" Value="16,0,8,0" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-    </Style>
-
     <Style x:Key="SettingsPageItemHeaderStyle"
            BasedOn="{StaticResource BodyTextBlockStyle}"
            TargetType="TextBlock">
@@ -178,406 +118,11 @@
            BasedOn="{StaticResource SettingsPageItemDescriptionStyle}"
            TargetType="TextBlock">
         <Setter Property="MaxWidth" Value="248" />
-        <Setter Property="Margin" Value="0,0,-16,0" />
+        <Setter Property="Margin" Value="0" />
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="FontFamily" Value="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets" />
     </Style>
 
-    <DataTemplate x:Key="ExpanderSettingContainerStringPreviewTemplate">
-        <TextBlock Style="{StaticResource SettingContainerCurrentValueTextBlockStyle}"
-                   Text="{Binding}" />
-    </DataTemplate>
-
-    <!--  A setting container for a setting that has no additional options  -->
-    <Style TargetType="local:SettingContainer">
-        <Setter Property="Margin" Value="0,4,0,0" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="MaxWidth" Value="1000" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="local:SettingContainer">
-                    <Grid AutomationProperties.Name="{TemplateBinding Header}"
-                          Style="{StaticResource NonExpanderGrid}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <StackPanel Grid.Column="0"
-                                    Style="{StaticResource StackPanelInExpanderStyle}">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Style="{StaticResource SettingsPageItemHeaderStyle}"
-                                           Text="{TemplateBinding Header}" />
-                                <Button x:Name="ResetButton"
-                                        Style="{StaticResource SettingContainerResetButtonStyle}">
-                                    <FontIcon Glyph="&#xE845;"
-                                              Style="{StaticResource SettingContainerFontIconStyle}" />
-                                </Button>
-                            </StackPanel>
-                            <TextBlock x:Name="HelpTextBlock"
-                                       Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                       Text="{TemplateBinding HelpText}" />
-                        </StackPanel>
-                        <ContentPresenter Grid.Column="1"
-                                          HorizontalAlignment="Right"
-                                          VerticalAlignment="Center"
-                                          Content="{TemplateBinding Content}" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--  A basic setting container displaying immutable text as content  -->
-    <Style x:Key="SettingContainerWithTextContent"
-           TargetType="local:SettingContainer">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="local:SettingContainer">
-                    <Grid AutomationProperties.Name="{TemplateBinding Header}"
-                          Style="{StaticResource NonExpanderGrid}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <StackPanel Grid.Column="0"
-                                    Style="{StaticResource StackPanelInExpanderStyle}">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Style="{StaticResource SettingsPageItemHeaderStyle}"
-                                           Text="{TemplateBinding Header}" />
-                                <Button x:Name="ResetButton"
-                                        Style="{StaticResource SettingContainerResetButtonStyle}">
-                                    <FontIcon Glyph="&#xE845;"
-                                              Style="{StaticResource SettingContainerFontIconStyle}" />
-                                </Button>
-                            </StackPanel>
-                            <TextBlock x:Name="HelpTextBlock"
-                                       Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                       Text="{TemplateBinding HelpText}" />
-                        </StackPanel>
-                        <TextBlock Grid.Column="1"
-                                   Margin="0,0,8,0"
-                                   HorizontalAlignment="Right"
-                                   VerticalAlignment="Center"
-                                   Style="{ThemeResource SecondaryTextBlockStyle}"
-                                   Text="{TemplateBinding Content}" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--
-        A setting container for a setting that has no additional options.
-        Includes space for an icon on the left side of the header.
-        XAML applies the margin/padding of the icon regardless of its
-        existence (which caused inconsistent padding). It's easier to just create
-        another style and move on.
-    -->
-    <Style x:Key="SettingContainerWithIcon"
-           TargetType="local:SettingContainer">
-        <Setter Property="Margin" Value="0,4,0,0" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="MaxWidth" Value="1000" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="local:SettingContainer">
-                    <Grid AutomationProperties.Name="{TemplateBinding Header}"
-                          Style="{StaticResource NonExpanderGrid}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <FontIcon Grid.Column="0"
-                                  Glyph="{TemplateBinding FontIconGlyph}" />
-                        <StackPanel Grid.Column="1"
-                                    Padding="14,12,0,12"
-                                    Style="{StaticResource StackPanelInExpanderStyle}">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Style="{StaticResource SettingsPageItemHeaderStyle}"
-                                           Text="{TemplateBinding Header}" />
-                                <Button x:Name="ResetButton"
-                                        Style="{StaticResource SettingContainerResetButtonStyle}">
-                                    <FontIcon Glyph="&#xE845;"
-                                              Style="{StaticResource SettingContainerFontIconStyle}" />
-                                </Button>
-                            </StackPanel>
-                            <TextBlock x:Name="HelpTextBlock"
-                                       Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                       Text="{TemplateBinding HelpText}" />
-                        </StackPanel>
-                        <ContentPresenter Grid.Column="2"
-                                          HorizontalAlignment="Right"
-                                          VerticalAlignment="Center"
-                                          Content="{TemplateBinding Content}" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--  A setting container which can expand  -->
-    <Style x:Key="ExpanderSettingContainerStyle"
-           TargetType="local:SettingContainer">
-        <Setter Property="MaxWidth" Value="1000" />
-        <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"
-                                   Margin="0,4,0,0"
-                                   HorizontalAlignment="Stretch"
-                                   HorizontalContentAlignment="Stretch"
-                                   Content="{TemplateBinding Content}"
-                                   IsExpanded="{TemplateBinding StartExpanded}">
-                        <muxc:Expander.Header>
-                            <Grid MinHeight="64">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <StackPanel Grid.Column="0"
-                                            Style="{StaticResource StackPanelInExpanderStyle}">
-                                    <StackPanel Orientation="Horizontal">
-                                        <ContentPresenter Content="{TemplateBinding Header}" />
-                                        <Button x:Name="ResetButton"
-                                                Style="{StaticResource SettingContainerResetButtonStyle}">
-                                            <FontIcon Glyph="&#xE845;"
-                                                      Style="{StaticResource SettingContainerFontIconStyle}" />
-                                        </Button>
-                                    </StackPanel>
-                                    <TextBlock x:Name="HelpTextBlock"
-                                               Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                               Text="{TemplateBinding HelpText}" />
-                                </StackPanel>
-                                <ContentPresenter Grid.Column="1"
-                                                  Content="{TemplateBinding CurrentValue}"
-                                                  ContentTemplate="{StaticResource ExpanderSettingContainerStringPreviewTemplate}" />
-                            </Grid>
-                        </muxc:Expander.Header>
-                    </muxc:Expander>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--
-        A setting container which can expand. Includes space for an icon on the left side of the header.
-        XAML applies the margin/padding of the icon regardless of its
-        existence (which caused inconsistent padding). It's easier to just create
-        another style and move on.
-    -->
-    <Style x:Key="ExpanderSettingContainerStyleWithIcon"
-           TargetType="local:SettingContainer">
-        <Setter Property="MaxWidth" Value="1000" />
-        <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"
-                                   Margin="0,4,0,0"
-                                   HorizontalAlignment="Stretch"
-                                   HorizontalContentAlignment="Stretch"
-                                   Content="{TemplateBinding Content}"
-                                   IsExpanded="{TemplateBinding StartExpanded}">
-                        <muxc:Expander.Header>
-                            <Grid MinHeight="64">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <FontIcon Grid.Column="0"
-                                          Glyph="{TemplateBinding FontIconGlyph}" />
-                                <StackPanel Grid.Column="1"
-                                            Padding="14,12,0,12"
-                                            Style="{StaticResource StackPanelInExpanderStyle}">
-                                    <StackPanel Orientation="Horizontal">
-                                        <TextBlock Style="{StaticResource SettingsPageItemHeaderStyle}"
-                                                   Text="{TemplateBinding Header}" />
-                                        <Button x:Name="ResetButton"
-                                                Style="{StaticResource SettingContainerResetButtonStyle}">
-                                            <FontIcon Glyph="&#xE845;"
-                                                      Style="{StaticResource SettingContainerFontIconStyle}" />
-                                        </Button>
-                                    </StackPanel>
-                                    <TextBlock x:Name="HelpTextBlock"
-                                               Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                               Text="{TemplateBinding HelpText}" />
-                                </StackPanel>
-                                <ContentPresenter Grid.Column="2"
-                                                  Content="{TemplateBinding CurrentValue}"
-                                                  ContentTemplate="{StaticResource ExpanderSettingContainerStringPreviewTemplate}" />
-                            </Grid>
-                        </muxc:Expander.Header>
-                    </muxc:Expander>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--  A setting container which can expand. Supports data template override for preview  -->
-    <Style x:Key="ExpanderSettingContainerStyleWithComplexPreview"
-           TargetType="local:SettingContainer">
-        <Setter Property="MaxWidth" Value="1000" />
-        <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"
-                                   Margin="0,4,0,0"
-                                   HorizontalAlignment="Stretch"
-                                   HorizontalContentAlignment="Stretch"
-                                   Content="{TemplateBinding Content}"
-                                   IsExpanded="{TemplateBinding StartExpanded}">
-                        <muxc:Expander.Header>
-                            <Grid MinHeight="64">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <StackPanel Grid.Column="0"
-                                            Style="{StaticResource StackPanelInExpanderStyle}">
-                                    <StackPanel Orientation="Horizontal">
-                                        <TextBlock Style="{StaticResource SettingsPageItemHeaderStyle}"
-                                                   Text="{TemplateBinding Header}" />
-                                        <Button x:Name="ResetButton"
-                                                Style="{StaticResource SettingContainerResetButtonStyle}">
-                                            <FontIcon Glyph="&#xE845;"
-                                                      Style="{StaticResource SettingContainerFontIconStyle}" />
-                                        </Button>
-                                    </StackPanel>
-                                    <TextBlock x:Name="HelpTextBlock"
-                                               Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                               Text="{TemplateBinding HelpText}" />
-                                </StackPanel>
-                                <ContentPresenter Grid.Column="1"
-                                                  MaxWidth="248"
-                                                  Margin="0,0,-16,0"
-                                                  HorizontalAlignment="Right"
-                                                  VerticalAlignment="Center"
-                                                  Content="{TemplateBinding CurrentValue}"
-                                                  ContentTemplate="{TemplateBinding CurrentValueTemplate}" />
-                            </Grid>
-                        </muxc:Expander.Header>
-                    </muxc:Expander>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--  A setting container that displays a warning with an icon  -->
-    <Style x:Key="SettingContainerWarningStyle"
-           TargetType="local:SettingContainer">
-        <Setter Property="Margin" Value="0,4,0,0" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="MaxWidth" Value="1000" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="local:SettingContainer">
-                    <Grid AutomationProperties.Name="{TemplateBinding Header}"
-                          Background="{ThemeResource SettingContainerWarningSeverityBackgroundBrush}"
-                          Style="{StaticResource NonExpanderGrid}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <StackPanel Style="{StaticResource StackPanelInExpanderStyle}">
-                            <StackPanel Orientation="Horizontal">
-                                <Grid>
-                                    <TextBlock x:Name="IconBackground"
-                                               Grid.Column="0"
-                                               Margin="{StaticResource SettingContainerIconMargin}"
-                                               VerticalAlignment="Center"
-                                               AutomationProperties.AccessibilityView="Raw"
-                                               FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                               FontSize="{StaticResource SettingContainerIconFontSize}"
-                                               Foreground="{ThemeResource SettingContainerWarningSeverityIconBackground}"
-                                               Text="{StaticResource SettingContainerIconBackgroundGlyph}" />
-
-                                    <TextBlock x:Name="StandardIcon"
-                                               Grid.Column="0"
-                                               Margin="{StaticResource SettingContainerIconMargin}"
-                                               VerticalAlignment="Center"
-                                               FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                               FontSize="{StaticResource SettingContainerIconFontSize}"
-                                               Foreground="{ThemeResource SettingContainerWarningSeverityIconForeground}"
-                                               Text="{StaticResource SettingContainerWarningIconGlyph}" />
-                                </Grid>
-                                <TextBlock VerticalAlignment="Center"
-                                           FontWeight="{StaticResource SettingContainerTitleFontWeight}"
-                                           Foreground="{ThemeResource SettingContainerTitleForeground}"
-                                           Style="{StaticResource SettingsPageItemHeaderStyle}"
-                                           Text="{TemplateBinding Header}" />
-                            </StackPanel>
-                            <TextBlock x:Name="HelpTextBlock"
-                                       Foreground="{ThemeResource SettingContainerMessageForeground}"
-                                       Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                       Text="{TemplateBinding HelpText}" />
-                        </StackPanel>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!--  A setting container that displays an error with an icon  -->
-    <Style x:Key="SettingContainerErrorStyle"
-           TargetType="local:SettingContainer">
-        <Setter Property="Margin" Value="0,4,0,0" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="MaxWidth" Value="1000" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="local:SettingContainer">
-                    <Grid AutomationProperties.Name="{TemplateBinding Header}"
-                          Background="{ThemeResource SettingContainerErrorSeverityBackgroundBrush}"
-                          Style="{StaticResource NonExpanderGrid}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <StackPanel Style="{StaticResource StackPanelInExpanderStyle}">
-                            <StackPanel Orientation="Horizontal">
-                                <Grid>
-                                    <TextBlock x:Name="IconBackground"
-                                               Grid.Column="0"
-                                               Margin="{StaticResource SettingContainerIconMargin}"
-                                               VerticalAlignment="Center"
-                                               AutomationProperties.AccessibilityView="Raw"
-                                               FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                               FontSize="{StaticResource SettingContainerIconFontSize}"
-                                               Foreground="{ThemeResource SettingContainerErrorSeverityIconBackground}"
-                                               Text="{StaticResource SettingContainerIconBackgroundGlyph}" />
-
-                                    <TextBlock x:Name="StandardIcon"
-                                               Grid.Column="0"
-                                               Margin="{StaticResource SettingContainerIconMargin}"
-                                               VerticalAlignment="Center"
-                                               FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                               FontSize="{StaticResource SettingContainerIconFontSize}"
-                                               Foreground="{ThemeResource SettingContainerErrorSeverityIconForeground}"
-                                               Text="{StaticResource SettingContainerErrorIconGlyph}" />
-                                </Grid>
-                                <TextBlock VerticalAlignment="Center"
-                                           FontWeight="{StaticResource SettingContainerTitleFontWeight}"
-                                           Foreground="{ThemeResource SettingContainerTitleForeground}"
-                                           Style="{StaticResource SettingsPageItemHeaderStyle}"
-                                           Text="{TemplateBinding Header}" />
-                            </StackPanel>
-                            <TextBlock x:Name="HelpTextBlock"
-                                       Foreground="{ThemeResource SettingContainerMessageForeground}"
-                                       Style="{StaticResource SettingsPageItemDescriptionStyle}"
-                                       Text="{TemplateBinding HelpText}" />
-                        </StackPanel>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
 
 </ResourceDictionary>
diff --git a/src/cascadia/TerminalSettingsEditor/SettingsCard.cpp b/src/cascadia/TerminalSettingsEditor/SettingsCard.cpp
new file mode 100644
index 00000000000..333a31ff8c1
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/SettingsCard.cpp
@@ -0,0 +1,670 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "SettingsCard.h"
+#include "SettingsCard.g.cpp"
+#include "SettingsCardAutomationPeer.g.cpp"
+#include "StyleExtensions.h"
+
+using namespace winrt::Windows::Foundation;
+using namespace winrt::Windows::System;
+using namespace winrt::Windows::UI::Xaml;
+using namespace winrt::Windows::UI::Xaml::Automation;
+using namespace winrt::Windows::UI::Xaml::Automation::Peers;
+using namespace winrt::Windows::UI::Xaml::Controls;
+using namespace winrt::Windows::UI::Xaml::Controls::Primitives;
+using namespace winrt::Windows::UI::Xaml::Input;
+using namespace winrt::Windows::UI::Xaml::Media;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    DependencyProperty SettingsCard::_HeaderProperty{ nullptr };
+    DependencyProperty SettingsCard::_DescriptionProperty{ nullptr };
+    DependencyProperty SettingsCard::_HeaderIconProperty{ nullptr };
+    DependencyProperty SettingsCard::_ActionIconProperty{ nullptr };
+    DependencyProperty SettingsCard::_ActionIconToolTipProperty{ nullptr };
+    DependencyProperty SettingsCard::_IsClickEnabledProperty{ nullptr };
+    DependencyProperty SettingsCard::_IsActionIconVisibleProperty{ nullptr };
+    DependencyProperty SettingsCard::_ContentAlignmentProperty{ nullptr };
+
+    static constexpr std::wstring_view NormalState{ L"Normal" };
+    static constexpr std::wstring_view PointerOverState{ L"PointerOver" };
+    static constexpr std::wstring_view PressedState{ L"Pressed" };
+    static constexpr std::wstring_view DisabledState{ L"Disabled" };
+
+    static constexpr std::wstring_view BitmapHeaderIconEnabledState{ L"BitmapHeaderIconEnabled" };
+    static constexpr std::wstring_view BitmapHeaderIconDisabledState{ L"BitmapHeaderIconDisabled" };
+
+    static constexpr std::wstring_view RightState{ L"Right" };
+    static constexpr std::wstring_view LeftState{ L"Left" };
+    static constexpr std::wstring_view VerticalState{ L"Vertical" };
+
+    static constexpr std::wstring_view NoContentSpacingState{ L"NoContentSpacing" };
+    static constexpr std::wstring_view ContentSpacingState{ L"ContentSpacing" };
+
+    static constexpr std::wstring_view ContentAlignmentStatesGroup{ L"ContentAlignmentStates" };
+
+    static constexpr std::wstring_view ActionIconPresenterHolder{ L"PART_ActionIconPresenterHolder" };
+    static constexpr std::wstring_view HeaderPresenter{ L"PART_HeaderPresenter" };
+    static constexpr std::wstring_view DescriptionPresenter{ L"PART_DescriptionPresenter" };
+    static constexpr std::wstring_view HeaderIconPresenterHolder{ L"PART_HeaderIconPresenterHolder" };
+    static constexpr std::wstring_view ContentPresenterPart{ L"PART_ContentPresenter" };
+    static constexpr std::wstring_view RootGridPart{ L"PART_RootGrid" };
+
+    static constexpr double SettingsCardVerticalHeaderContentSpacing{ 8.0 };
+
+    // Returns true if the given object is null, or is a string that is empty.
+    // Non-string non-null objects (e.g. a TextBlock) are considered "non-empty".
+    static bool _isNullOrEmpty(const winrt::Windows::Foundation::IInspectable& obj)
+    {
+        if (!obj)
+        {
+            return true;
+        }
+        if (const auto pv{ obj.try_as<IPropertyValue>() }; pv && pv.Type() == PropertyType::String)
+        {
+            return unbox_value_or<hstring>(obj, hstring{}).empty();
+        }
+        return false;
+    }
+
+    SettingsCard::SettingsCard()
+    {
+        _InitializeProperties();
+    }
+
+    void SettingsCard::_InitializeProperties()
+    {
+        if (!_HeaderProperty)
+        {
+            _HeaderProperty = DependencyProperty::Register(
+                L"Header",
+                xaml_typename<IInspectable>(),
+                xaml_typename<Editor::SettingsCard>(),
+                PropertyMetadata{ nullptr, PropertyChangedCallback{ &SettingsCard::_OnHeaderChanged } });
+        }
+        if (!_DescriptionProperty)
+        {
+            _DescriptionProperty = DependencyProperty::Register(
+                L"Description",
+                xaml_typename<IInspectable>(),
+                xaml_typename<Editor::SettingsCard>(),
+                PropertyMetadata{ nullptr, PropertyChangedCallback{ &SettingsCard::_OnDescriptionChanged } });
+        }
+        if (!_HeaderIconProperty)
+        {
+            _HeaderIconProperty = DependencyProperty::Register(
+                L"HeaderIcon",
+                xaml_typename<IconElement>(),
+                xaml_typename<Editor::SettingsCard>(),
+                PropertyMetadata{ nullptr, PropertyChangedCallback{ &SettingsCard::_OnHeaderIconChanged } });
+        }
+        if (!_ActionIconProperty)
+        {
+            // No metadata default value — a fresh FontIcon is allocated per
+            // card in OnApplyTemplate when the user hasn't set ActionIcon
+            // explicitly. We cannot use a default FontIcon here because
+            // UIElements have a single-parent constraint (one instance can't
+            // be shared across cards) and a default string was rendering
+            // through ContentPresenter -> TextBlock, whose line-height
+            // padding made the Viewbox-scaled glyph visibly smaller than
+            // WCT's SymbolIcon default.
+            _ActionIconProperty = DependencyProperty::Register(
+                L"ActionIcon",
+                xaml_typename<IInspectable>(),
+                xaml_typename<Editor::SettingsCard>(),
+                PropertyMetadata{ nullptr });
+        }
+        if (!_ActionIconToolTipProperty)
+        {
+            _ActionIconToolTipProperty = DependencyProperty::Register(
+                L"ActionIconToolTip",
+                xaml_typename<hstring>(),
+                xaml_typename<Editor::SettingsCard>(),
+                PropertyMetadata{ box_value(hstring{}) });
+        }
+        if (!_IsClickEnabledProperty)
+        {
+            _IsClickEnabledProperty = DependencyProperty::Register(
+                L"IsClickEnabled",
+                xaml_typename<bool>(),
+                xaml_typename<Editor::SettingsCard>(),
+                PropertyMetadata{ box_value(false), PropertyChangedCallback{ &SettingsCard::_OnIsClickEnabledChanged } });
+        }
+        if (!_IsActionIconVisibleProperty)
+        {
+            _IsActionIconVisibleProperty = DependencyProperty::Register(
+                L"IsActionIconVisible",
+                xaml_typename<bool>(),
+                xaml_typename<Editor::SettingsCard>(),
+                PropertyMetadata{ box_value(true), PropertyChangedCallback{ &SettingsCard::_OnIsActionIconVisibleChanged } });
+        }
+        if (!_ContentAlignmentProperty)
+        {
+            _ContentAlignmentProperty = DependencyProperty::Register(
+                L"ContentAlignment",
+                xaml_typename<Editor::SettingsCardContentAlignment>(),
+                xaml_typename<Editor::SettingsCard>(),
+                PropertyMetadata{ box_value(Editor::SettingsCardContentAlignment::Right), PropertyChangedCallback{ &SettingsCard::_OnContentAlignmentChanged } });
+        }
+    }
+
+    AutomationPeer SettingsCard::OnCreateAutomationPeer()
+    {
+        return winrt::make<implementation::SettingsCardAutomationPeer>(*this);
+    }
+
+    // Pointer overrides: gate the ButtonBase click pipeline on IsClickEnabled.
+    // When IsClickEnabled=false, we do NOT call the base method, so the event
+    // is left unhandled and bubbles up the visual tree. This is what lets the
+    // SettingsExpander header (a ToggleButton hosting a SettingsCard with
+    // IsClickEnabled=false) toggle on a click anywhere across the header row,
+    // not just on the chevron. Mirrors the Community Toolkit's SettingsCard.cs.
+    void SettingsCard::OnPointerPressed(const winrt::Windows::UI::Xaml::Input::PointerRoutedEventArgs& e)
+    {
+        if (IsClickEnabled())
+        {
+            base_type::OnPointerPressed(e);
+            _GoToCommonState(PressedState, true);
+        }
+    }
+
+    void SettingsCard::OnPointerReleased(const winrt::Windows::UI::Xaml::Input::PointerRoutedEventArgs& e)
+    {
+        if (IsClickEnabled())
+        {
+            base_type::OnPointerReleased(e);
+            _GoToCommonState(NormalState, true);
+        }
+    }
+
+    void SettingsCard::OnApplyTemplate()
+    {
+        // Match WCT's SettingsCard.OnApplyTemplate() which calls base first so the
+        // template parts are fully wired up before any of our post-template setup
+        // (visibility, visual states, click interaction) runs.
+        base_type::OnApplyTemplate();
+
+        // Inject the shared implicit ToggleSwitch / Slider / ComboBox / TextBox
+        // dictionary so child controls in our Content slot get the Windows 11
+        // settings-page defaults without an explicit Style attribute. Bypasses
+        // the WCT Setter.Value-with-inline-ResourceDictionary pattern, which
+        // crashes WinUI 2 XAML load in this codebase.
+        StyleExtensions::EnsureImplicitStylesMergedInto(*this);
+
+        // Drop any handlers from a previous template.
+        _isEnabledChangedRevoker.revoke();
+        _contentAlignmentStatesChangedRevoker.revoke();
+        _DisableButtonInteraction();
+        if (_contentChangedToken != 0)
+        {
+            UnregisterPropertyChangedCallback(ContentControl::ContentProperty(), _contentChangedToken);
+            _contentChangedToken = 0;
+        }
+
+        _UpdateActionIconVisibility();
+        _UpdateHeaderVisibility();
+        _UpdateDescriptionVisibility();
+        _UpdateHeaderIconVisibility();
+        // Initial visual states.
+        _CheckInitialVisualState();
+        _CheckHeaderIconState();
+        _SetAccessibleContentName();
+
+        // Watch for Content changing later (we may need to refresh the AutomationProperties.Name on it).
+        _contentChangedToken = RegisterPropertyChangedCallback(ContentControl::ContentProperty(), [weakThis = get_weak()](auto&&, auto&&) {
+            if (const auto strongThis = weakThis.get())
+            {
+                strongThis->_SetAccessibleContentName();
+            }
+        });
+
+        // Apply click-interaction state.
+        if (IsClickEnabled())
+        {
+            _EnableButtonInteraction();
+        }
+
+        _isEnabledChangedRevoker = IsEnabledChanged(winrt::auto_revoke, [weakThis = get_weak()](auto&&, auto&&) {
+            if (const auto strongThis = weakThis.get())
+            {
+                strongThis->_GoToCommonState(strongThis->IsEnabled() ? NormalState : DisabledState, true);
+                strongThis->_CheckHeaderIconState();
+            }
+        });
+    }
+
+    void SettingsCard::_CheckInitialVisualState()
+    {
+        VisualStateManager::GoToState(*this, IsEnabled() ? hstring{ NormalState } : hstring{ DisabledState }, true);
+        _UpdateContentAlignmentState();
+
+        // Subscribe to ContentAlignmentStates so we can drive ContentSpacingStates
+        // whenever the alignment shifts to a stacked layout (Vertical, RightWrapped*).
+        if (const auto child{ GetTemplateChild(hstring{ ContentAlignmentStatesGroup }) })
+        {
+            if (const auto group{ child.try_as<VisualStateGroup>() })
+            {
+                _CheckVerticalSpacingState(group.CurrentState());
+                _contentAlignmentStatesChangedRevoker = group.CurrentStateChanged(winrt::auto_revoke, [weakThis = get_weak()](auto&&, const VisualStateChangedEventArgs& args) {
+                    if (const auto strongThis = weakThis.get())
+                    {
+                        strongThis->_CheckVerticalSpacingState(args.NewState());
+                    }
+                });
+            }
+        }
+    }
+
+    void SettingsCard::_CheckHeaderIconState()
+    {
+        // The Disabled common state recolors text/glyph foregrounds via the brush, but a
+        // BitmapIcon is an image and won't pick up the disabled brush. Lower its opacity
+        // instead, via the BitmapHeaderIconStates group. Mirrors the toolkit's
+        // SettingsCard.cs::CheckHeaderIconState.
+        if (HeaderIcon().try_as<BitmapIcon>())
+        {
+            VisualStateManager::GoToState(*this,
+                                          hstring{ IsEnabled() ? BitmapHeaderIconEnabledState : BitmapHeaderIconDisabledState },
+                                          true);
+        }
+        else
+        {
+            // Reset to the enabled state when a non-bitmap icon (or none) is present so the
+            // opacity setter doesn't stick around from a previous bitmap icon.
+            VisualStateManager::GoToState(*this, hstring{ BitmapHeaderIconEnabledState }, true);
+        }
+    }
+
+    void SettingsCard::_CheckVerticalSpacingState(const VisualState& state)
+    {
+        // Add row spacing whenever the content sits below the header (Vertical or RightWrapped*)
+        // AND there's both Content and (Header or Description) to space apart.
+        //
+        // For the Vertical case we read ContentAlignment() directly rather than
+        // state.Name(): our Left/Vertical visual states are empty placeholders
+        // (the actual layout work happens in _UpdateContentAlignmentState via
+        // direct C++ property writes) and an empty <VisualState> may not have
+        // its name register as CurrentState when GoToState fires in WinUI 2 —
+        // leaving stackedLayout incorrectly false. RightWrapped*, in contrast,
+        // are size-triggered visual states with real setters and ControlSizeTrigger,
+        // so their CurrentState is reliably observed.
+        const auto stateName{ state ? state.Name() : hstring{} };
+        const bool stackedLayout =
+            ContentAlignment() == Editor::SettingsCardContentAlignment::Vertical ||
+            stateName == L"RightWrapped" ||
+            stateName == L"RightWrappedNoIcon";
+
+        const bool hasContent{ static_cast<bool>(Content()) };
+        const bool hasHeaderOrDescription = !_isNullOrEmpty(Header()) || !_isNullOrEmpty(Description());
+
+        const bool shouldSpace = stackedLayout && hasContent && hasHeaderOrDescription;
+
+        VisualStateManager::GoToState(*this,
+                                      hstring{ shouldSpace ? ContentSpacingState : NoContentSpacingState },
+                                      true);
+
+        // Belt-and-suspenders for the WinUI 2 quirk: VisualState.Setters activated
+        // by C++ GoToState don't reliably engage. The ContentSpacing setter
+        // targets PART_RootGrid.RowSpacing; set it directly here as well so the
+        // Vertical / RightWrapped stacked-layout cards actually get the breathing
+        // room between header and content that WCT shows.
+        if (const auto child{ GetTemplateChild(hstring{ RootGridPart }) })
+        {
+            if (const auto rootGrid{ child.try_as<Grid>() })
+            {
+                rootGrid.RowSpacing(shouldSpace ? SettingsCardVerticalHeaderContentSpacing : 0.0);
+            }
+        }
+    }
+
+    void SettingsCard::_SetAccessibleContentName()
+    {
+        // If Header is a string and the inner Content lacks an AutomationProperties.Name, propagate the header
+        // into the content so screen readers can announce something meaningful when focus lands there.
+        const auto headerObj{ Header() };
+        if (!headerObj)
+        {
+            return;
+        }
+        const auto headerString{ unbox_value_or<hstring>(headerObj, hstring{}) };
+        if (headerString.empty())
+        {
+            return;
+        }
+
+        const auto contentObj{ Content() };
+        if (const auto element{ contentObj.try_as<UIElement>() })
+        {
+            if (Automation::AutomationProperties::GetName(element).empty())
+            {
+                // Don't override ButtonBase content (would clobber its own name) or plain text blocks.
+                if (!element.try_as<ButtonBase>() && !element.try_as<TextBlock>())
+                {
+                    Automation::AutomationProperties::SetName(element, headerString);
+                }
+            }
+        }
+    }
+
+    void SettingsCard::_EnableButtonInteraction()
+    {
+        if (_interactionEnabled)
+        {
+            return;
+        }
+        _interactionEnabled = true;
+
+        IsTabStop(true);
+        _pointerEnteredRevoker = PointerEntered(winrt::auto_revoke, [weakThis = get_weak()](auto&&, auto&&) {
+            if (const auto strongThis = weakThis.get())
+            {
+                strongThis->_GoToCommonState(PointerOverState, true);
+            }
+        });
+        _pointerExitedRevoker = PointerExited(winrt::auto_revoke, [weakThis = get_weak()](auto&&, auto&&) {
+            if (const auto strongThis = weakThis.get())
+            {
+                strongThis->_GoToCommonState(NormalState, true);
+            }
+        });
+        _pointerCaptureLostRevoker = PointerCaptureLost(winrt::auto_revoke, [weakThis = get_weak()](auto&&, auto&&) {
+            if (const auto strongThis = weakThis.get())
+            {
+                strongThis->_GoToCommonState(NormalState, true);
+            }
+        });
+        _pointerCanceledRevoker = PointerCanceled(winrt::auto_revoke, [weakThis = get_weak()](auto&&, auto&&) {
+            if (const auto strongThis = weakThis.get())
+            {
+                strongThis->_GoToCommonState(NormalState, true);
+            }
+        });
+        _previewKeyDownRevoker = PreviewKeyDown(winrt::auto_revoke, [weakThis = get_weak()](auto&&, const Windows::UI::Xaml::Input::KeyRoutedEventArgs& e) {
+            const auto strongThis = weakThis.get();
+            if (!strongThis)
+            {
+                return;
+            }
+            const auto key = e.Key();
+            if (key == Windows::System::VirtualKey::Enter || key == Windows::System::VirtualKey::Space || key == Windows::System::VirtualKey::GamepadA)
+            {
+                const auto focused{ strongThis->_GetFocusedElement() };
+                if (focused && focused.try_as<Editor::SettingsCard>() == strongThis.as<Editor::SettingsCard>())
+                {
+                    strongThis->_GoToCommonState(PressedState, true);
+                }
+            }
+        });
+        _previewKeyUpRevoker = PreviewKeyUp(winrt::auto_revoke, [weakThis = get_weak()](auto&&, const Windows::UI::Xaml::Input::KeyRoutedEventArgs& e) {
+            const auto strongThis = weakThis.get();
+            if (!strongThis)
+            {
+                return;
+            }
+            const auto key = e.Key();
+            if (key == Windows::System::VirtualKey::Enter || key == Windows::System::VirtualKey::Space || key == Windows::System::VirtualKey::GamepadA)
+            {
+                strongThis->_GoToCommonState(NormalState, true);
+            }
+        });
+    }
+
+    void SettingsCard::_DisableButtonInteraction()
+    {
+        _interactionEnabled = false;
+        IsTabStop(false);
+        _pointerEnteredRevoker.revoke();
+        _pointerExitedRevoker.revoke();
+        _pointerCaptureLostRevoker.revoke();
+        _pointerCanceledRevoker.revoke();
+        _previewKeyDownRevoker.revoke();
+        _previewKeyUpRevoker.revoke();
+    }
+
+    void SettingsCard::_GoToCommonState(const std::wstring_view& state, bool useTransitions)
+    {
+        VisualStateManager::GoToState(*this, hstring{ state }, useTransitions);
+    }
+
+    FrameworkElement SettingsCard::_GetFocusedElement()
+    {
+        if (const auto root{ XamlRoot() })
+        {
+            return FocusManager::GetFocusedElement(root).try_as<FrameworkElement>();
+        }
+        return FocusManager::GetFocusedElement().try_as<FrameworkElement>();
+    }
+
+    void SettingsCard::_UpdateActionIconVisibility()
+    {
+        if (const auto child{ GetTemplateChild(hstring{ ActionIconPresenterHolder }) })
+        {
+            if (const auto frameworkChild{ child.try_as<FrameworkElement>() })
+            {
+                frameworkChild.Visibility((IsClickEnabled() && IsActionIconVisible()) ? Visibility::Visible : Visibility::Collapsed);
+            }
+        }
+    }
+
+    void SettingsCard::_UpdateHeaderVisibility()
+    {
+        if (const auto child{ GetTemplateChild(hstring{ HeaderPresenter }) })
+        {
+            if (const auto frameworkChild{ child.try_as<FrameworkElement>() })
+            {
+                frameworkChild.Visibility(_isNullOrEmpty(Header()) ? Visibility::Collapsed : Visibility::Visible);
+            }
+        }
+    }
+
+    void SettingsCard::_UpdateDescriptionVisibility()
+    {
+        if (const auto child{ GetTemplateChild(hstring{ DescriptionPresenter }) })
+        {
+            if (const auto frameworkChild{ child.try_as<FrameworkElement>() })
+            {
+                frameworkChild.Visibility(_isNullOrEmpty(Description()) ? Visibility::Collapsed : Visibility::Visible);
+            }
+        }
+    }
+
+    void SettingsCard::_UpdateHeaderIconVisibility()
+    {
+        if (const auto child{ GetTemplateChild(hstring{ HeaderIconPresenterHolder }) })
+        {
+            if (const auto frameworkChild{ child.try_as<FrameworkElement>() })
+            {
+                frameworkChild.Visibility(HeaderIcon() ? Visibility::Visible : Visibility::Collapsed);
+            }
+        }
+    }
+
+    void SettingsCard::_UpdateContentAlignmentState()
+    {
+        // Map ContentAlignment to the visual state name *and* the corresponding
+        // direct layout values. We drive both: GoToState keeps the visual state
+        // machine in sync (so _CheckVerticalSpacingState sees the right CurrentState),
+        // but we *also* apply the layout properties directly to PART_ContentPresenter
+        // because in WinUI 2, attached-property changes (Grid.Row/Grid.Column) and
+        // HorizontalAlignment changes inside VisualState.Setters or Storyboards
+        // don't reliably engage when activated by programmatic VisualStateManager::GoToState
+        // — only by XAML StateTriggers (which is what WCT uses via tk:IsEqualStateTrigger).
+        // Until/unless an equivalent state trigger gets ported, the direct C++ set is
+        // the load-bearing path for Left/Vertical.
+        std::wstring_view state{ RightState };
+        int contentRow{ 0 };
+        int contentColumn{ 2 };
+        auto contentHA{ HorizontalAlignment::Right };
+
+        const auto alignment = ContentAlignment();
+        switch (alignment)
+        {
+        case Editor::SettingsCardContentAlignment::Left:
+            state = LeftState;
+            contentRow = 1;
+            contentColumn = 1;
+            contentHA = HorizontalAlignment::Left;
+            break;
+        case Editor::SettingsCardContentAlignment::Vertical:
+            state = VerticalState;
+            contentRow = 1;
+            contentColumn = 1;
+            contentHA = HorizontalAlignment::Stretch;
+            break;
+        default:
+            break;
+        }
+
+        VisualStateManager::GoToState(*this, hstring{ state }, true);
+
+        if (const auto child{ GetTemplateChild(hstring{ ContentPresenterPart }) })
+        {
+            if (const auto contentPresenter{ child.try_as<FrameworkElement>() })
+            {
+                Grid::SetRow(contentPresenter, contentRow);
+                Grid::SetColumn(contentPresenter, contentColumn);
+                contentPresenter.HorizontalAlignment(contentHA);
+
+                // Vertical mirrors WCT's TemplatedParent Binding setter: propagate
+                // the card's own HorizontalContentAlignment to the inner ContentPresenter
+                // so e.g. HorizontalContentAlignment="Left" + ContentAlignment="Vertical"
+                // actually left-aligns the inner content.
+                if (const auto cp{ contentPresenter.try_as<ContentPresenter>() })
+                {
+                    cp.HorizontalContentAlignment(HorizontalContentAlignment());
+                }
+            }
+        }
+
+        // Left collapses the HeaderIcon column regardless of HeaderIcon content.
+        if (const auto child{ GetTemplateChild(hstring{ HeaderIconPresenterHolder }) })
+        {
+            if (const auto headerIconHolder{ child.try_as<FrameworkElement>() })
+            {
+                if (alignment == Editor::SettingsCardContentAlignment::Left)
+                {
+                    headerIconHolder.Visibility(Visibility::Collapsed);
+                }
+                else
+                {
+                    headerIconHolder.Visibility(HeaderIcon() ? Visibility::Visible : Visibility::Collapsed);
+                }
+            }
+        }
+    }
+
+    void SettingsCard::_OnHeaderChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)
+    {
+        const auto obj{ d.try_as<Editor::SettingsCard>() };
+        const auto self = get_self<SettingsCard>(obj);
+        self->_UpdateHeaderVisibility();
+        self->_SetAccessibleContentName();
+    }
+
+    void SettingsCard::_OnDescriptionChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)
+    {
+        const auto obj{ d.try_as<Editor::SettingsCard>() };
+        get_self<SettingsCard>(obj)->_UpdateDescriptionVisibility();
+    }
+
+    void SettingsCard::_OnHeaderIconChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)
+    {
+        const auto obj{ d.try_as<Editor::SettingsCard>() };
+        const auto self = get_self<SettingsCard>(obj);
+        self->_UpdateHeaderIconVisibility();
+        // HeaderIcon type may have flipped between BitmapIcon and other icon types — re-evaluate
+        // the BitmapHeaderIcon visual state so the disabled-opacity setter is applied (or cleared).
+        self->_CheckHeaderIconState();
+    }
+
+    void SettingsCard::_OnIsClickEnabledChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)
+    {
+        const auto obj{ d.try_as<Editor::SettingsCard>() };
+        const auto self = get_self<SettingsCard>(obj);
+        self->_UpdateActionIconVisibility();
+        if (self->IsClickEnabled())
+        {
+            self->_EnableButtonInteraction();
+        }
+        else
+        {
+            self->_DisableButtonInteraction();
+        }
+    }
+
+    void SettingsCard::_OnIsActionIconVisibleChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)
+    {
+        const auto obj{ d.try_as<Editor::SettingsCard>() };
+        get_self<SettingsCard>(obj)->_UpdateActionIconVisibility();
+    }
+
+    void SettingsCard::_OnContentAlignmentChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)
+    {
+        const auto obj{ d.try_as<Editor::SettingsCard>() };
+        get_self<SettingsCard>(obj)->_UpdateContentAlignmentState();
+    }
+
+    SettingsCardAutomationPeer::SettingsCardAutomationPeer(const Editor::SettingsCard& owner) :
+        SettingsCardAutomationPeerT<SettingsCardAutomationPeer>(owner)
+    {
+    }
+
+    AutomationControlType SettingsCardAutomationPeer::GetAutomationControlTypeCore() const
+    {
+        if (const auto card{ Owner().try_as<Editor::SettingsCard>() })
+        {
+            if (card.IsClickEnabled())
+            {
+                return AutomationControlType::Button;
+            }
+        }
+        return AutomationControlType::Group;
+    }
+
+    hstring SettingsCardAutomationPeer::GetClassNameCore() const
+    {
+        return hstring{ L"SettingsCard" };
+    }
+
+    hstring SettingsCardAutomationPeer::GetNameCore() const
+    {
+        if (const auto card{ Owner().try_as<Editor::SettingsCard>() })
+        {
+            if (card.IsClickEnabled())
+            {
+                if (const auto manualName{ AutomationProperties::GetName(card) }; !manualName.empty())
+                {
+                    return manualName;
+                }
+                if (const auto headerString{ unbox_value_or<hstring>(card.Header(), hstring{}) }; !headerString.empty())
+                {
+                    return headerString;
+                }
+            }
+            // Not clickable, or no header text: fall back to AutomationProperties.Name (matching
+            // FrameworkElementAutomationPeer's default behavior).
+            return AutomationProperties::GetName(card);
+        }
+        return {};
+    }
+
+    winrt::Windows::Foundation::IInspectable SettingsCardAutomationPeer::GetPatternCore(PatternInterface patternInterface) const
+    {
+        if (patternInterface == PatternInterface::Invoke)
+        {
+            if (const auto card{ Owner().try_as<Editor::SettingsCard>() })
+            {
+                if (card.IsClickEnabled())
+                {
+                    // Only provide Invoke pattern if the card is clickable.
+                    return *this;
+                }
+            }
+            return nullptr;
+        }
+        // ButtonBaseAutomationPeer only provides Invoke; everything else returns null.
+        return nullptr;
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/SettingsCard.h b/src/cascadia/TerminalSettingsEditor/SettingsCard.h
new file mode 100644
index 00000000000..63d1de26d7b
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/SettingsCard.h
@@ -0,0 +1,100 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- SettingsCard
+
+Abstract:
+- A base control for building consistent settings experiences. Based
+  on the Windows Community Toolkit's SettingsCard.
+
+Author(s):
+- Carlos Zamora - 2026 May
+
+--*/
+
+#pragma once
+
+#include "SettingsCard.g.h"
+#include "SettingsCardAutomationPeer.g.h"
+#include "Utils.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct SettingsCard : SettingsCardT<SettingsCard>
+    {
+    public:
+        SettingsCard();
+
+        void OnApplyTemplate();
+        void OnPointerPressed(const Windows::UI::Xaml::Input::PointerRoutedEventArgs& e);
+        void OnPointerReleased(const Windows::UI::Xaml::Input::PointerRoutedEventArgs& e);
+
+        // Automation peer override.
+        Windows::UI::Xaml::Automation::Peers::AutomationPeer OnCreateAutomationPeer();
+
+        DEPENDENCY_PROPERTY(Windows::Foundation::IInspectable, Header);
+        DEPENDENCY_PROPERTY(Windows::Foundation::IInspectable, Description);
+        DEPENDENCY_PROPERTY(Windows::UI::Xaml::Controls::IconElement, HeaderIcon);
+        DEPENDENCY_PROPERTY(Windows::Foundation::IInspectable, ActionIcon);
+        DEPENDENCY_PROPERTY(hstring, ActionIconToolTip);
+        DEPENDENCY_PROPERTY(bool, IsClickEnabled);
+        DEPENDENCY_PROPERTY(bool, IsActionIconVisible);
+        DEPENDENCY_PROPERTY(Editor::SettingsCardContentAlignment, ContentAlignment);
+
+    private:
+        static void _InitializeProperties();
+        static void _OnHeaderChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
+        static void _OnDescriptionChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
+        static void _OnHeaderIconChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
+        static void _OnIsClickEnabledChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
+        static void _OnIsActionIconVisibleChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
+        static void _OnContentAlignmentChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
+
+        void _EnableButtonInteraction();
+        void _DisableButtonInteraction();
+        void _GoToCommonState(const std::wstring_view& state, bool useTransitions);
+        void _UpdateActionIconVisibility();
+        void _UpdateHeaderVisibility();
+        void _UpdateDescriptionVisibility();
+        void _UpdateHeaderIconVisibility();
+        void _UpdateContentAlignmentState();
+        void _CheckInitialVisualState();
+        void _CheckHeaderIconState();
+        void _CheckVerticalSpacingState(const Windows::UI::Xaml::VisualState& state);
+        void _SetAccessibleContentName();
+        Windows::UI::Xaml::FrameworkElement _GetFocusedElement();
+
+        bool _interactionEnabled{ false };
+        Windows::UI::Xaml::Controls::Control::IsEnabledChanged_revoker _isEnabledChangedRevoker;
+        Windows::UI::Xaml::UIElement::PointerEntered_revoker _pointerEnteredRevoker;
+        Windows::UI::Xaml::UIElement::PointerExited_revoker _pointerExitedRevoker;
+        Windows::UI::Xaml::UIElement::PointerCaptureLost_revoker _pointerCaptureLostRevoker;
+        Windows::UI::Xaml::UIElement::PointerCanceled_revoker _pointerCanceledRevoker;
+        Windows::UI::Xaml::UIElement::PreviewKeyDown_revoker _previewKeyDownRevoker;
+        Windows::UI::Xaml::UIElement::PreviewKeyUp_revoker _previewKeyUpRevoker;
+        Windows::UI::Xaml::VisualStateGroup::CurrentStateChanged_revoker _contentAlignmentStatesChangedRevoker;
+        int64_t _contentChangedToken{ 0 };
+    };
+
+    // AutomationPeer for SettingsCard. Mirrors the Community Toolkit's
+    // SettingsCardAutomationPeer: only exposes Invoke + Button control type when
+    // the card has IsClickEnabled=true; otherwise reports as a Group.
+    struct SettingsCardAutomationPeer : SettingsCardAutomationPeerT<SettingsCardAutomationPeer>
+    {
+    public:
+        SettingsCardAutomationPeer(const Editor::SettingsCard& owner);
+
+        Windows::UI::Xaml::Automation::Peers::AutomationControlType GetAutomationControlTypeCore() const;
+        hstring GetClassNameCore() const;
+        hstring GetNameCore() const;
+        winrt::Windows::Foundation::IInspectable GetPatternCore(Windows::UI::Xaml::Automation::Peers::PatternInterface patternInterface) const;
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
+{
+    BASIC_FACTORY(SettingsCard);
+    BASIC_FACTORY(SettingsCardAutomationPeer);
+}
diff --git a/src/cascadia/TerminalSettingsEditor/SettingsCard.idl b/src/cascadia/TerminalSettingsEditor/SettingsCard.idl
new file mode 100644
index 00000000000..70eb60b5f33
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/SettingsCard.idl
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    enum SettingsCardContentAlignment
+    {
+        Right,
+        Left,
+        Vertical
+    };
+
+    [default_interface] runtimeclass SettingsCard : Windows.UI.Xaml.Controls.Primitives.ButtonBase
+    {
+        SettingsCard();
+
+        Object Header;
+        static Windows.UI.Xaml.DependencyProperty HeaderProperty { get; };
+
+        Object Description;
+        static Windows.UI.Xaml.DependencyProperty DescriptionProperty { get; };
+
+        Windows.UI.Xaml.Controls.IconElement HeaderIcon;
+        static Windows.UI.Xaml.DependencyProperty HeaderIconProperty { get; };
+
+        Object ActionIcon;
+        static Windows.UI.Xaml.DependencyProperty ActionIconProperty { get; };
+
+        String ActionIconToolTip;
+        static Windows.UI.Xaml.DependencyProperty ActionIconToolTipProperty { get; };
+
+        Boolean IsClickEnabled;
+        static Windows.UI.Xaml.DependencyProperty IsClickEnabledProperty { get; };
+
+        Boolean IsActionIconVisible;
+        static Windows.UI.Xaml.DependencyProperty IsActionIconVisibleProperty { get; };
+
+        SettingsCardContentAlignment ContentAlignment;
+        static Windows.UI.Xaml.DependencyProperty ContentAlignmentProperty { get; };
+    };
+
+    [default_interface] runtimeclass SettingsCardAutomationPeer : Windows.UI.Xaml.Automation.Peers.ButtonBaseAutomationPeer
+    {
+        SettingsCardAutomationPeer(SettingsCard owner);
+    };
+}
diff --git a/src/cascadia/TerminalSettingsEditor/SettingsControlsImplicitStyles.xaml b/src/cascadia/TerminalSettingsEditor/SettingsControlsImplicitStyles.xaml
new file mode 100644
index 00000000000..b088e3456cc
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/SettingsControlsImplicitStyles.xaml
@@ -0,0 +1,57 @@
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
+    the MIT License. See LICENSE in the project root for license information.
+    
+    Implicit Styles that get copied into every SettingsCard / SettingsExpander's
+    own Resources collection at runtime via StyleExtensions::EnsureImplicitStylesMergedInto
+    (called from each control's OnApplyTemplate). This is the WinUI 2 port of WCT's
+    local:StyleExtensions.Resources Setter pattern.
+    
+    Why not the WCT Setter.Value-with-inline-ResourceDictionary approach? It
+    crashes WinUI 2 in this codebase with "CommonResources.xaml is not a valid
+    absolute URI" during XAML load. The C++ copy-into-Resources bypasses the
+    broken Setter pipeline entirely.
+    
+    Why not Append this dictionary to MergedDictionaries directly? WinUI 2
+    enforces a single-parent constraint on ResourceDictionaries in
+    MergedDictionaries: the second element to merge the same shared dict
+    throws "Element is already the child of another element". The C++ helper
+    instead iterates this dict's entries once (Style references) and copies
+    them into each target's own Resources collection. Style instances are
+    not UIElements and can safely be shared across multiple element Resources.
+    
+    Why no BasedOn references? When a ResourceDictionary is loaded via Source=
+    (standalone), it has no parent resource scope at parse time, so
+    {StaticResource SomeKeyInAnotherFile} would fail to resolve. WCT's pattern
+    works because the dict is parsed inline within the owner's resource scope.
+    
+    Practical consequence: any implicit style here MUST set every property the
+    final-rendered control needs, because an implicit style without BasedOn
+    fully replaces the framework default style — including the default
+    ControlTemplate. The ToggleSwitch entry below sets a complete custom
+    template suitable for cards. We intentionally do NOT define implicit
+    Slider / ComboBox / TextBox styles here: stripping their default template
+    by way of a minimal implicit style would lose theme-driven CornerRadius,
+    PointerOver/Pressed brushes, the drop-shadow popup, etc. Call sites that
+    need a card-specific MinWidth set it explicitly on the instance.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!--
+        Right-aligned, compact ToggleSwitch. Replaces the WCT
+        RightAlignedCompactToggleSwitchStyle the toolkit uses as BasedOn.
+        OffContent / OnContent are blanked so the default "Off" / "On" labels
+        don't steal horizontal space next to the switch.
+    -->
+    <Style TargetType="ToggleSwitch">
+        <Setter Property="HorizontalAlignment" Value="Right" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="Margin" Value="0,0,10,0" />
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="OffContent" Value="" />
+        <Setter Property="OnContent" Value="" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/cascadia/TerminalSettingsEditor/SettingsControlsStyle.xaml b/src/cascadia/TerminalSettingsEditor/SettingsControlsStyle.xaml
new file mode 100644
index 00000000000..a57be63b3ba
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/SettingsControlsStyle.xaml
@@ -0,0 +1,1100 @@
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
+    the MIT License. See LICENSE in the project root for license information.
+    
+    Default styles for SettingsCard and SettingsExpander.
+    
+    These were ported from the Windows Community Toolkit
+    (components/SettingsControls) and adapted for this project's WinUI 2 host:
+    - The Card's responsive RightWrapped/RightWrappedNoIcon visual states are
+    driven by local:ControlSizeTrigger (which this project ports from the
+    toolkit's tk:ControlSizeTrigger).
+    - The Card's PointerOver/Pressed visual states do NOT toggle
+    muxc:AnimatedIcon.State on PART_RootGrid. The toolkit uses this to drive
+    a Lottie chevron animation for the ActionIcon; WinUI 2 doesn't ship the
+    underlying AnimatedChevronUpDownSmallVisualSource, so we use a static
+    FontIcon ActionIcon throughout.
+    - The Expander uses a hand-rolled muxc:Expander template
+    (SettingsExpanderExpanderStyle below) so the header can pick up the
+    matching SettingsCard hover/press brushes; the toolkit's WinUI 3 version
+    also rolls its own template for the same reason.
+    - The Expander template's ExpandDirection=Up branch is intentionally
+    abridged because it references a WinUI 3 system style
+    (ExpanderHeaderUpStyle) that isn't shipped in WinUI 2.
+    - The chevron rotation is a RotateTransform driven by a DoubleAnimation
+    (instead of the toolkit's Lottie AnimatedChevronUpDownSmallVisualSource,
+    which is again WinUI 3 only).
+    - The WCT StyleExtensions.Resources injection pattern (auto-aligning
+    ToggleSwitch / Slider / ComboBox / TextBox children of cards) could not
+    be made to work in WinUI 2 in this codebase as an XAML Setter — see
+    StyleExtensions.cpp::EnsureImplicitStylesMergedInto, which injects
+    SettingsControlsImplicitStyles.xaml from C++ in OnApplyTemplate
+    instead. The inline-Style approach in that file is intentionally
+    looser than the toolkit's BasedOn pattern because a standalone-loaded
+    ResourceDictionary can't resolve {StaticResource} across files.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="using:Microsoft.Terminal.Settings.Editor"
+                    xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
+
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <StaticResource x:Key="SettingsCardBackground"
+                            ResourceKey="CardBackgroundFillColorDefaultBrush" />
+            <StaticResource x:Key="SettingsCardBackgroundPointerOver"
+                            ResourceKey="ControlFillColorSecondaryBrush" />
+            <StaticResource x:Key="SettingsCardBackgroundPressed"
+                            ResourceKey="ControlFillColorTertiaryBrush" />
+            <StaticResource x:Key="SettingsCardBackgroundDisabled"
+                            ResourceKey="ControlFillColorDisabledBrush" />
+
+            <StaticResource x:Key="SettingsCardForeground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="SettingsCardForegroundPointerOver"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="SettingsCardForegroundPressed"
+                            ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="SettingsCardForegroundDisabled"
+                            ResourceKey="TextFillColorDisabledBrush" />
+
+            <StaticResource x:Key="SettingsCardBorderBrush"
+                            ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="SettingsCardBorderBrushPointerOver"
+                            ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="SettingsCardBorderBrushPressed"
+                            ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="SettingsCardBorderBrushDisabled"
+                            ResourceKey="ControlStrokeColorDefaultBrush" />
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="Light">
+            <StaticResource x:Key="SettingsCardBackground"
+                            ResourceKey="CardBackgroundFillColorDefaultBrush" />
+            <StaticResource x:Key="SettingsCardBackgroundPointerOver"
+                            ResourceKey="ControlFillColorSecondaryBrush" />
+            <StaticResource x:Key="SettingsCardBackgroundPressed"
+                            ResourceKey="ControlFillColorTertiaryBrush" />
+            <StaticResource x:Key="SettingsCardBackgroundDisabled"
+                            ResourceKey="ControlFillColorDisabledBrush" />
+
+            <StaticResource x:Key="SettingsCardForeground"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="SettingsCardForegroundPointerOver"
+                            ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="SettingsCardForegroundPressed"
+                            ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="SettingsCardForegroundDisabled"
+                            ResourceKey="TextFillColorDisabledBrush" />
+
+            <StaticResource x:Key="SettingsCardBorderBrush"
+                            ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="SettingsCardBorderBrushPointerOver"
+                            ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="SettingsCardBorderBrushPressed"
+                            ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="SettingsCardBorderBrushDisabled"
+                            ResourceKey="ControlStrokeColorDefaultBrush" />
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="HighContrast">
+            <StaticResource x:Key="SettingsCardBackground"
+                            ResourceKey="SystemColorButtonFaceColorBrush" />
+            <StaticResource x:Key="SettingsCardBackgroundPointerOver"
+                            ResourceKey="SystemColorHighlightTextColorBrush" />
+            <StaticResource x:Key="SettingsCardBackgroundPressed"
+                            ResourceKey="SystemColorHighlightTextColorBrush" />
+            <StaticResource x:Key="SettingsCardBackgroundDisabled"
+                            ResourceKey="SystemControlBackgroundBaseLowBrush" />
+
+            <StaticResource x:Key="SettingsCardForeground"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="SettingsCardForegroundPointerOver"
+                            ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="SettingsCardForegroundPressed"
+                            ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="SettingsCardForegroundDisabled"
+                            ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+            <StaticResource x:Key="SettingsCardBorderBrush"
+                            ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="SettingsCardBorderBrushPointerOver"
+                            ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="SettingsCardBorderBrushPressed"
+                            ResourceKey="SystemColorHighlightTextColorBrush" />
+            <StaticResource x:Key="SettingsCardBorderBrushDisabled"
+                            ResourceKey="SystemControlDisabledTransparentBrush" />
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <Thickness x:Key="SettingsCardBorderThickness">1</Thickness>
+    <Thickness x:Key="SettingsCardPadding">16,16,16,16</Thickness>
+    <x:Double x:Key="SettingsCardMinWidth">148</x:Double>
+    <x:Double x:Key="SettingsCardMinHeight">68</x:Double>
+    <x:Double x:Key="SettingsCardDescriptionFontSize">12</x:Double>
+    <x:Double x:Key="SettingsCardHeaderIconMaxSize">20</x:Double>
+    <x:Double x:Key="SettingsCardLeftIndention">0</x:Double>
+    <x:Double x:Key="SettingsCardContentMinWidth">120</x:Double>
+    <Thickness x:Key="SettingsCardHeaderIconMargin">2,0,20,0</Thickness>
+    <Thickness x:Key="SettingsCardActionIconMargin">14,0,0,0</Thickness>
+    <x:Double x:Key="SettingsCardActionIconMaxSize">13</x:Double>
+    <x:Double x:Key="SettingsCardBitmapIconDisabledOpacity">0.4</x:Double>
+    <x:Double x:Key="SettingsCardVerticalHeaderContentSpacing">8</x:Double>
+    <x:Double x:Key="SettingsCardWrapThreshold">476</x:Double>
+    <x:Double x:Key="SettingsCardWrapNoIconThreshold">286</x:Double>
+
+    <Thickness x:Key="SettingsExpanderHeaderPadding">16,16,4,16</Thickness>
+    <Thickness x:Key="SettingsExpanderItemPadding">58,8,44,8</Thickness>
+    <Thickness x:Key="ClickableSettingsExpanderItemPadding">58,8,16,8</Thickness>
+    <Thickness x:Key="SettingsExpanderItemBorderThickness">0,1,0,0</Thickness>
+    <x:Double x:Key="SettingsExpanderContentMinHeight">16</x:Double>
+    <x:Double x:Key="SettingsExpanderChevronButtonWidth">32</x:Double>
+    <x:Double x:Key="SettingsExpanderChevronButtonHeight">32</x:Double>
+    <x:String x:Key="ExpanderChevronDownGlyph">&#xE972;</x:String>
+
+    <!--
+        Hardcoded English string for the chevron tooltip on a collapsed SettingsExpander.
+        Intentionally not localized: matches the Windows Community Toolkit's own ship pattern
+        for SettingsExpander, where the tooltip lives as a static <x:String> resource in the
+        control's default style. Upstream:
+        https://github.com/CommunityToolkit/Windows/blob/b1d8231b5ee810f4e4264be17d9c343ee2785ede/components/SettingsControls/src/SettingsExpander/SettingsExpander.xaml#L14
+    -->
+    <x:String x:Key="SettingsExpanderChevronToolTip">Show all settings</x:String>
+
+    <local:CornerRadiusConverter x:Key="CornerRadiusConverter" />
+    <local:TopCornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" />
+    <local:BottomCornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" />
+
+    <!--  ============ SettingsCard ============  -->
+
+    <!--
+        Card style for items that live inside a SettingsExpander:
+        no left/right rounded corners, a 1-pixel top border between siblings,
+        deeper left padding to line up with the parent expander's content.
+    -->
+    <Style x:Key="DefaultSettingsExpanderItemStyle"
+           BasedOn="{StaticResource DefaultSettingsCardStyle}"
+           TargetType="local:SettingsCard">
+        <Setter Property="BorderThickness" Value="{StaticResource SettingsExpanderItemBorderThickness}" />
+        <Setter Property="MinHeight" Value="52" />
+        <Setter Property="Padding" Value="{StaticResource SettingsExpanderItemPadding}" />
+        <Setter Property="CornerRadius" Value="0" />
+    </Style>
+
+    <!--  Variant of DefaultSettingsExpanderItemStyle for clickable items; trims the right padding to make room for the chevron.  -->
+    <Style x:Key="ClickableSettingsExpanderItemStyle"
+           BasedOn="{StaticResource DefaultSettingsExpanderItemStyle}"
+           TargetType="local:SettingsCard">
+        <Setter Property="Padding" Value="{StaticResource ClickableSettingsExpanderItemPadding}" />
+    </Style>
+
+    <!--  Selector that picks Default vs Clickable item style based on SettingsCard.IsClickEnabled.  -->
+    <local:SettingsExpanderItemStyleSelector x:Key="SettingsExpanderItemStyleSelector"
+                                             ClickableStyle="{StaticResource ClickableSettingsExpanderItemStyle}"
+                                             DefaultStyle="{StaticResource DefaultSettingsExpanderItemStyle}" />
+
+    <Style BasedOn="{StaticResource DefaultSettingsCardStyle}"
+           TargetType="local:SettingsCard" />
+
+    <Style x:Key="DefaultSettingsCardStyle"
+           TargetType="local:SettingsCard">
+        <Setter Property="Background" Value="{ThemeResource SettingsCardBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource SettingsCardForeground}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource SettingsCardBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{StaticResource SettingsCardBorderThickness}" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="MinHeight" Value="{StaticResource SettingsCardMinHeight}" />
+        <Setter Property="MinWidth" Value="{StaticResource SettingsCardMinWidth}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+        <Setter Property="Padding" Value="{StaticResource SettingsCardPadding}" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="FocusVisualMargin" Value="-3" />
+        <!--
+            Implicit ToggleSwitch / Slider / ComboBox / TextBox defaults are
+            injected from C++ (StyleExtensions::EnsureImplicitStylesMergedInto,
+            called from SettingsCard::OnApplyTemplate), pulling from
+            SettingsControlsImplicitStyles.xaml. We can't use WCT's
+            local:StyleExtensions.Resources Setter pattern — an inline
+            ResourceDictionary as a Setter.Value crashes WinUI 2 in this
+            codebase with "CommonResources.xaml is not a valid absolute URI".
+        -->
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:SettingsCard">
+                    <Grid x:Name="PART_RootGrid"
+                          MinWidth="{TemplateBinding MinWidth}"
+                          MinHeight="{TemplateBinding MinHeight}"
+                          MaxWidth="{TemplateBinding MaxWidth}"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid.BackgroundTransition>
+                            <BrushTransition Duration="0:0:0.083" />
+                        </Grid.BackgroundTransition>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"
+                                              MinWidth="{ThemeResource SettingsCardLeftIndention}" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <Viewbox x:Name="PART_HeaderIconPresenterHolder"
+                                 Grid.RowSpan="1"
+                                 MaxWidth="{ThemeResource SettingsCardHeaderIconMaxSize}"
+                                 MaxHeight="{ThemeResource SettingsCardHeaderIconMaxSize}"
+                                 Margin="{ThemeResource SettingsCardHeaderIconMargin}">
+                            <ContentPresenter x:Name="PART_HeaderIconPresenter"
+                                              AutomationProperties.AccessibilityView="Raw"
+                                              Content="{TemplateBinding HeaderIcon}" />
+                        </Viewbox>
+
+                        <StackPanel x:Name="HeaderPanel"
+                                    Grid.Column="1"
+                                    Margin="0,0,24,0"
+                                    VerticalAlignment="Center"
+                                    Orientation="Vertical">
+                            <ContentPresenter x:Name="PART_HeaderPresenter"
+                                              HorizontalAlignment="Left"
+                                              Content="{TemplateBinding Header}"
+                                              TextWrapping="Wrap" />
+
+                            <ContentPresenter x:Name="PART_DescriptionPresenter"
+                                              Content="{TemplateBinding Description}"
+                                              FontSize="{ThemeResource SettingsCardDescriptionFontSize}"
+                                              Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                              TextWrapping="Wrap">
+                                <ContentPresenter.Resources>
+                                    <Style BasedOn="{StaticResource CaptionTextBlockStyle}"
+                                           TargetType="TextBlock">
+                                        <Setter Property="TextWrapping" Value="Wrap" />
+                                    </Style>
+                                </ContentPresenter.Resources>
+                            </ContentPresenter>
+                        </StackPanel>
+
+                        <ContentPresenter x:Name="PART_ContentPresenter"
+                                          Grid.Column="2"
+                                          HorizontalAlignment="Right"
+                                          VerticalAlignment="Center"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          Content="{TemplateBinding Content}" />
+
+                        <!--
+                            Action-icon rendering:
+                            Instead of a Viewbox + ContentPresenter (which in WinUI 2 scales the
+                            icon's *em-box* via TextBlock-style measure, scaling the small glyph
+                            inside proportionally smaller than the visible 13x13 box), we render
+                            a fixed-size FontIcon directly. The icon's FontSize controls visible
+                            size; the FontFamily fallback list prefers Segoe Fluent Icons (Windows
+                            11, heavier strokes) before Segoe MDL2 Assets (Windows 10 fallback).
+                            
+                            Preserves the existing template-part names:
+                            * PART_ActionIconPresenterHolder — C++ flips Visibility on this for
+                            IsClickEnabled/IsActionIconVisible gating.
+                            * PART_ActionIconPresenter — the Disabled visual state animates
+                            Foreground here.
+                            
+                            ActionIcon / ActionIconToolTip / ActionIcon-as-IconElement DP usage is
+                            *not* honored by this layout; the IDL properties stay for backward
+                            API compatibility but no existing call site sets them. ActionIconToolTip
+                            is still wired through to the FontIcon's tooltip.
+                        -->
+                        <Border x:Name="PART_ActionIconPresenterHolder"
+                                Grid.RowSpan="2"
+                                Grid.Column="3"
+                                Margin="{ThemeResource SettingsCardActionIconMargin}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                ToolTipService.ToolTip="{TemplateBinding ActionIconToolTip}"
+                                Visibility="Collapsed">
+                            <FontIcon x:Name="PART_ActionIconPresenter"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      AutomationProperties.AccessibilityView="Raw"
+                                      FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
+                                      FontSize="16"
+                                      Glyph="&#xE974;"
+                                      IsTextScaleFactorEnabled="False" />
+                        </Border>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_RootGrid"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBackgroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_RootGrid"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBorderBrushPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_RootGrid"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBackgroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_RootGrid"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBorderBrushPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_DescriptionPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ActionIconPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderIconPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_DescriptionPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="BitmapHeaderIconStates">
+                                <VisualState x:Name="BitmapHeaderIconEnabled" />
+                                <VisualState x:Name="BitmapHeaderIconDisabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_HeaderIconPresenterHolder.Opacity" Value="{StaticResource SettingsCardBitmapIconDisabledOpacity}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="ContentAlignmentStates">
+                                <VisualState x:Name="Right" />
+
+                                <!--  Whenever the control width is less than SettingsCardWrapThreshold, the Content is below the Header/Description.  -->
+                                <VisualState x:Name="RightWrapped">
+                                    <VisualState.StateTriggers>
+                                        <local:ControlSizeTrigger MinWidth="{StaticResource SettingsCardWrapNoIconThreshold}"
+                                                                  MaxWidth="{StaticResource SettingsCardWrapThreshold}"
+                                                                  TargetElement="{Binding ElementName=PART_RootGrid}" />
+                                    </VisualState.StateTriggers>
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_ContentPresenter.(Grid.Row)" Value="1" />
+                                        <Setter Target="PART_ContentPresenter.(Grid.Column)" Value="1" />
+                                        <Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
+                                        <Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="Left" />
+                                        <Setter Target="HeaderPanel.Margin" Value="0" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <!--  For even smaller widths: the HeaderIcon is collapsed.  -->
+                                <VisualState x:Name="RightWrappedNoIcon">
+                                    <VisualState.StateTriggers>
+                                        <local:ControlSizeTrigger MaxWidth="{StaticResource SettingsCardWrapNoIconThreshold}"
+                                                                  TargetElement="{Binding ElementName=PART_RootGrid}" />
+                                    </VisualState.StateTriggers>
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_HeaderIconPresenterHolder.Visibility" Value="Collapsed" />
+                                        <Setter Target="PART_ContentPresenter.(Grid.Row)" Value="1" />
+                                        <Setter Target="PART_ContentPresenter.(Grid.Column)" Value="1" />
+                                        <Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
+                                        <Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="Left" />
+                                        <Setter Target="HeaderPanel.Margin" Value="0" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <!--
+                                    Left / Vertical states are present so the visual state group
+                                    exists (so SettingsCard::_CheckVerticalSpacingState can see the
+                                    right CurrentState when the alignment changes). The actual
+                                    layout work happens in SettingsCard::_UpdateContentAlignmentState
+                                    via direct property writes on PART_ContentPresenter — in WinUI 2,
+                                    attached-property changes ((Grid.Row)/(Grid.Column)) inside
+                                    VisualState.Setters or Storyboards don't reliably engage when
+                                    activated by programmatic VisualStateManager::GoToState (they
+                                    work when activated by a XAML StateTrigger, which is how WCT
+                                    drives these via tk:IsEqualStateTrigger).
+                                -->
+                                <VisualState x:Name="Left" />
+                                <VisualState x:Name="Vertical" />
+                            </VisualStateGroup>
+
+                            <!--  Drives the row spacing between the header/description and the content when they share a column (Vertical or RightWrapped layouts).  -->
+                            <VisualStateGroup x:Name="ContentSpacingStates">
+                                <VisualState x:Name="NoContentSpacing" />
+                                <VisualState x:Name="ContentSpacing">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_RootGrid.RowSpacing" Value="{StaticResource SettingsCardVerticalHeaderContentSpacing}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--  ============ SettingsExpander ============  -->
+
+    <Style BasedOn="{StaticResource DefaultSettingsExpanderStyle}"
+           TargetType="local:SettingsExpander" />
+
+    <Style x:Key="DefaultSettingsExpanderStyle"
+           TargetType="local:SettingsExpander">
+        <Setter Property="Background" Value="{ThemeResource SettingsCardBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource SettingsCardForeground}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource SettingsCardBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{StaticResource SettingsCardBorderThickness}" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="MinHeight" Value="{StaticResource SettingsCardMinHeight}" />
+        <Setter Property="MinWidth" Value="{StaticResource SettingsCardMinWidth}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="ItemContainerStyleSelector" Value="{StaticResource SettingsExpanderItemStyleSelector}" />
+        <!--  Same C++-side implicit-styles injection as SettingsCard — see comment on that style.  -->
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:SettingsExpander">
+                    <muxc:Expander x:Name="PART_Expander"
+                                   MinWidth="{TemplateBinding MinWidth}"
+                                   MinHeight="{TemplateBinding MinHeight}"
+                                   HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                   AutomationProperties.AccessibilityView="Raw"
+                                   CornerRadius="{TemplateBinding CornerRadius}"
+                                   IsExpanded="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Style="{StaticResource SettingsExpanderExpanderStyle}">
+                        <muxc:Expander.Header>
+                            <local:SettingsCard Padding="{StaticResource SettingsExpanderHeaderPadding}"
+                                                VerticalAlignment="Center"
+                                                Background="Transparent"
+                                                BorderThickness="0"
+                                                Content="{TemplateBinding Content}"
+                                                Description="{TemplateBinding Description}"
+                                                FontFamily="{TemplateBinding FontFamily}"
+                                                Header="{TemplateBinding Header}"
+                                                HeaderIcon="{TemplateBinding HeaderIcon}"
+                                                IsClickEnabled="False" />
+                        </muxc:Expander.Header>
+                        <muxc:Expander.Content>
+                            <!--  CornerRadius is filtered to bottom-only so the items panel visually stitches to the rounded bottom of the expander (matches WCT).  -->
+                            <Grid CornerRadius="{Binding CornerRadius, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <ContentPresenter Content="{TemplateBinding ItemsHeader}" />
+                                <!--
+                                    Use ItemsControl + StackPanel rather than ItemsRepeater so every
+                                    Items entry is realized eagerly. ItemsRepeater inside an Expander
+                                    inside the Settings page's outer ScrollViewer only realized
+                                    index 0 — the EffectiveViewport propagated through the ScrollViewer
+                                    was 0 px at the moment the expand storyboard ran, and StackLayout's
+                                    cache length is relative to viewport so 0 * anything is still 0.
+                                    Settings expanders rarely hold more than a handful of cards so
+                                    losing virtualization is a non-issue.
+                                -->
+                                <ItemsControl x:Name="PART_ItemsHost"
+                                              Grid.Row="1"
+                                              IsTabStop="False"
+                                              ItemTemplate="{Binding ItemTemplate, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}">
+                                    <ItemsControl.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <StackPanel Orientation="Vertical" />
+                                        </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
+                                </ItemsControl>
+                                <ContentPresenter Grid.Row="2"
+                                                  Content="{TemplateBinding ItemsFooter}" />
+                            </Grid>
+                        </muxc:Expander.Content>
+                    </muxc:Expander>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        Custom muxc:Expander template used inside SettingsExpander. Ported from
+        the Windows Community Toolkit's SettingsExpanderExpanderStyle so that the
+        Expander header/border match a sibling SettingsCard (hover, press, and
+        disabled brushes), and so the expanded body visually "stitches" to the
+        header via the CornerRadiusFilterConverters.
+        
+        Notes vs. toolkit:
+        - The ExpandDirection=Up branch is omitted: SettingsExpander in the
+        Settings Editor always expands downward, and the toolkit's Up state
+        references a WinUI 3 system style (ExpanderHeaderUpStyle) that doesn't
+        ship in WinUI 2.
+        - Theme resources prefixed with ExpanderHeader*/ExpanderChevron*/
+        ExpanderContent* come from the WinUI 2 muxc:Expander default theme.
+    -->
+    <Style x:Key="SettingsExpanderExpanderStyle"
+           TargetType="muxc:Expander">
+        <Setter Property="Background" Value="{ThemeResource ExpanderContentBackground}" />
+        <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+        <Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
+        <Setter Property="MinHeight" Value="{ThemeResource ExpanderMinHeight}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource ExpanderContentDownBorderThickness}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource ExpanderContentBorderBrush}" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="muxc:Expander">
+                    <Grid MinWidth="{TemplateBinding MinWidth}"
+                          MaxWidth="{TemplateBinding MaxWidth}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition x:Name="Row0"
+                                           Height="Auto" />
+                            <RowDefinition x:Name="Row1"
+                                           Height="*" />
+                        </Grid.RowDefinitions>
+
+                        <ToggleButton x:Name="ExpanderHeader"
+                                      MinHeight="{TemplateBinding MinHeight}"
+                                      Padding="{StaticResource ExpanderHeaderPadding}"
+                                      HorizontalAlignment="Stretch"
+                                      HorizontalContentAlignment="{StaticResource ExpanderHeaderHorizontalContentAlignment}"
+                                      VerticalContentAlignment="{StaticResource ExpanderHeaderVerticalContentAlignment}"
+                                      AutomationProperties.AutomationId="ExpanderToggleButton"
+                                      AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
+                                      BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                                      BorderBrush="{ThemeResource ExpanderHeaderBorderBrush}"
+                                      BorderThickness="{ThemeResource ExpanderHeaderBorderThickness}"
+                                      Content="{TemplateBinding Header}"
+                                      ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                      ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                      CornerRadius="{TemplateBinding CornerRadius}"
+                                      IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                      IsEnabled="{TemplateBinding IsEnabled}"
+                                      IsTabStop="True"
+                                      Style="{StaticResource SettingsExpanderHeaderDownStyle}" />
+
+                        <!--  The clip is a composition clip applied in code (by muxc:Expander).  -->
+                        <Border x:Name="ExpanderContentClip"
+                                Grid.Row="1">
+                            <Border x:Name="ExpanderContent"
+                                    MinHeight="{StaticResource SettingsExpanderContentMinHeight}"
+                                    Padding="{TemplateBinding Padding}"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch"
+                                    Background="{TemplateBinding Background}"
+                                    BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{StaticResource ExpanderContentDownBorderThickness}"
+                                    CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
+                                    Visibility="Collapsed">
+                                <ContentPresenter Margin="0,-2,0,0"
+                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+                                <Border.RenderTransform>
+                                    <CompositeTransform />
+                                </Border.RenderTransform>
+                            </Border>
+                        </Border>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="ExpandStates">
+                                <VisualState x:Name="ExpandUp">
+                                    <VisualState.Setters>
+                                        <Setter Target="ExpanderHeader.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+                                        <Setter Target="ExpanderContent.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                    <VisualState.Storyboard>
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent"
+                                                                           Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
+                                                <DiscreteDoubleKeyFrame KeyTime="0"
+                                                                        Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ContentHeight}" />
+                                                <SplineDoubleKeyFrame KeySpline="0.0, 0.0, 0.0, 1.0"
+                                                                      KeyTime="0:0:0.333"
+                                                                      Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState.Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="CollapseDown">
+                                    <VisualState.Setters>
+                                        <Setter Target="ExpanderContent.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                    <VisualState.Storyboard>
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent"
+                                                                           Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
+                                                <DiscreteDoubleKeyFrame KeyTime="0"
+                                                                        Value="0" />
+                                                <SplineDoubleKeyFrame KeySpline="1.0, 1.0, 0.0, 1.0"
+                                                                      KeyTime="0:0:0.167"
+                                                                      Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ContentHeight}" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState.Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="ExpandDown">
+                                    <VisualState.Setters>
+                                        <Setter Target="ExpanderHeader.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+                                        <Setter Target="ExpanderContent.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                    <VisualState.Storyboard>
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent"
+                                                                           Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
+                                                <DiscreteDoubleKeyFrame KeyTime="0"
+                                                                        Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeContentHeight}" />
+                                                <SplineDoubleKeyFrame KeySpline="0.0, 0.0, 0.0, 1.0"
+                                                                      KeyTime="0:0:0.333"
+                                                                      Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState.Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="CollapseUp">
+                                    <VisualState.Setters>
+                                        <Setter Target="ExpanderContent.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                    <VisualState.Storyboard>
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent"
+                                                                           Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
+                                                <DiscreteDoubleKeyFrame KeyTime="0"
+                                                                        Value="0" />
+                                                <SplineDoubleKeyFrame KeySpline="1.0, 1.0, 0.0, 1.0"
+                                                                      KeyTime="0:0:0.167"
+                                                                      Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeContentHeight}" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState.Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <!--
+                                Up direction state intentionally omits the toolkit's
+                                "Setter Target=ExpanderHeader.Style = ExpanderHeaderUpStyle" because
+                                that style is a WinUI 3 system resource not shipped in WinUI 2.
+                                The remaining safe setters (corner radius / row placement) are kept
+                                so the muxc:Expander internal direction logic still has a state to
+                                land on when ExpandDirection=Up.
+                            -->
+                            <VisualStateGroup x:Name="ExpandDirectionStates">
+                                <VisualState x:Name="Down" />
+                                <VisualState x:Name="Up">
+                                    <VisualState.Setters>
+                                        <Setter Target="ExpanderContent.BorderThickness" Value="{ThemeResource ExpanderContentUpBorderThickness}" />
+                                        <Setter Target="ExpanderContent.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+                                        <Setter Target="ExpanderHeader.(Grid.Row)" Value="1" />
+                                        <Setter Target="ExpanderContentClip.(Grid.Row)" Value="0" />
+                                        <Setter Target="Row0.Height" Value="*" />
+                                        <Setter Target="Row1.Height" Value="Auto" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        Header ToggleButton style for the custom Expander template above.
+        Drives header coloring to match a sibling SettingsCard, and animates
+        the chevron's rotation between 0° (collapsed) and 180° (expanded) via
+        a DoubleAnimation on a RotateTransform. (The toolkit uses a Lottie
+        AnimatedIcon morph; see comment on ExpandCollapseChevron below.)
+    -->
+    <Style x:Key="SettingsExpanderHeaderDownStyle"
+           TargetType="ToggleButton">
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid x:Name="ToggleButtonGrid"
+                          Width="{TemplateBinding Width}"
+                          MinWidth="{TemplateBinding MinWidth}"
+                          MinHeight="{TemplateBinding MinHeight}"
+                          MaxWidth="{TemplateBinding MaxWidth}"
+                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                          BorderBrush="{ThemeResource ExpanderHeaderBorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          AutomationProperties.AccessibilityView="Raw"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTransitions="{TemplateBinding ContentTransitions}"
+                                          Foreground="{TemplateBinding Foreground}" />
+
+                        <ContentControl x:Name="ExpandCollapseChevronBorder"
+                                        Grid.Column="1"
+                                        Width="{StaticResource SettingsExpanderChevronButtonWidth}"
+                                        Height="{StaticResource SettingsExpanderChevronButtonHeight}"
+                                        Margin="0,0,8,0"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        HorizontalContentAlignment="Center"
+                                        VerticalContentAlignment="Center"
+                                        Background="{ThemeResource ExpanderChevronBackground}"
+                                        BorderBrush="{ThemeResource ExpanderChevronBorderBrush}"
+                                        BorderThickness="{ThemeResource ExpanderChevronBorderThickness}"
+                                        CornerRadius="{ThemeResource ControlCornerRadius}"
+                                        FocusVisualMargin="-3"
+                                        IsTabStop="False"
+                                        ToolTipService.ToolTip="{StaticResource SettingsExpanderChevronToolTip}"
+                                        UseSystemFocusVisuals="True">
+                            <!--
+                                Toolkit uses a muxc:AnimatedIcon wrapping AnimatedChevronUpDownSmallVisualSource.
+                                That visual source isn't available in the WinUI 2 build the editor targets, so
+                                we fall back to a static FontIcon and drive a RotateTransform via the
+                                Checked*/unchecked CommonStates Storyboards (DoubleAnimation between 0° and 180°).
+                                This reproduces the smooth expand/collapse chevron animation visually, even
+                                without the toolkit's Lottie morph.
+                            -->
+                            <FontIcon x:Name="ExpandCollapseChevron"
+                                      Width="16"
+                                      Height="16"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      AutomationProperties.AccessibilityView="Raw"
+                                      FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                      FontSize="16"
+                                      Foreground="{ThemeResource ExpanderChevronForeground}"
+                                      Glyph="{StaticResource ExpanderChevronDownGlyph}"
+                                      IsTextScaleFactorEnabled="False"
+                                      RenderTransformOrigin="0.5, 0.5">
+                                <FontIcon.RenderTransform>
+                                    <RotateTransform x:Name="ExpandCollapseChevronRotation" Angle="0" />
+                                </FontIcon.RenderTransform>
+                            </FontIcon>
+                        </ContentControl>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderHeaderForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderChevronForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBackground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotation"
+                                                         Storyboard.TargetProperty="Angle"
+                                                         To="0"
+                                                         Duration="0:0:0.167">
+                                            <DoubleAnimation.EasingFunction>
+                                                <CubicEase EasingMode="EaseOut" />
+                                            </DoubleAnimation.EasingFunction>
+                                        </DoubleAnimation>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderHeaderForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBorderBrushPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderChevronPointerOverForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBackgroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotation"
+                                                         Storyboard.TargetProperty="Angle"
+                                                         To="0"
+                                                         Duration="0:0:0.167">
+                                            <DoubleAnimation.EasingFunction>
+                                                <CubicEase EasingMode="EaseOut" />
+                                            </DoubleAnimation.EasingFunction>
+                                        </DoubleAnimation>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderHeaderForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBorderBrushPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderChevronPressedForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBackgroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotation"
+                                                         Storyboard.TargetProperty="Angle"
+                                                         To="0"
+                                                         Duration="0:0:0.167">
+                                            <DoubleAnimation.EasingFunction>
+                                                <CubicEase EasingMode="EaseOut" />
+                                            </DoubleAnimation.EasingFunction>
+                                        </DoubleAnimation>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderHeaderDisabledForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBorderBrushDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderHeaderDisabledForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotation"
+                                                         Storyboard.TargetProperty="Angle"
+                                                         To="0"
+                                                         Duration="0:0:0.167">
+                                            <DoubleAnimation.EasingFunction>
+                                                <CubicEase EasingMode="EaseOut" />
+                                            </DoubleAnimation.EasingFunction>
+                                        </DoubleAnimation>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Checked">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderHeaderForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderChevronForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderChevronBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderChevronBackground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotation"
+                                                         Storyboard.TargetProperty="Angle"
+                                                         To="180"
+                                                         Duration="0:0:0.167">
+                                            <DoubleAnimation.EasingFunction>
+                                                <CubicEase EasingMode="EaseOut" />
+                                            </DoubleAnimation.EasingFunction>
+                                        </DoubleAnimation>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="CheckedPointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderHeaderForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderChevronPointerOverForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBorderBrushPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBackgroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotation"
+                                                         Storyboard.TargetProperty="Angle"
+                                                         To="180"
+                                                         Duration="0:0:0.167">
+                                            <DoubleAnimation.EasingFunction>
+                                                <CubicEase EasingMode="EaseOut" />
+                                            </DoubleAnimation.EasingFunction>
+                                        </DoubleAnimation>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="CheckedPressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderHeaderForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderChevronPressedForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBorderBrushPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBackgroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotation"
+                                                         Storyboard.TargetProperty="Angle"
+                                                         To="180"
+                                                         Duration="0:0:0.167">
+                                            <DoubleAnimation.EasingFunction>
+                                                <CubicEase EasingMode="EaseOut" />
+                                            </DoubleAnimation.EasingFunction>
+                                        </DoubleAnimation>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="CheckedDisabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderHeaderDisabledForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource ExpanderHeaderDisabledForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource SettingsCardBorderBrushDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotation"
+                                                         Storyboard.TargetProperty="Angle"
+                                                         To="180"
+                                                         Duration="0:0:0.167">
+                                            <DoubleAnimation.EasingFunction>
+                                                <CubicEase EasingMode="EaseOut" />
+                                            </DoubleAnimation.EasingFunction>
+                                        </DoubleAnimation>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Indeterminate" />
+                                <VisualState x:Name="IndeterminatePointerOver" />
+                                <VisualState x:Name="IndeterminatePressed" />
+                                <VisualState x:Name="IndeterminateDisabled" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/cascadia/TerminalSettingsEditor/SettingsExpander.cpp b/src/cascadia/TerminalSettingsEditor/SettingsExpander.cpp
new file mode 100644
index 00000000000..1048a66b352
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/SettingsExpander.cpp
@@ -0,0 +1,342 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "SettingsExpander.h"
+#include "SettingsExpander.g.cpp"
+#include "SettingsExpanderAutomationPeer.g.cpp"
+#include "SettingsExpanderItemStyleSelector.g.cpp"
+#include "StyleExtensions.h"
+
+using namespace winrt::Windows::Foundation;
+using namespace winrt::Windows::Foundation::Collections;
+using namespace winrt::Windows::UI::Xaml;
+using namespace winrt::Windows::UI::Xaml::Automation;
+using namespace winrt::Windows::UI::Xaml::Automation::Peers;
+using namespace winrt::Windows::UI::Xaml::Controls;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    DependencyProperty SettingsExpander::_HeaderProperty{ nullptr };
+    DependencyProperty SettingsExpander::_DescriptionProperty{ nullptr };
+    DependencyProperty SettingsExpander::_HeaderIconProperty{ nullptr };
+    DependencyProperty SettingsExpander::_ContentProperty{ nullptr };
+    DependencyProperty SettingsExpander::_IsExpandedProperty{ nullptr };
+    DependencyProperty SettingsExpander::_ItemsHeaderProperty{ nullptr };
+    DependencyProperty SettingsExpander::_ItemsFooterProperty{ nullptr };
+    DependencyProperty SettingsExpander::_ItemsProperty{ nullptr };
+    DependencyProperty SettingsExpander::_ItemsSourceProperty{ nullptr };
+    DependencyProperty SettingsExpander::_ItemTemplateProperty{ nullptr };
+    DependencyProperty SettingsExpander::_ItemContainerStyleSelectorProperty{ nullptr };
+
+    static constexpr std::wstring_view PART_ItemsHost{ L"PART_ItemsHost" };
+
+    SettingsExpander::SettingsExpander()
+    {
+        _InitializeProperties();
+
+        // Items is backed by an observable vector so post-construction mutations
+        // (e.g. user code that adds cards after the expander is on screen) also
+        // refresh the inner ItemsControl. The XAML parser populates Items via
+        // Append before OnApplyTemplate runs, so the eager population path also
+        // works.
+        Items(single_threaded_observable_vector<IInspectable>());
+    }
+
+    void SettingsExpander::_InitializeProperties()
+    {
+        if (!_HeaderProperty)
+        {
+            _HeaderProperty = DependencyProperty::Register(
+                L"Header",
+                xaml_typename<IInspectable>(),
+                xaml_typename<Editor::SettingsExpander>(),
+                PropertyMetadata{ nullptr });
+        }
+        if (!_DescriptionProperty)
+        {
+            _DescriptionProperty = DependencyProperty::Register(
+                L"Description",
+                xaml_typename<IInspectable>(),
+                xaml_typename<Editor::SettingsExpander>(),
+                PropertyMetadata{ nullptr });
+        }
+        if (!_HeaderIconProperty)
+        {
+            _HeaderIconProperty = DependencyProperty::Register(
+                L"HeaderIcon",
+                xaml_typename<IconElement>(),
+                xaml_typename<Editor::SettingsExpander>(),
+                PropertyMetadata{ nullptr });
+        }
+        if (!_ContentProperty)
+        {
+            _ContentProperty = DependencyProperty::Register(
+                L"Content",
+                xaml_typename<IInspectable>(),
+                xaml_typename<Editor::SettingsExpander>(),
+                PropertyMetadata{ nullptr });
+        }
+        if (!_IsExpandedProperty)
+        {
+            _IsExpandedProperty = DependencyProperty::Register(
+                L"IsExpanded",
+                xaml_typename<bool>(),
+                xaml_typename<Editor::SettingsExpander>(),
+                PropertyMetadata{ box_value(false), PropertyChangedCallback{ &SettingsExpander::_OnIsExpandedChanged } });
+        }
+        if (!_ItemsHeaderProperty)
+        {
+            _ItemsHeaderProperty = DependencyProperty::Register(
+                L"ItemsHeader",
+                xaml_typename<UIElement>(),
+                xaml_typename<Editor::SettingsExpander>(),
+                PropertyMetadata{ nullptr });
+        }
+        if (!_ItemsFooterProperty)
+        {
+            _ItemsFooterProperty = DependencyProperty::Register(
+                L"ItemsFooter",
+                xaml_typename<UIElement>(),
+                xaml_typename<Editor::SettingsExpander>(),
+                PropertyMetadata{ nullptr });
+        }
+        if (!_ItemsProperty)
+        {
+            _ItemsProperty = DependencyProperty::Register(
+                L"Items",
+                xaml_typename<IVector<IInspectable>>(),
+                xaml_typename<Editor::SettingsExpander>(),
+                PropertyMetadata{ nullptr, PropertyChangedCallback{ &SettingsExpander::_OnItemsConnectedPropertyChanged } });
+        }
+        if (!_ItemsSourceProperty)
+        {
+            _ItemsSourceProperty = DependencyProperty::Register(
+                L"ItemsSource",
+                xaml_typename<IInspectable>(),
+                xaml_typename<Editor::SettingsExpander>(),
+                PropertyMetadata{ nullptr, PropertyChangedCallback{ &SettingsExpander::_OnItemsConnectedPropertyChanged } });
+        }
+        if (!_ItemTemplateProperty)
+        {
+            _ItemTemplateProperty = DependencyProperty::Register(
+                L"ItemTemplate",
+                xaml_typename<IInspectable>(),
+                xaml_typename<Editor::SettingsExpander>(),
+                PropertyMetadata{ nullptr });
+        }
+        if (!_ItemContainerStyleSelectorProperty)
+        {
+            _ItemContainerStyleSelectorProperty = DependencyProperty::Register(
+                L"ItemContainerStyleSelector",
+                xaml_typename<StyleSelector>(),
+                xaml_typename<Editor::SettingsExpander>(),
+                PropertyMetadata{ nullptr });
+        }
+    }
+
+    AutomationPeer SettingsExpander::OnCreateAutomationPeer()
+    {
+        return winrt::make<implementation::SettingsExpanderAutomationPeer>(*this);
+    }
+
+    void SettingsExpander::OnApplyTemplate()
+    {
+        // Same implicit-styles injection as SettingsCard so a ToggleSwitch /
+        // Slider / ComboBox / TextBox placed directly as SettingsExpander.Content
+        // gets the same Windows 11 defaults.
+        StyleExtensions::EnsureImplicitStylesMergedInto(*this);
+
+        _SetAccessibleName();
+
+        // Drop the prior template's host before locating the new one.
+        _itemsHost = nullptr;
+
+        if (const auto child{ GetTemplateChild(hstring{ PART_ItemsHost }) })
+        {
+            _itemsHost = child.try_as<Controls::ItemsControl>();
+        }
+
+        if (_itemsHost)
+        {
+            // Push our initial ItemsSource through to the host and stamp item-container styles.
+            _UpdateItemsSource();
+        }
+    }
+
+    void SettingsExpander::_SetAccessibleName()
+    {
+        if (!AutomationProperties::GetName(*this).empty())
+        {
+            return;
+        }
+        if (const auto headerString{ unbox_value_or<hstring>(Header(), hstring{}) }; !headerString.empty())
+        {
+            AutomationProperties::SetName(*this, headerString);
+        }
+    }
+
+    void SettingsExpander::_UpdateItemsSource()
+    {
+        if (!_itemsHost)
+        {
+            return;
+        }
+        // ItemsSource wins when set; otherwise fall back to the inline Items collection.
+        if (const auto source{ ItemsSource() })
+        {
+            _itemsHost.ItemsSource(source);
+        }
+        else
+        {
+            _itemsHost.ItemsSource(Items());
+        }
+
+        _ApplyItemContainerStyles();
+        _SubscribeToItemsVectorChanged();
+    }
+
+    // Watch our inline Items vector for changes so containers added after
+    // OnApplyTemplate also get the proper SettingsCard item style. (When
+    // ItemsSource is set, this is a no-op since the parser only touches Items.)
+    void SettingsExpander::_SubscribeToItemsVectorChanged()
+    {
+        _itemsVectorChangedRevoker.revoke();
+
+        if (ItemsSource())
+        {
+            return;
+        }
+
+        if (const auto observable{ Items().try_as<IObservableVector<IInspectable>>() })
+        {
+            _itemsVectorChangedRevoker = observable.VectorChanged(winrt::auto_revoke, [weakThis = get_weak()](auto&&, auto&&) {
+                if (const auto strongThis{ weakThis.get() })
+                {
+                    strongThis->_ApplyItemContainerStyles();
+                }
+            });
+        }
+    }
+
+    // Apply the per-item style produced by ItemContainerStyleSelector. ItemsControl
+    // only generates ContentPresenter containers for non-UIElement items, so when
+    // SettingsCards are added directly the cards themselves are the "containers"
+    // and we have to set Style on them ourselves. Mirrors the ElementPrepared path
+    // we used when this was an ItemsRepeater.
+    void SettingsExpander::_ApplyItemContainerStyles()
+    {
+        const auto selector{ ItemContainerStyleSelector() };
+        if (!selector)
+        {
+            return;
+        }
+
+        const auto items{ Items() };
+        if (!items)
+        {
+            return;
+        }
+
+        for (uint32_t i = 0; i < items.Size(); ++i)
+        {
+            if (const auto element{ items.GetAt(i).try_as<FrameworkElement>() })
+            {
+                if (element.ReadLocalValue(FrameworkElement::StyleProperty()) == DependencyProperty::UnsetValue())
+                {
+                    element.Style(selector.SelectStyle(items.GetAt(i), element));
+                }
+            }
+        }
+    }
+
+    void SettingsExpander::_OnItemsConnectedPropertyChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)
+    {
+        if (const auto obj{ d.try_as<Editor::SettingsExpander>() })
+        {
+            get_self<SettingsExpander>(obj)->_UpdateItemsSource();
+        }
+    }
+
+    void SettingsExpander::_OnIsExpandedChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& e)
+    {
+        const auto obj{ d.try_as<Editor::SettingsExpander>() };
+        if (!obj)
+        {
+            return;
+        }
+        const auto self = get_self<SettingsExpander>(obj);
+        const auto newValue = unbox_value_or<bool>(e.NewValue(), false);
+
+        // Notify the automation peer so screen readers see the expand/collapse state change.
+        if (const auto peer{ FrameworkElementAutomationPeer::FromElement(obj).try_as<Editor::SettingsExpanderAutomationPeer>() })
+        {
+            peer.RaiseExpandedChangedEvent(newValue);
+        }
+
+        if (newValue)
+        {
+            self->Expanded.raise(obj, nullptr);
+        }
+        else
+        {
+            self->Collapsed.raise(obj, nullptr);
+        }
+    }
+
+    SettingsExpanderAutomationPeer::SettingsExpanderAutomationPeer(const Editor::SettingsExpander& owner) :
+        SettingsExpanderAutomationPeerT<SettingsExpanderAutomationPeer>(owner)
+    {
+    }
+
+    AutomationControlType SettingsExpanderAutomationPeer::GetAutomationControlTypeCore() const
+    {
+        return AutomationControlType::Group;
+    }
+
+    hstring SettingsExpanderAutomationPeer::GetClassNameCore() const
+    {
+        return hstring{ L"SettingsExpander" };
+    }
+
+    hstring SettingsExpanderAutomationPeer::GetNameCore() const
+    {
+        if (const auto expander{ Owner().try_as<Editor::SettingsExpander>() })
+        {
+            if (const auto manualName{ AutomationProperties::GetName(expander) }; !manualName.empty())
+            {
+                return manualName;
+            }
+            if (const auto headerString{ unbox_value_or<hstring>(expander.Header(), hstring{}) }; !headerString.empty())
+            {
+                return headerString;
+            }
+        }
+        return {};
+    }
+
+    void SettingsExpanderAutomationPeer::RaiseExpandedChangedEvent(bool newValue)
+    {
+        // Mirrors the toolkit's SettingsExpanderAutomationPeer.RaiseExpandedChangedEvent.
+        // Narrator doesn't actually announce this today (microsoft/microsoft-ui-xaml#3469),
+        // but other AT can subscribe and we keep parity with the toolkit.
+        const auto newState = newValue ? ExpandCollapseState::Expanded : ExpandCollapseState::Collapsed;
+        const auto oldState = newValue ? ExpandCollapseState::Collapsed : ExpandCollapseState::Expanded;
+        RaisePropertyChangedEvent(ExpandCollapsePatternIdentifiers::ExpandCollapseStateProperty(), box_value(oldState), box_value(newState));
+    }
+
+    Windows::UI::Xaml::Style SettingsExpanderItemStyleSelector::SelectStyleCore(const winrt::Windows::Foundation::IInspectable& /*item*/, const Windows::UI::Xaml::DependencyObject& container)
+    {
+        // When the prepared container is a clickable SettingsCard, give it the
+        // clickable item style (which adds the right padding for the chevron).
+        // Otherwise fall back to the default item style.
+        if (const auto card{ container.try_as<Editor::SettingsCard>() })
+        {
+            if (card.IsClickEnabled())
+            {
+                return _ClickableStyle;
+            }
+        }
+        return _DefaultStyle;
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/SettingsExpander.h b/src/cascadia/TerminalSettingsEditor/SettingsExpander.h
new file mode 100644
index 00000000000..f77855171a6
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/SettingsExpander.h
@@ -0,0 +1,97 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- SettingsExpander
+
+Abstract:
+- A collapsable container for grouping multiple SettingsCards. Based
+  on the Windows Community Toolkit's SettingsExpander.
+
+Author(s):
+- Carlos Zamora - May 2026 (port from CommunityToolkit.WinUI.Controls.SettingsExpander)
+
+--*/
+
+#pragma once
+
+#include "SettingsExpander.g.h"
+#include "SettingsExpanderAutomationPeer.g.h"
+#include "SettingsExpanderItemStyleSelector.g.h"
+#include "Utils.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct SettingsExpander : SettingsExpanderT<SettingsExpander>
+    {
+    public:
+        SettingsExpander();
+
+        void OnApplyTemplate();
+
+        Windows::UI::Xaml::Automation::Peers::AutomationPeer OnCreateAutomationPeer();
+
+        til::typed_event<Editor::SettingsExpander, Windows::Foundation::IInspectable> Expanded;
+        til::typed_event<Editor::SettingsExpander, Windows::Foundation::IInspectable> Collapsed;
+
+        DEPENDENCY_PROPERTY(Windows::Foundation::IInspectable, Header);
+        DEPENDENCY_PROPERTY(Windows::Foundation::IInspectable, Description);
+        DEPENDENCY_PROPERTY(Windows::UI::Xaml::Controls::IconElement, HeaderIcon);
+        DEPENDENCY_PROPERTY(Windows::Foundation::IInspectable, Content);
+        DEPENDENCY_PROPERTY(bool, IsExpanded);
+        DEPENDENCY_PROPERTY(Windows::UI::Xaml::UIElement, ItemsHeader);
+        DEPENDENCY_PROPERTY(Windows::UI::Xaml::UIElement, ItemsFooter);
+        DEPENDENCY_PROPERTY(Windows::Foundation::Collections::IVector<Windows::Foundation::IInspectable>, Items);
+        DEPENDENCY_PROPERTY(Windows::Foundation::IInspectable, ItemsSource);
+        DEPENDENCY_PROPERTY(Windows::Foundation::IInspectable, ItemTemplate);
+        DEPENDENCY_PROPERTY(Windows::UI::Xaml::Controls::StyleSelector, ItemContainerStyleSelector);
+
+    private:
+        static void _InitializeProperties();
+        static void _OnIsExpandedChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
+        static void _OnItemsConnectedPropertyChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
+
+        void _SetAccessibleName();
+        void _UpdateItemsSource();
+        void _SubscribeToItemsVectorChanged();
+        void _ApplyItemContainerStyles();
+
+        Windows::UI::Xaml::Controls::ItemsControl _itemsHost{ nullptr };
+        Windows::Foundation::Collections::IObservableVector<Windows::Foundation::IInspectable>::VectorChanged_revoker _itemsVectorChangedRevoker;
+    };
+
+    // AutomationPeer for SettingsExpander. Reports class name and falls back to
+    // Header text for the name when AutomationProperties.Name is unset.
+    struct SettingsExpanderAutomationPeer : SettingsExpanderAutomationPeerT<SettingsExpanderAutomationPeer>
+    {
+    public:
+        SettingsExpanderAutomationPeer(const Editor::SettingsExpander& owner);
+
+        Windows::UI::Xaml::Automation::Peers::AutomationControlType GetAutomationControlTypeCore() const;
+        hstring GetClassNameCore() const;
+        hstring GetNameCore() const;
+
+        void RaiseExpandedChangedEvent(bool newValue);
+    };
+
+    // StyleSelector used by SettingsExpander to choose between a clickable vs.
+    // non-clickable SettingsCard container style for items in its ItemsControl.
+    // Ported from the Windows Community Toolkit's SettingsExpanderItemStyleSelector.
+    struct SettingsExpanderItemStyleSelector : SettingsExpanderItemStyleSelectorT<SettingsExpanderItemStyleSelector>
+    {
+        SettingsExpanderItemStyleSelector() = default;
+
+        Windows::UI::Xaml::Style SelectStyleCore(const Windows::Foundation::IInspectable& item, const Windows::UI::Xaml::DependencyObject& container);
+
+        WINRT_PROPERTY(Windows::UI::Xaml::Style, DefaultStyle, nullptr);
+        WINRT_PROPERTY(Windows::UI::Xaml::Style, ClickableStyle, nullptr);
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
+{
+    BASIC_FACTORY(SettingsExpander);
+    BASIC_FACTORY(SettingsExpanderAutomationPeer);
+    BASIC_FACTORY(SettingsExpanderItemStyleSelector);
+}
diff --git a/src/cascadia/TerminalSettingsEditor/SettingsExpander.idl b/src/cascadia/TerminalSettingsEditor/SettingsExpander.idl
new file mode 100644
index 00000000000..86fea0bd72e
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/SettingsExpander.idl
@@ -0,0 +1,62 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    [contentproperty("Content")]
+    [default_interface] runtimeclass SettingsExpander : Windows.UI.Xaml.Controls.Control
+    {
+        SettingsExpander();
+
+        Object Header;
+        static Windows.UI.Xaml.DependencyProperty HeaderProperty { get; };
+
+        Object Description;
+        static Windows.UI.Xaml.DependencyProperty DescriptionProperty { get; };
+
+        Windows.UI.Xaml.Controls.IconElement HeaderIcon;
+        static Windows.UI.Xaml.DependencyProperty HeaderIconProperty { get; };
+
+        Object Content;
+        static Windows.UI.Xaml.DependencyProperty ContentProperty { get; };
+
+        Boolean IsExpanded;
+        static Windows.UI.Xaml.DependencyProperty IsExpandedProperty { get; };
+
+        Windows.UI.Xaml.UIElement ItemsHeader;
+        static Windows.UI.Xaml.DependencyProperty ItemsHeaderProperty { get; };
+
+        Windows.UI.Xaml.UIElement ItemsFooter;
+        static Windows.UI.Xaml.DependencyProperty ItemsFooterProperty { get; };
+
+        Windows.Foundation.Collections.IVector<Object> Items;
+        static Windows.UI.Xaml.DependencyProperty ItemsProperty { get; };
+
+        Object ItemsSource;
+        static Windows.UI.Xaml.DependencyProperty ItemsSourceProperty { get; };
+
+        Object ItemTemplate;
+        static Windows.UI.Xaml.DependencyProperty ItemTemplateProperty { get; };
+
+        Windows.UI.Xaml.Controls.StyleSelector ItemContainerStyleSelector;
+        static Windows.UI.Xaml.DependencyProperty ItemContainerStyleSelectorProperty { get; };
+
+        event Windows.Foundation.TypedEventHandler<SettingsExpander, Object> Expanded;
+        event Windows.Foundation.TypedEventHandler<SettingsExpander, Object> Collapsed;
+    };
+
+    [default_interface] runtimeclass SettingsExpanderAutomationPeer : Windows.UI.Xaml.Automation.Peers.FrameworkElementAutomationPeer
+    {
+        SettingsExpanderAutomationPeer(SettingsExpander owner);
+
+        void RaiseExpandedChangedEvent(Boolean newValue);
+    };
+
+    [default_interface] runtimeclass SettingsExpanderItemStyleSelector : Windows.UI.Xaml.Controls.StyleSelector
+    {
+        SettingsExpanderItemStyleSelector();
+
+        Windows.UI.Xaml.Style DefaultStyle;
+        Windows.UI.Xaml.Style ClickableStyle;
+    };
+}
diff --git a/src/cascadia/TerminalSettingsEditor/StringDefaultTemplateSelector.cpp b/src/cascadia/TerminalSettingsEditor/StringDefaultTemplateSelector.cpp
new file mode 100644
index 00000000000..4c17b18f2f5
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/StringDefaultTemplateSelector.cpp
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "StringDefaultTemplateSelector.h"
+#include "StringDefaultTemplateSelector.g.cpp"
+
+using namespace winrt::Windows::Foundation;
+using namespace winrt::Windows::UI::Xaml;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    DataTemplate StringDefaultTemplateSelector::SelectTemplateCore(const IInspectable& item, const DependencyObject& /*container*/)
+    {
+        return SelectTemplateCore(item);
+    }
+
+    DataTemplate StringDefaultTemplateSelector::SelectTemplateCore(const IInspectable& item)
+    {
+        if (const auto pv{ item.try_as<IPropertyValue>() }; pv && pv.Type() == PropertyType::String)
+        {
+            return _StringTemplate;
+        }
+        return nullptr;
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/StringDefaultTemplateSelector.h b/src/cascadia/TerminalSettingsEditor/StringDefaultTemplateSelector.h
new file mode 100644
index 00000000000..56b7f4a3552
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/StringDefaultTemplateSelector.h
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "StringDefaultTemplateSelector.g.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct StringDefaultTemplateSelector : StringDefaultTemplateSelectorT<StringDefaultTemplateSelector>
+    {
+        StringDefaultTemplateSelector() = default;
+
+        Windows::UI::Xaml::DataTemplate SelectTemplateCore(const winrt::Windows::Foundation::IInspectable& item, const winrt::Windows::UI::Xaml::DependencyObject& container);
+        Windows::UI::Xaml::DataTemplate SelectTemplateCore(const winrt::Windows::Foundation::IInspectable& item);
+
+        WINRT_PROPERTY(winrt::Windows::UI::Xaml::DataTemplate, StringTemplate, nullptr);
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
+{
+    BASIC_FACTORY(StringDefaultTemplateSelector);
+}
diff --git a/src/cascadia/TerminalSettingsEditor/StringDefaultTemplateSelector.idl b/src/cascadia/TerminalSettingsEditor/StringDefaultTemplateSelector.idl
new file mode 100644
index 00000000000..db8562d8acc
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/StringDefaultTemplateSelector.idl
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    [default_interface] runtimeclass StringDefaultTemplateSelector : Windows.UI.Xaml.Controls.DataTemplateSelector
+    {
+        StringDefaultTemplateSelector();
+
+        Windows.UI.Xaml.DataTemplate StringTemplate;
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/StyleExtensions.cpp b/src/cascadia/TerminalSettingsEditor/StyleExtensions.cpp
new file mode 100644
index 00000000000..4a9bb2b876b
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/StyleExtensions.cpp
@@ -0,0 +1,179 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "StyleExtensions.h"
+#include "StyleExtensions.g.cpp"
+
+using namespace winrt::Windows::Foundation;
+using namespace winrt::Windows::Foundation::Collections;
+using namespace winrt::Windows::UI::Xaml;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    DependencyProperty StyleExtensions::_resourcesProperty{ nullptr };
+    ResourceDictionary StyleExtensions::_sharedImplicitStylesDictionary{ nullptr };
+
+    DependencyProperty StyleExtensions::ResourcesProperty()
+    {
+        _InitializeProperties();
+        return _resourcesProperty;
+    }
+
+    void StyleExtensions::_InitializeProperties()
+    {
+        if (!_resourcesProperty)
+        {
+            _resourcesProperty = DependencyProperty::RegisterAttached(
+                L"Resources",
+                xaml_typename<ResourceDictionary>(),
+                xaml_typename<Editor::StyleExtensions>(),
+                PropertyMetadata{ nullptr, PropertyChangedCallback{ &StyleExtensions::_OnResourcesChanged } });
+        }
+    }
+
+    ResourceDictionary StyleExtensions::GetResources(const DependencyObject& target)
+    {
+        return target.GetValue(ResourcesProperty()).try_as<ResourceDictionary>();
+    }
+
+    void StyleExtensions::SetResources(const DependencyObject& target, const ResourceDictionary& value)
+    {
+        target.SetValue(ResourcesProperty(), value);
+    }
+
+    void StyleExtensions::_OnResourcesChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& e)
+    {
+        const auto frameworkElement{ d.try_as<FrameworkElement>() };
+        if (!frameworkElement)
+        {
+            return;
+        }
+
+        const auto elementResources{ frameworkElement.Resources() };
+        if (!elementResources)
+        {
+            return;
+        }
+        const auto mergedDictionaries{ elementResources.MergedDictionaries() };
+        if (!mergedDictionaries)
+        {
+            return;
+        }
+
+        // Remove the previously-merged dictionary (if any). Resource dictionaries
+        // are reference types so IndexOf walks by identity, which is exactly what
+        // we want: the same Setter.Value is shared across every element that uses
+        // this Style, so the OldValue we see here is the exact instance we
+        // appended last time the property changed.
+        if (const auto oldDict{ e.OldValue().try_as<ResourceDictionary>() })
+        {
+            uint32_t index{ 0 };
+            if (mergedDictionaries.IndexOf(oldDict, index))
+            {
+                mergedDictionaries.RemoveAt(index);
+            }
+        }
+
+        // Add the new dictionary directly. We deliberately do NOT clone the way
+        // the WCT C# port does: ResourceDictionary is sealed (so we can't tag a
+        // private subclass like the toolkit), and a deep clone would have to
+        // copy the inline dictionary's Source URI — which XAML may leave as a
+        // relative string like "CommonResources.xaml" and which the runtime
+        // then rejects with "is not a valid absolute URI". Sharing the same
+        // dictionary across elements is fine: each element's MergedDictionaries
+        // only holds a reference, and implicit styles are designed to be shared.
+        if (const auto newDict{ e.NewValue().try_as<ResourceDictionary>() })
+        {
+            mergedDictionaries.Append(newDict);
+
+            if (frameworkElement.IsLoaded())
+            {
+                _ForceControlToReloadThemeResources(frameworkElement);
+            }
+        }
+    }
+
+    void StyleExtensions::_ForceControlToReloadThemeResources(const FrameworkElement& element)
+    {
+        // Toggle RequestedTheme to force the framework to re-resolve all
+        // {ThemeResource} bindings under this element. Required when the
+        // style is applied to an already-loaded element. Matches the toolkit.
+        const auto currentTheme{ element.RequestedTheme() };
+        element.RequestedTheme(currentTheme == ElementTheme::Dark ? ElementTheme::Light : ElementTheme::Dark);
+        element.RequestedTheme(currentTheme);
+    }
+
+    // Lazy singleton: loads SettingsControlsImplicitStyles.xaml exactly once
+    // for the process lifetime. We do NOT append this dictionary itself to any
+    // element's MergedDictionaries — that triggers "Element is already the
+    // child of another element" once a second element tries to merge it.
+    // Instead, EnsureImplicitStylesMergedInto copies the dictionary's entries
+    // (Style references) into the target's own Resources. Style instances are
+    // reference types but not UIElements, so sharing them across multiple
+    // elements' Resources collections is safe.
+    ResourceDictionary StyleExtensions::_SharedImplicitStylesDictionary()
+    {
+        if (!_sharedImplicitStylesDictionary)
+        {
+            try
+            {
+                auto dict{ ResourceDictionary{} };
+                dict.Source(winrt::Windows::Foundation::Uri{ L"ms-appx:///Microsoft.Terminal.Settings.Editor/SettingsControlsImplicitStyles.xaml" });
+                _sharedImplicitStylesDictionary = dict;
+            }
+            CATCH_LOG();
+        }
+        return _sharedImplicitStylesDictionary;
+    }
+
+    void StyleExtensions::EnsureImplicitStylesMergedInto(const FrameworkElement& target)
+    {
+        if (!target)
+        {
+            return;
+        }
+
+        try
+        {
+            const auto resources{ target.Resources() };
+            if (!resources)
+            {
+                return;
+            }
+
+            // Idempotency marker: if we've already populated this element's
+            // Resources with the implicit styles, skip. Cheap to check
+            // (one hash lookup), independent of MergedDictionaries.
+            const auto markerKey{ box_value(hstring{ L"__SettingsControls_ImplicitStyles" }) };
+            if (resources.HasKey(markerKey))
+            {
+                return;
+            }
+
+            const auto sharedDict{ _SharedImplicitStylesDictionary() };
+            if (!sharedDict)
+            {
+                return;
+            }
+
+            // Copy each entry (Style or other resource) from the shared loaded
+            // dictionary into the target's Resources. Style instances are
+            // reference types that can safely be shared across multiple
+            // element Resources collections (unlike UIElements, which have a
+            // single-parent constraint). We deliberately do NOT
+            // MergedDictionaries.Append(sharedDict) — that path throws
+            // "Element is already the child of another element" once a second
+            // element tries to merge the same shared dict.
+            for (const auto& kv : sharedDict)
+            {
+                if (!resources.HasKey(kv.Key()))
+                {
+                    resources.Insert(kv.Key(), kv.Value());
+                }
+            }
+            resources.Insert(markerKey, box_value(true));
+        }
+        CATCH_LOG();
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/StyleExtensions.h b/src/cascadia/TerminalSettingsEditor/StyleExtensions.h
new file mode 100644
index 00000000000..764d93d7cec
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/StyleExtensions.h
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "StyleExtensions.g.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct StyleExtensions
+    {
+        StyleExtensions() = default;
+
+        static Windows::UI::Xaml::DependencyProperty ResourcesProperty();
+
+        static Windows::UI::Xaml::ResourceDictionary GetResources(const Windows::UI::Xaml::DependencyObject& target);
+        static void SetResources(const Windows::UI::Xaml::DependencyObject& target, const Windows::UI::Xaml::ResourceDictionary& value);
+
+        static void EnsureImplicitStylesMergedInto(const Windows::UI::Xaml::FrameworkElement& target);
+
+    private:
+        static void _InitializeProperties();
+        static void _OnResourcesChanged(const Windows::UI::Xaml::DependencyObject& d, const Windows::UI::Xaml::DependencyPropertyChangedEventArgs& e);
+        static void _ForceControlToReloadThemeResources(const Windows::UI::Xaml::FrameworkElement& element);
+        static Windows::UI::Xaml::ResourceDictionary _SharedImplicitStylesDictionary();
+
+        static Windows::UI::Xaml::DependencyProperty _resourcesProperty;
+        static Windows::UI::Xaml::ResourceDictionary _sharedImplicitStylesDictionary;
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
+{
+    BASIC_FACTORY(StyleExtensions);
+}
diff --git a/src/cascadia/TerminalSettingsEditor/StyleExtensions.idl b/src/cascadia/TerminalSettingsEditor/StyleExtensions.idl
new file mode 100644
index 00000000000..716151816ef
--- /dev/null
+++ b/src/cascadia/TerminalSettingsEditor/StyleExtensions.idl
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    // Attached property that lets a Style merge an extra ResourceDictionary into
+    // the target FrameworkElement's Resources.MergedDictionaries. Used by
+    // SettingsCard / SettingsExpander to inject right-aligned ToggleSwitch and
+    // sized Slider / ComboBox / TextBox defaults so children laid out inside a
+    // card look right out of the box. Mirrors the Windows Community Toolkit's
+    // CommunityToolkit.WinUI.Controls.StyleExtensions.
+    static runtimeclass StyleExtensions
+    {
+        static Windows.UI.Xaml.DependencyProperty ResourcesProperty { get; };
+
+        static Windows.UI.Xaml.ResourceDictionary GetResources(Windows.UI.Xaml.DependencyObject target);
+        static void SetResources(Windows.UI.Xaml.DependencyObject target, Windows.UI.Xaml.ResourceDictionary value);
+
+        // Idempotently merges the project's SettingsControlsImplicitStyles.xaml
+        // dictionary into the target's Resources.MergedDictionaries. Called from
+        // SettingsCard / SettingsExpander OnApplyTemplate to give children
+        // (ToggleSwitch / Slider / ComboBox / TextBox) sensible Windows 11
+        // defaults without each call site setting Style explicitly. Loaded from
+        // C++ rather than via the attached DP because the WCT Setter.Value
+        // pattern crashes WinUI 2 in this codebase.
+        static void EnsureImplicitStylesMergedInto(Windows.UI.Xaml.FrameworkElement target);
+    }
+}
diff --git a/src/cascadia/TerminalSettingsEditor/Utils.h b/src/cascadia/TerminalSettingsEditor/Utils.h
index 2a4d6f6139c..c6140497037 100644
--- a/src/cascadia/TerminalSettingsEditor/Utils.h
+++ b/src/cascadia/TerminalSettingsEditor/Utils.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "SettingContainer.h"
-
 // This macro must be used alongside GETSET_BINDABLE_ENUM_SETTING.
 // Use this in your class's constructor after Initialize_Component().
 // It sorts and initializes the observable list of enum entries with the enum name
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index 1a5d7747027..136f8e95d8b 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -2,7 +2,7 @@
 Copyright (c) Microsoft Corporation.
 Licensed under the MIT license.
 .SYNOPSIS
-Scans XAML files for local:SettingContainer entries and generates GeneratedSettingsIndex.g.h / .g.cpp.
+Scans XAML files for local:SettingsCard and local:SettingsExpander entries and generates GeneratedSettingsIndex.g.h / .g.cpp.
 
 .PARAMETER SourceDir
 Directory to scan recursively for .xaml files.
@@ -23,7 +23,9 @@ $ProhibitedUids = @(
     "Profile_ProportionalFontFaces",
     "ColorScheme_InboxSchemeDuplicate",
     "ColorScheme_ColorsHeader",
-    "ColorScheme_Rename"
+    "ColorScheme_Rename",
+    "Profile_ResetProfile",
+    "Profile_DeleteProfile"
 )
 
 # Prohibited XAML files (already limited to Page root elements)
@@ -193,13 +195,13 @@ foreach ($xamlFile in Get-ChildItem -Path $SourceDir -Filter *.xaml)
         }
     }
 
-    # Iterate over all local:SettingContainer nodes
-    foreach ($settingContainer in $xml.SelectNodes("//local:SettingContainer", $xm))
+    # Iterate over all local:SettingsCard and local:SettingsExpander nodes
+    foreach ($settingContainer in ($xml.SelectNodes("//local:SettingsCard", $xm) + $xml.SelectNodes("//local:SettingsExpander", $xm)))
     {
         # Extract Uid
         if ($null -eq $settingContainer.Uid)
         {
-            Write-Warning "No x:Uid found for a SettingContainer in file $filename. Skipping entry."
+            # SettingsCard/SettingsExpander without x:Uid are not indexable — skip silently
             continue
         }
         elseif ($ProhibitedUids -contains $settingContainer.Uid)