diff --git a/src/Notepads/Resource/CustomSettingsStyle.xaml b/src/Notepads/Resource/CustomSettingsStyle.xaml
index 04c937632..6ed077f2e 100644
--- a/src/Notepads/Resource/CustomSettingsStyle.xaml
+++ b/src/Notepads/Resource/CustomSettingsStyle.xaml
@@ -1,23 +1,25 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Notepads">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="using:Notepads">
 
-    <!--  Common Control Properties  -->
+    <!-- Common Control Properties -->
     <Thickness x:Key="SettingsPagePadding">20,0</Thickness>
     <Thickness x:Key="SettingsPageFooterMargin">0,0,0,32</Thickness>
 
-    <!--  Sections Spacing  -->
+    <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
+
+    <!-- Brushes -->
+    <StaticResource x:Key="ComboBoxBackground" ResourceKey="SystemControlTransparentBrush" />
+
+    <!-- Styles -->
     <Style x:Key="SettingsSectionStyle" TargetType="StackPanel">
         <Setter Property="Margin" Value="0,8" />
     </Style>
 
-    <!--  Text Styles  -->
     <Style x:Key="CompactSubtitleTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource SubtitleTextBlockStyle}">
         <Setter Property="FontSize" Value="18" />
         <Setter Property="Margin" Value="0,0,0,10" />
     </Style>
-
     <Style x:Key="DescriptionTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource CaptionTextBlockStyle}">
         <Setter Property="Foreground" Value="{ThemeResource SystemControlDescriptionTextForegroundBrush}" />
     </Style>
diff --git a/src/Notepads/Views/Settings/AboutPage.xaml b/src/Notepads/Views/Settings/AboutPage.xaml
index 231798f2a..5a560e332 100644
--- a/src/Notepads/Views/Settings/AboutPage.xaml
+++ b/src/Notepads/Views/Settings/AboutPage.xaml
@@ -1,10 +1,9 @@
-<Page
-    x:Class="Notepads.Views.Settings.AboutPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
+<Page x:Class="Notepads.Views.Settings.AboutPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
 
     <Grid>
         <Grid.ChildrenTransitions>
@@ -16,34 +15,36 @@
             <BrushTransition />
         </Grid.BackgroundTransition>
 
-        <ScrollViewer
-            Grid.Row="0"
-            Padding="{StaticResource SettingsPagePadding}"
-            IsTabStop="False"
-            UseSystemFocusVisuals="False"
-            VerticalScrollBarVisibility="Auto"
-            VerticalScrollMode="Auto">
+        <ScrollViewer Grid.Row="0"
+                      Padding="{StaticResource SettingsPagePadding}"
+                      VerticalScrollBarVisibility="Auto"
+                      VerticalScrollMode="Auto"
+                      IsTabStop="False"
+                      UseSystemFocusVisuals="False">
             <StackPanel Margin="{StaticResource SettingsPageFooterMargin}" HorizontalAlignment="Left">
 
                 <!-- About -->
                 <StackPanel Style="{StaticResource SettingsSectionStyle}" Orientation="Horizontal">
-                    <Image x:Name="AppIconImage" Width="90" Margin="-6,0,12,0" Source="/Assets/appicon_ws.png" />
+                    <Image x:Name="AppIconImage"
+                           Width="90"
+                           Margin="-6,0,12,0"
+                           Source="/Assets/appicon_ws.png" />
                     <StackPanel>
-                        <TextBlock
-                            Margin="0,4"
-                            FontWeight="Normal"
-                            Style="{StaticResource TitleTextBlockStyle}"
-                            Text="{x:Bind AppName, Mode=OneTime}" />
-                        <TextBlock
-                            Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}"
-                            Style="{StaticResource SubtitleTextBlockStyle}"
-                            Text="{x:Bind AppVersion, Mode=OneTime}" />
+                        <TextBlock Style="{StaticResource TitleTextBlockStyle}"
+                                   Margin="0,4"
+                                   FontWeight="Normal"
+                                   Text="{x:Bind AppName, Mode=OneTime}" />
+                        <TextBlock Style="{StaticResource SubtitleTextBlockStyle}"
+                                   Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}"
+                                   Text="{x:Bind AppVersion, Mode=OneTime}" />
                     </StackPanel>
                 </StackPanel>
 
                 <!-- Description & Related Links -->
                 <StackPanel Style="{StaticResource SettingsSectionStyle}" Spacing="8">
-                    <TextBlock x:Uid="/Settings/AboutPage_NotepadsShortDescription" Margin="0,0,0,8" TextWrapping="Wrap" />
+                    <TextBlock x:Uid="/Settings/AboutPage_NotepadsShortDescription"
+                               Margin="0,0,0,8"
+                               TextWrapping="Wrap" />
                     <StackPanel Spacing="-4">
                         <TextBlock x:Uid="/Settings/AboutPage_Notepads_SourceCodeTitle" TextWrapping="Wrap" />
                         <HyperlinkButton Content="https://github.com/0x7c13/Notepads" NavigateUri="https://github.com/0x7c13/Notepads" />
@@ -65,13 +66,17 @@
 
                 <!-- Changelog -->
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
-                    <TextBlock x:Uid="/Settings/AboutPage_ChangelogUrl_Title" Margin="0,0,0,4" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
+                    <TextBlock x:Uid="/Settings/AboutPage_ChangelogUrl_Title"
+                               Style="{StaticResource CompactSubtitleTextBlockStyle}"
+                               Margin="0,0,0,4" />
                     <HyperlinkButton Content="Notepads Releases" NavigateUri="https://github.com/0x7c13/Notepads/releases" />
                 </StackPanel>
 
                 <!-- Dependencies & References -->
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
-                    <TextBlock x:Uid="/Settings/AboutPage_DependenciesAndReferences_Title" Margin="0,0,0,4" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
+                    <TextBlock x:Uid="/Settings/AboutPage_DependenciesAndReferences_Title"
+                               Style="{StaticResource CompactSubtitleTextBlockStyle}"
+                               Margin="0,0,0,4" />
                     <StackPanel Spacing="-4">
                         <HyperlinkButton Content="Windows UI Library" NavigateUri="https://github.com/Microsoft/microsoft-ui-xaml" />
                         <HyperlinkButton Content="Windows Community Toolkit" NavigateUri="https://github.com/windows-toolkit/WindowsCommunityToolkit" />
diff --git a/src/Notepads/Views/Settings/AdvancedSettingsPage.xaml b/src/Notepads/Views/Settings/AdvancedSettingsPage.xaml
index 869ed8f60..4c23c7c3c 100644
--- a/src/Notepads/Views/Settings/AdvancedSettingsPage.xaml
+++ b/src/Notepads/Views/Settings/AdvancedSettingsPage.xaml
@@ -1,11 +1,10 @@
-<Page
-    x:Class="Notepads.Views.Settings.AdvancedSettingsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:utilities="using:Notepads.Utilities"
-    mc:Ignorable="d">
+<Page x:Class="Notepads.Views.Settings.AdvancedSettingsPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:utilities="using:Notepads.Utilities"
+      mc:Ignorable="d">
 
     <Grid>
         <Grid.ChildrenTransitions>
@@ -17,13 +16,12 @@
             <BrushTransition />
         </Grid.BackgroundTransition>
 
-        <ScrollViewer
-            Grid.Row="0"
-            Padding="{StaticResource SettingsPagePadding}"
-            IsTabStop="False"
-            UseSystemFocusVisuals="False"
-            VerticalScrollBarVisibility="Auto"
-            VerticalScrollMode="Auto">
+        <ScrollViewer Grid.Row="0"
+                      Padding="{StaticResource SettingsPagePadding}"
+                      VerticalScrollBarVisibility="Auto"
+                      VerticalScrollMode="Auto"
+                      IsTabStop="False"
+                      UseSystemFocusVisuals="False">
             <StackPanel Margin="{StaticResource SettingsPageFooterMargin}" HorizontalAlignment="Left">
 
                 <!-- Status Bar -->
@@ -45,7 +43,9 @@
 
                 <!-- Session Snapshot -->
                 <StackPanel x:Name="SessionSnapshotSettingsPanel" Style="{StaticResource SettingsSectionStyle}">
-                    <TextBlock x:Name="SessionSnapshotSettingsTitle" x:Uid="/Settings/AdvancedPage_SessionSnapshotSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
+                    <TextBlock x:Name="SessionSnapshotSettingsTitle"
+                               x:Uid="/Settings/AdvancedPage_SessionSnapshotSettings_Title"
+                               Style="{StaticResource CompactSubtitleTextBlockStyle}" />
                     <StackPanel x:Name="SessionSnapshotSettingsControls">
                         <ToggleSwitch x:Name="EnableSessionSnapshotToggleSwitch" x:Uid="/Settings/AdvancedPage_SessionSnapshotSettings_OnOffToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
                         <TextBlock x:Uid="/Settings/AdvancedPage_SessionSnapshotSettings_Description" Style="{ThemeResource DescriptionTextBlockStyle}" />
@@ -54,45 +54,44 @@
 
                 <!-- Launch -->
                 <StackPanel x:Name="LaunchPreferenceSettingsPanel" Style="{StaticResource SettingsSectionStyle}">
-                    <TextBlock x:Name="LaunchPreferenceSettingsTitle" x:Uid="/Settings/AdvancedPage_LaunchPreferenceSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
+                    <TextBlock x:Name="LaunchPreferenceSettingsTitle"
+                               x:Uid="/Settings/AdvancedPage_LaunchPreferenceSettings_Title"
+                               Style="{StaticResource CompactSubtitleTextBlockStyle}" />
                     <StackPanel x:Name="LaunchPreferenceSettingsControls">
                         <ToggleSwitch x:Name="AlwaysOpenNewWindowToggleSwitch" x:Uid="/Settings/AdvancedPage_LaunchPreferenceSettings_AlwaysOpenNewWindowToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
-                        <TextBlock
-                            x:Uid="/Settings/AdvancedPage_AlwaysOpenNewWindow_Description"
-                            Margin="0,0,0,10"
-                            Style="{ThemeResource DescriptionTextBlockStyle}" />
+                        <TextBlock x:Uid="/Settings/AdvancedPage_AlwaysOpenNewWindow_Description"
+                                   Style="{ThemeResource DescriptionTextBlockStyle}"
+                                   Margin="0,0,0,10" />
                         <ToggleSwitch x:Name="ExitWhenLastTabClosedToggleSwitch" x:Uid="/Settings/AdvancedPage_LaunchPreferenceSettings_ExitWhenLastTabClosedToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
                     </StackPanel>
                 </StackPanel>
 
                 <!-- Language -->
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
-                    <TextBlock x:Name="LanguagePreferenceSettingsTitle" x:Uid="/Settings/AdvancedPage_LanguagePreferenceSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
+                    <TextBlock x:Name="LanguagePreferenceSettingsTitle"
+                               x:Uid="/Settings/AdvancedPage_LanguagePreferenceSettings_Title"
+                               Style="{StaticResource CompactSubtitleTextBlockStyle}" />
                     <StackPanel x:Name="LanguagePreferenceSettingsControls" Margin="0,6,0,0">
-                        <ComboBox
-                            x:Name="LanguagePicker"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            IsTextSearchEnabled="True"
-                            ItemsSource="{x:Bind SupportedLanguages, Mode=OneTime}">
+                        <ComboBox x:Name="LanguagePicker"
+                                  HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Center"
+                                  IsTextSearchEnabled="True"
+                                  ItemsSource="{x:Bind SupportedLanguages, Mode=OneTime}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate x:DataType="utilities:LanguageItem">
                                     <TextBlock Text="{x:Bind Name}" />
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
                         </ComboBox>
-                        <TextBlock
-                            x:Name="RestartPrompt"
-                            x:Uid="/Settings/AdvancedPage_LanguagePreferenceSettings_RestartPrompt"
-                            Margin="0,8,0,0"
-                            Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"
-                            Style="{ThemeResource DescriptionTextBlockStyle}"
-                            Visibility="Collapsed" />
-                        <TextBlock
-                            x:Uid="/Settings/AdvancedPage_LanguagePreferenceSettings_Description"
-                            Margin="0,6,0,0"
-                            Style="{ThemeResource DescriptionTextBlockStyle}" />
+                        <TextBlock x:Name="RestartPrompt"
+                                   x:Uid="/Settings/AdvancedPage_LanguagePreferenceSettings_RestartPrompt"
+                                   Style="{ThemeResource DescriptionTextBlockStyle}"
+                                   Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"
+                                   Margin="0,8,0,0"
+                                   Visibility="Collapsed" />
+                        <TextBlock x:Uid="/Settings/AdvancedPage_LanguagePreferenceSettings_Description"
+                                   Style="{ThemeResource DescriptionTextBlockStyle}"
+                                   Margin="0,6,0,0" />
                     </StackPanel>
                 </StackPanel>
 
diff --git a/src/Notepads/Views/Settings/PersonalizationSettingsPage.xaml b/src/Notepads/Views/Settings/PersonalizationSettingsPage.xaml
index 627294a90..ea55d655a 100644
--- a/src/Notepads/Views/Settings/PersonalizationSettingsPage.xaml
+++ b/src/Notepads/Views/Settings/PersonalizationSettingsPage.xaml
@@ -1,10 +1,9 @@
-<Page
-    x:Class="Notepads.Views.Settings.PersonalizationSettingsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
+<Page x:Class="Notepads.Views.Settings.PersonalizationSettingsPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
 
     <Grid>
         <Grid.ChildrenTransitions>
@@ -16,49 +15,58 @@
             <BrushTransition />
         </Grid.BackgroundTransition>
 
-        <ScrollViewer
-            Grid.Row="0"
-            Padding="{StaticResource SettingsPagePadding}"
-            IsTabStop="False"
-            UseSystemFocusVisuals="False"
-            VerticalScrollBarVisibility="Auto"
-            VerticalScrollMode="Auto">
+        <ScrollViewer Grid.Row="0"
+                      Padding="{StaticResource SettingsPagePadding}"
+                      VerticalScrollBarVisibility="Auto"
+                      VerticalScrollMode="Auto"
+                      IsTabStop="False"
+                      UseSystemFocusVisuals="False">
             <StackPanel Margin="{StaticResource SettingsPageFooterMargin}" HorizontalAlignment="Left">
 
                 <!-- Theme -->
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
                     <TextBlock x:Uid="/Settings/PersonalizationPage_ThemeModeSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
                     <StackPanel x:Name="ThemePanel">
-                        <RadioButton x:Name="ThemeModeLightButton" x:Uid="/Settings/PersonalizationPage_ThemeModeSettings_LightModeRadioButton" Style="{StaticResource CustomRadioButtonStyle}" Tag="Light" />
-                        <RadioButton x:Name="ThemeModeDarkButton" x:Uid="/Settings/PersonalizationPage_ThemeModeSettings_DarkModeRadioButton" Style="{StaticResource CustomRadioButtonStyle}" Tag="Dark" />
-                        <RadioButton x:Name="ThemeModeDefaultButton" x:Uid="/Settings/PersonalizationPage_ThemeModeSettings_WindowsModeRadioButton" Style="{StaticResource CustomRadioButtonStyle}" Tag="Default" />
+                        <RadioButton x:Name="ThemeModeLightButton"
+                                     x:Uid="/Settings/PersonalizationPage_ThemeModeSettings_LightModeRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     Tag="Light" />
+                        <RadioButton x:Name="ThemeModeDarkButton"
+                                     x:Uid="/Settings/PersonalizationPage_ThemeModeSettings_DarkModeRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     Tag="Dark" />
+                        <RadioButton x:Name="ThemeModeDefaultButton"
+                                     x:Uid="/Settings/PersonalizationPage_ThemeModeSettings_WindowsModeRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     Tag="Default" />
                     </StackPanel>
                 </StackPanel>
 
                 <!-- Acrylic Opacity -->
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
-                    <TextBlock x:Name="BackgroundTintOpacityTitle" x:Uid="/Settings/PersonalizationPage_BackgroundTintOpacitySettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
+                    <TextBlock x:Name="BackgroundTintOpacityTitle"
+                               x:Uid="/Settings/PersonalizationPage_BackgroundTintOpacitySettings_Title"
+                               Style="{StaticResource CompactSubtitleTextBlockStyle}" />
                     <StackPanel x:Name="BackgroundTintOpacityControls">
                         <StackPanel Orientation="Horizontal">
-                            <FontIcon VerticalAlignment="Center" FontSize="20" Glyph="&#xE727;" />
-                            <Slider
-                                x:Name="BackgroundTintOpacitySlider"
-                                Width="200"
-                                Margin="12,0,8,0"
-                                StepFrequency="1"
-                                Maximum="100" />
-                            <TextBlock
-                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                Height="{x:Bind BackgroundTintOpacitySlider.Height, Mode=OneWay}"
-                                Padding="0,0,0,2"
-                                VerticalAlignment="Center"
-                                Text="{x:Bind BackgroundTintOpacitySlider.Value, Mode=OneWay}" />
-                            <TextBlock
-                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                Height="{x:Bind BackgroundTintOpacitySlider.Height, Mode=OneWay}"
-                                Padding="0,0,0,2"
-                                VerticalAlignment="Center"
-                                Text="%" />
+                            <FontIcon VerticalAlignment="Center"
+                                      FontSize="20"
+                                      Glyph="&#xE727;" />
+                            <Slider x:Name="BackgroundTintOpacitySlider"
+                                    Width="200"
+                                    Margin="12,0,8,0"
+                                    StepFrequency="1"
+                                    Maximum="100" />
+                            <TextBlock Style="{StaticResource SubtitleTextBlockStyle}"
+                                       Height="{x:Bind BackgroundTintOpacitySlider.Height, Mode=OneWay}"
+                                       Padding="0,0,0,2"
+                                       VerticalAlignment="Center"
+                                       Text="{x:Bind BackgroundTintOpacitySlider.Value, Mode=OneWay}" />
+                            <TextBlock Style="{StaticResource SubtitleTextBlockStyle}"
+                                       Height="{x:Bind BackgroundTintOpacitySlider.Height, Mode=OneWay}"
+                                       Padding="0,0,0,2"
+                                       VerticalAlignment="Center"
+                                       Text="%" />
                         </StackPanel>
                         <TextBlock x:Uid="/Settings/PersonalizationPage_BackgroundTintOpacitySettings_Description" Style="{ThemeResource DescriptionTextBlockStyle}" />
                     </StackPanel>
@@ -70,15 +78,14 @@
                     <StackPanel Spacing="12">
                         <ToggleSwitch x:Name="AccentColorToggle" x:Uid="/Settings/PersonalizationPage_AccentColorSettings_UseWindowsAccentColorToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
                         <Viewbox MaxWidth="292" Stretch="Fill">
-                            <ColorPicker
-                                x:Name="AccentColorPicker"
-                                ColorSpectrumShape="Ring"
-                                IsAlphaEnabled="False"
-                                IsAlphaSliderVisible="True"
-                                IsAlphaTextInputVisible="True"
-                                IsColorChannelTextInputVisible="True"
-                                IsColorSliderVisible="True"
-                                IsHexInputVisible="True" />
+                            <ColorPicker x:Name="AccentColorPicker"
+                                         ColorSpectrumShape="Ring"
+                                         IsAlphaEnabled="False"
+                                         IsAlphaSliderVisible="True"
+                                         IsAlphaTextInputVisible="True"
+                                         IsColorChannelTextInputVisible="True"
+                                         IsColorSliderVisible="True"
+                                         IsHexInputVisible="True" />
                         </Viewbox>
                     </StackPanel>
                 </StackPanel>
diff --git a/src/Notepads/Views/Settings/SettingsPage.xaml b/src/Notepads/Views/Settings/SettingsPage.xaml
index c039a92d9..c97a66016 100644
--- a/src/Notepads/Views/Settings/SettingsPage.xaml
+++ b/src/Notepads/Views/Settings/SettingsPage.xaml
@@ -1,52 +1,46 @@
-<Page
-    x:Class="Notepads.Views.Settings.SettingsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:settings="using:Notepads.Views.Settings"
-    mc:Ignorable="d">
+<Page x:Class="Notepads.Views.Settings.SettingsPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:settings="using:Notepads.Views.Settings"
+      mc:Ignorable="d">
 
-    <NavigationView
-        x:Name="SettingsNavigationView"
-        IsBackButtonVisible="Collapsed"
-        IsBackEnabled="False"
-        IsPaneOpen="False"
-        IsSettingsVisible="False"
-        ItemInvoked="SettingsPanel_OnItemInvoked"
-        OpenPaneLength="200"
-        PaneDisplayMode="LeftCompact">
+    <NavigationView x:Name="SettingsNavigationView"
+                    IsBackButtonVisible="Collapsed"
+                    IsBackEnabled="False"
+                    IsPaneOpen="False"
+                    IsSettingsVisible="False"
+                    ItemInvoked="SettingsPanel_OnItemInvoked"
+                    OpenPaneLength="200"
+                    PaneDisplayMode="LeftCompact">
 
         <NavigationView.MenuItems>
-            <NavigationViewItem
-                x:Uid="/Settings/TextAndEditorPage_Title"
-                IsSelected="True"
-                Style="{StaticResource CustomNavigationViewItemStyle}"
-                Tag="TextAndEditor">
+            <NavigationViewItem x:Uid="/Settings/TextAndEditorPage_Title"
+                                Style="{StaticResource CustomNavigationViewItemStyle}"
+                                IsSelected="True"
+                                Tag="TextAndEditor">
                 <NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xF17F;" />
                 </NavigationViewItem.Icon>
             </NavigationViewItem>
-            <NavigationViewItem
-                x:Uid="/Settings/PersonalizationPage_Title"
-                Style="{StaticResource CustomNavigationViewItemStyle}"
-                Tag="Personalization">
+            <NavigationViewItem x:Uid="/Settings/PersonalizationPage_Title"
+                                Style="{StaticResource CustomNavigationViewItemStyle}"
+                                Tag="Personalization">
                 <NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xE771;" />
                 </NavigationViewItem.Icon>
             </NavigationViewItem>
-            <NavigationViewItem
-                x:Uid="/Settings/AdvancedPage_Title"
-                Style="{StaticResource CustomNavigationViewItemStyle}"
-                Tag="Advanced">
+            <NavigationViewItem x:Uid="/Settings/AdvancedPage_Title"
+                                Style="{StaticResource CustomNavigationViewItemStyle}"
+                                Tag="Advanced">
                 <NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xE9E9;" />
                 </NavigationViewItem.Icon>
             </NavigationViewItem>
-            <NavigationViewItem
-                x:Uid="/Settings/AboutPage_Title"
-                Style="{StaticResource CustomNavigationViewItemStyle}"
-                Tag="About">
+            <NavigationViewItem x:Uid="/Settings/AboutPage_Title"
+                                Style="{StaticResource CustomNavigationViewItemStyle}"
+                                Tag="About">
                 <NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xE946;" />
                 </NavigationViewItem.Icon>
diff --git a/src/Notepads/Views/Settings/SettingsPanel.xaml b/src/Notepads/Views/Settings/SettingsPanel.xaml
index 5c7c4e4a6..77c17050d 100644
--- a/src/Notepads/Views/Settings/SettingsPanel.xaml
+++ b/src/Notepads/Views/Settings/SettingsPanel.xaml
@@ -1,21 +1,20 @@
-<Page
-    x:Class="Notepads.Views.Settings.SettingsPanel"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-    mc:Ignorable="d">
+<Page x:Class="Notepads.Views.Settings.SettingsPanel"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+      mc:Ignorable="d">
 
     <Page.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
-                    <SolidColorBrush x:Key="SettingsPanelBackgroundBrush" Color="WhiteSmoke" />
-                </ResourceDictionary>
                 <ResourceDictionary x:Key="Dark">
                     <SolidColorBrush x:Key="SettingsPanelBackgroundBrush" Color="#222222" />
                 </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <SolidColorBrush x:Key="SettingsPanelBackgroundBrush" Color="WhiteSmoke" />
+                </ResourceDictionary>
                 <ResourceDictionary x:Key="HighContrast">
                     <SolidColorBrush x:Key="SettingsPanelBackgroundBrush" Color="{StaticResource SystemColorHighlightColor}" />
                 </ResourceDictionary>
@@ -29,15 +28,13 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <Grid
-            Grid.Row="0"
-            Margin="{StaticResource SettingsPagePadding}"
-            BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
-            BorderThickness="0,0,0,1">
-            <TextBlock
-                x:Name="TitleTextBlock"
-                Padding="0,16,0,4"
-                Style="{StaticResource TitleTextBlockStyle}" />
+        <Grid Grid.Row="0"
+              BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
+              BorderThickness="0,0,0,1"
+              Margin="{StaticResource SettingsPagePadding}">
+            <TextBlock x:Name="TitleTextBlock"
+                       Style="{StaticResource TitleTextBlockStyle}"
+                       Padding="0,16,0,4" />
         </Grid>
 
         <Grid Grid.Row="1">
diff --git a/src/Notepads/Views/Settings/TextAndEditorSettingsPage.xaml b/src/Notepads/Views/Settings/TextAndEditorSettingsPage.xaml
index 791344509..51edda1ae 100644
--- a/src/Notepads/Views/Settings/TextAndEditorSettingsPage.xaml
+++ b/src/Notepads/Views/Settings/TextAndEditorSettingsPage.xaml
@@ -1,11 +1,10 @@
-<Page
-    x:Class="Notepads.Views.Settings.TextAndEditorSettingsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:settings="using:Notepads.Services"
-    mc:Ignorable="d">
+<Page x:Class="Notepads.Views.Settings.TextAndEditorSettingsPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:settings="using:Notepads.Services"
+      mc:Ignorable="d">
 
     <Grid>
         <Grid.ChildrenTransitions>
@@ -17,79 +16,69 @@
             <BrushTransition />
         </Grid.BackgroundTransition>
 
-        <ScrollViewer
-            Grid.Row="0"
-            Padding="{StaticResource SettingsPagePadding}"
-            IsTabStop="False"
-            UseSystemFocusVisuals="False"
-            VerticalScrollBarVisibility="Auto"
-            VerticalScrollMode="Auto">
+        <ScrollViewer Grid.Row="0"
+                      Padding="{StaticResource SettingsPagePadding}"
+                      VerticalScrollBarVisibility="Auto"
+                      VerticalScrollMode="Auto"
+                      IsTabStop="False"
+                      UseSystemFocusVisuals="False">
             <StackPanel Margin="{StaticResource SettingsPageFooterMargin}" HorizontalAlignment="Left">
 
                 <!-- Text Wrapping -->
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_TextWrappingSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
-                    <StackPanel>
-                        <ToggleSwitch x:Name="TextWrappingToggle" x:Uid="/Settings/TextAndEditorPage_TextWrappingSettings_ToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
-                    </StackPanel>
+                    <ToggleSwitch x:Name="TextWrappingToggle" x:Uid="/Settings/TextAndEditorPage_TextWrappingSettings_ToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
                 </StackPanel>
 
                 <!-- Spelling -->
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_SpellingSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
-                    <StackPanel>
-                        <ToggleSwitch x:Name="HighlightMisspelledWordsToggle" x:Uid="/Settings/TextAndEditorPage_SpellingSettings_HighlightMisspelledWordsToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
-                    </StackPanel>
+                    <ToggleSwitch x:Name="HighlightMisspelledWordsToggle" x:Uid="/Settings/TextAndEditorPage_SpellingSettings_HighlightMisspelledWordsToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
                 </StackPanel>
 
                 <!-- Display -->
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_DisplaySettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
-                    <StackPanel Margin="0,0,0,8">
-                        <ToggleSwitch x:Name="LineHighlighterToggle" x:Uid="/Settings/TextAndEditorPage_LineHighlighterSettings_ToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleSwitch x:Name="LineNumbersToggle" x:Uid="/Settings/TextAndEditorPage_LineNumbersSettings_ToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
-                        <TextBlock x:Uid="/Settings/TextAndEditorPage_LineNumbersSettings_Description" Style="{ThemeResource DescriptionTextBlockStyle}" />
-                    </StackPanel>
+                    <ToggleSwitch x:Name="LineHighlighterToggle" x:Uid="/Settings/TextAndEditorPage_LineHighlighterSettings_ToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
+                    <ToggleSwitch x:Name="LineNumbersToggle"
+                                  x:Uid="/Settings/TextAndEditorPage_LineNumbersSettings_ToggleSwitch"
+                                  Style="{StaticResource CustomToggleSwitchStyle}"
+                                  Margin="0,8,0,0" />
+                    <TextBlock x:Uid="/Settings/TextAndEditorPage_LineNumbersSettings_Description" Style="{ThemeResource DescriptionTextBlockStyle}" />
                 </StackPanel>
 
                 <!-- Font -->
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_FontSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
-                    <StackPanel Margin="0,6,0,8" Spacing="8">
-                        <ComboBox
-                            x:Name="FontFamilyPicker"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            IsTextSearchEnabled="True"
-                            ItemsSource="{x:Bind AvailableFonts, Mode=OneTime}">
+                    <StackPanel Margin="0,6,0,0">
+                        <ComboBox x:Name="FontFamilyPicker"
+                                  HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Center"
+                                  IsTextSearchEnabled="True"
+                                  ItemsSource="{x:Bind AvailableFonts, Mode=OneTime}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
                                     <TextBlock FontFamily="{Binding}" Text="{Binding}" />
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
                         </ComboBox>
-
-                        <ComboBox
-                            x:Name="FontSizePicker"
-                            MinWidth="70"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            IsEditable="False"
-                            ItemsSource="{x:Bind AvailableFontSizes, Mode=OneTime}" />
+                        <ComboBox x:Name="FontSizePicker"
+                                  MinWidth="70"
+                                  Margin="0,8,0,0"
+                                  VerticalAlignment="Center"
+                                  IsEditable="False"
+                                  ItemsSource="{x:Bind AvailableFontSizes, Mode=OneTime}" />
                     </StackPanel>
 
-                    <StackPanel Margin="0,8" Spacing="8">
-                        <TextBlock x:Uid="/Settings/TextAndEditorPage_FontStyleSettings_Title" />
-                        <ComboBox
-                            x:Name="FontStylePicker"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            FontFamily="{x:Bind settings:AppSettingsService.EditorFontFamily}"
-                            IsTextSearchEnabled="True"
-                            ItemsSource="{x:Bind AvailableFontStyles, Mode=OneTime}">
+                    <TextBlock x:Uid="/Settings/TextAndEditorPage_FontStyleSettings_Title"
+                               Style="{StaticResource BodyTextBlockStyle}"
+                               Margin="0,12,0,4" />
+                    <StackPanel>
+                        <ComboBox x:Name="FontStylePicker"
+                                  VerticalAlignment="Center"
+                                  FontFamily="{x:Bind settings:AppSettingsService.EditorFontFamily}"
+                                  IsTextSearchEnabled="True"
+                                  ItemsSource="{x:Bind AvailableFontStyles, Mode=OneTime}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
                                     <TextBlock FontStyle="{Binding FontStyle}" Text="{Binding FontStyleLocalizedName}" />
@@ -98,19 +87,19 @@
                         </ComboBox>
                     </StackPanel>
 
-                    <StackPanel Margin="0,8,0,4" Spacing="8">
-                        <TextBlock x:Uid="/Settings/TextAndEditorPage_FontWeightSettings_Title" />
-                        <ComboBox
-                            x:Name="FontWeightPicker"
-                            MinWidth="70"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            FontFamily="{x:Bind settings:AppSettingsService.EditorFontFamily}"
-                            IsEditable="False"
-                            ItemsSource="{x:Bind AvailableFontWeights, Mode=OneTime}">
+                    <TextBlock x:Uid="/Settings/TextAndEditorPage_FontWeightSettings_Title"
+                               Style="{StaticResource BodyTextBlockStyle}"
+                               Margin="0,12,0,4" />
+                    <StackPanel>
+                        <ComboBox x:Name="FontWeightPicker"
+                                  MinWidth="70"
+                                  VerticalAlignment="Center"
+                                  FontFamily="{x:Bind settings:AppSettingsService.EditorFontFamily}"
+                                  IsEditable="False"
+                                  ItemsSource="{x:Bind AvailableFontWeights, Mode=OneTime}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
-                                    <TextBlock Text="{Binding FontWeightLocalizedName}" FontWeight="{Binding FontWeight}" />
+                                    <TextBlock FontWeight="{Binding FontWeight}" Text="{Binding FontWeightLocalizedName}" />
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
                         </ComboBox>
@@ -121,9 +110,21 @@
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_LineEndingSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
                     <StackPanel x:Name="LineEndingPanel">
-                        <RadioButton x:Name="CrlfRadioButton" Content="Windows (CRLF)" GroupName="LineEndingGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="Crlf" />
-                        <RadioButton x:Name="CrRadioButton" Content="Macintosh (CR)" GroupName="LineEndingGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="Cr" />
-                        <RadioButton x:Name="LfRadioButton" Content="Unix (LF)" GroupName="LineEndingGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="Lf" />
+                        <RadioButton x:Name="CrlfRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     Content="Windows (CRLF)"
+                                     GroupName="LineEndingGroup"
+                                     Tag="Crlf" />
+                        <RadioButton x:Name="CrRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     Content="Macintosh (CR)"
+                                     GroupName="LineEndingGroup"
+                                     Tag="Cr" />
+                        <RadioButton x:Name="LfRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     Content="Unix (LF)"
+                                     GroupName="LineEndingGroup"
+                                     Tag="Lf" />
                     </StackPanel>
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_LineEndingSettings_Description" Style="{ThemeResource DescriptionTextBlockStyle}" />
                 </StackPanel>
@@ -132,10 +133,26 @@
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_EncodingSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
                     <StackPanel x:Name="EncodingPanel">
-                        <RadioButton x:Name="Utf8EncodingRadioButton" Content="UTF-8" GroupName="EncodingGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="UTF-8" />
-                        <RadioButton x:Name="Utf8BomEncodingRadioButton" Content="UTF-8-BOM" GroupName="EncodingGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="UTF-8-BOM" />
-                        <RadioButton x:Name="Utf16LeBomEncodingRadioButton" Content="UTF-16 LE BOM" GroupName="EncodingGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="UTF-16 LE BOM" />
-                        <RadioButton x:Name="Utf16BeBomEncodingRadioButton" Content="UTF-16 BE BOM" GroupName="EncodingGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="UTF-16 BE BOM" />
+                        <RadioButton x:Name="Utf8EncodingRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     Content="UTF-8"
+                                     GroupName="EncodingGroup"
+                                     Tag="UTF-8" />
+                        <RadioButton x:Name="Utf8BomEncodingRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     Content="UTF-8-BOM"
+                                     GroupName="EncodingGroup"
+                                     Tag="UTF-8-BOM" />
+                        <RadioButton x:Name="Utf16LeBomEncodingRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     Content="UTF-16 LE BOM"
+                                     GroupName="EncodingGroup"
+                                     Tag="UTF-16 LE BOM" />
+                        <RadioButton x:Name="Utf16BeBomEncodingRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     Content="UTF-16 BE BOM"
+                                     GroupName="EncodingGroup"
+                                     Tag="UTF-16 BE BOM" />
                     </StackPanel>
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_EncodingSettings_Description" Style="{ThemeResource DescriptionTextBlockStyle}" />
                 </StackPanel>
@@ -144,9 +161,21 @@
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_DecodingSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
                     <StackPanel x:Name="DecodingPanel">
-                        <RadioButton x:Name="AutoGuessDecodingRadioButton" x:Uid="/Settings/TextAndEditorPage_DecodingSettings_AutoGuessRadioButton" GroupName="DecodingGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="Auto" />
-                        <RadioButton x:Name="Utf8DecodingRadioButton" x:Uid="/Settings/TextAndEditorPage_DecodingSettings_Utf8RadioButton" GroupName="DecodingGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="UTF-8" />
-                        <RadioButton x:Name="AnsiDecodingRadioButton" x:Uid="/Settings/TextAndEditorPage_DecodingSettings_AnsiRadioButton" GroupName="DecodingGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="ANSI" />
+                        <RadioButton x:Name="AutoGuessDecodingRadioButton"
+                                     x:Uid="/Settings/TextAndEditorPage_DecodingSettings_AutoGuessRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     GroupName="DecodingGroup"
+                                     Tag="Auto" />
+                        <RadioButton x:Name="Utf8DecodingRadioButton"
+                                     x:Uid="/Settings/TextAndEditorPage_DecodingSettings_Utf8RadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     GroupName="DecodingGroup"
+                                     Tag="UTF-8" />
+                        <RadioButton x:Name="AnsiDecodingRadioButton"
+                                     x:Uid="/Settings/TextAndEditorPage_DecodingSettings_AnsiRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     GroupName="DecodingGroup"
+                                     Tag="ANSI" />
                     </StackPanel>
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_DecodingSettings_Description" Style="{ThemeResource DescriptionTextBlockStyle}" />
                 </StackPanel>
@@ -155,10 +184,26 @@
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_TabKeySettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
                     <StackPanel x:Name="TabBehaviorPanel">
-                        <RadioButton x:Name="TabDefaultRadioButton" x:Uid="/Settings/TextAndEditorPage_TabKeySettings_DefaultRadioButton" GroupName="TabBehaviorGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="-1" />
-                        <RadioButton x:Name="TabTwoSpacesRadioButton" x:Uid="/Settings/TextAndEditorPage_TabKeySettings_TwoSpacesRadioButton" GroupName="TabBehaviorGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="2" />
-                        <RadioButton x:Name="TabFourSpacesRadioButton" x:Uid="/Settings/TextAndEditorPage_TabKeySettings_FourSpacesRadioButton" GroupName="TabBehaviorGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="4" />
-                        <RadioButton x:Name="TabEightSpacesRadioButton" x:Uid="/Settings/TextAndEditorPage_TabKeySettings_EightSpacesRadioButton" GroupName="TabBehaviorGroup" Style="{StaticResource CustomRadioButtonStyle}" Tag="8" />
+                        <RadioButton x:Name="TabDefaultRadioButton"
+                                     x:Uid="/Settings/TextAndEditorPage_TabKeySettings_DefaultRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     GroupName="TabBehaviorGroup"
+                                     Tag="-1" />
+                        <RadioButton x:Name="TabTwoSpacesRadioButton"
+                                     x:Uid="/Settings/TextAndEditorPage_TabKeySettings_TwoSpacesRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     GroupName="TabBehaviorGroup"
+                                     Tag="2" />
+                        <RadioButton x:Name="TabFourSpacesRadioButton"
+                                     x:Uid="/Settings/TextAndEditorPage_TabKeySettings_FourSpacesRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     GroupName="TabBehaviorGroup"
+                                     Tag="4" />
+                        <RadioButton x:Name="TabEightSpacesRadioButton"
+                                     x:Uid="/Settings/TextAndEditorPage_TabKeySettings_EightSpacesRadioButton"
+                                     Style="{StaticResource CustomRadioButtonStyle}"
+                                     GroupName="TabBehaviorGroup"
+                                     Tag="8" />
                     </StackPanel>
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_TabKeySettings_Description" Style="{ThemeResource DescriptionTextBlockStyle}" />
                 </StackPanel>
@@ -167,44 +212,53 @@
                 <StackPanel Style="{StaticResource SettingsSectionStyle}">
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_SearchEngineSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
                     <StackPanel x:Name="SearchEnginePanel">
-                        <RadioButton x:Name="BingRadioButton" GroupName="SearchEngineGroup" Style="{StaticResource CustomRadioButtonStyle}">
-                            <StackPanel Orientation="Horizontal" Spacing="8">
-                                <Image Source="ms-appx:///Assets/search_bing.png" Width="16" Stretch="Uniform" />
-                                <TextBlock Text="Bing" />
+                        <RadioButton x:Name="BingRadioButton" Style="{StaticResource CustomRadioButtonStyle}" GroupName="SearchEngineGroup">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Width="16"
+                                       Source="ms-appx:///Assets/search_bing.png"
+                                       Stretch="Uniform" />
+                                <TextBlock Margin="8,0,0,0" Text="Bing" />
                             </StackPanel>
                         </RadioButton>
-                        <RadioButton x:Name="GoogleRadioButton" GroupName="SearchEngineGroup" Style="{StaticResource CustomRadioButtonStyle}">
-                            <StackPanel Orientation="Horizontal" Spacing="8">
-                                <Image Source="ms-appx:///Assets/search_google.png" Width="16" Stretch="Uniform" />
-                                <TextBlock Text="Google" />
+                        <RadioButton x:Name="GoogleRadioButton" Style="{StaticResource CustomRadioButtonStyle}" GroupName="SearchEngineGroup">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Width="16"
+                                       Source="ms-appx:///Assets/search_google.png"
+                                       Stretch="Uniform" />
+                                <TextBlock Margin="8,0,0,0" Text="Google" />
                             </StackPanel>
                         </RadioButton>
-                        <RadioButton x:Name="DuckDuckGoRadioButton" GroupName="SearchEngineGroup" Style="{StaticResource CustomRadioButtonStyle}">
-                            <StackPanel Orientation="Horizontal" Spacing="8">
-                                <Image Source="ms-appx:///Assets/search_duckduckgo.png" Width="16" Stretch="Uniform" />
-                                <TextBlock Text="Duck Duck Go" />
+                        <RadioButton x:Name="DuckDuckGoRadioButton" Style="{StaticResource CustomRadioButtonStyle}" GroupName="SearchEngineGroup">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Width="16"
+                                       Source="ms-appx:///Assets/search_duckduckgo.png"
+                                       Stretch="Uniform" />
+                                <TextBlock Margin="8,0,0,0" Text="Duck Duck Go" />
                             </StackPanel>
                         </RadioButton>
-                        <RadioButton x:Name="CustomSearchUrlRadioButton" GroupName="SearchEngineGroup" Style="{StaticResource CustomRadioButtonStyle}">
-                            <StackPanel Orientation="Horizontal" Spacing="8">
-                                <Image Source="ms-appx:///Assets/search_custom.png" Width="16" Stretch="Uniform" />
-                                <TextBlock x:Uid="/Settings/TextAndEditorPage_SearchEngineSettings_CustomSearchUrlRadioButton" Text="Custom Search Engine" />
+                        <RadioButton x:Name="CustomSearchUrlRadioButton" Style="{StaticResource CustomRadioButtonStyle}" GroupName="SearchEngineGroup">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Width="16"
+                                       Source="ms-appx:///Assets/search_custom.png"
+                                       Stretch="Uniform" />
+                                <TextBlock x:Uid="/Settings/TextAndEditorPage_SearchEngineSettings_CustomSearchUrlRadioButton"
+                                           Margin="8,0,0,0"
+                                           Text="Custom Search Engine" />
                             </StackPanel>
                         </RadioButton>
                         <StackPanel Margin="28,5,0,4">
-                            <TextBox
-                                x:Name="CustomSearchUrl"
-                                IsSpellCheckEnabled="False"
-                                LostFocus="CustomSearchUrl_LostFocus"
-                                PlaceholderText="https://www.example.com/search?q={0}"
-                                Style="{StaticResource TransparentTextBoxStyle}"
-                                TextChanged="CustomSearchUrl_TextChanged" />
-                            <TextBlock
-                                x:Name="CustomUrlErrorReport"
-                                x:Uid="/Settings/TextAndEditorPage_SearchEngineSettings_CustomSearchUrlRadioButton_CustomUrlErrorReport"
-                                Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"
-                                Style="{ThemeResource DescriptionTextBlockStyle}"
-                                Visibility="Collapsed" />
+                            <TextBox x:Name="CustomSearchUrl"
+                                     Style="{StaticResource TransparentTextBoxStyle}"
+                                     BorderThickness="0"
+                                     TextChanged="CustomSearchUrl_TextChanged"
+                                     IsSpellCheckEnabled="False"
+                                     LostFocus="CustomSearchUrl_LostFocus"
+                                     PlaceholderText="https://www.example.com/search?q={0}" />
+                            <TextBlock x:Name="CustomUrlErrorReport"
+                                       x:Uid="/Settings/TextAndEditorPage_SearchEngineSettings_CustomSearchUrlRadioButton_CustomUrlErrorReport"
+                                       Style="{ThemeResource CaptionTextBlockStyle}"
+                                       Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"
+                                       Visibility="Collapsed" />
                         </StackPanel>
                     </StackPanel>
                     <TextBlock x:Uid="/Settings/TextAndEditorPage_SearchEngineSettings_Description" Style="{ThemeResource DescriptionTextBlockStyle}" />