diff --git a/src/Calculator/App.xaml.cpp b/src/Calculator/App.xaml.cpp
index 27075669..d7ef2824 100644
--- a/src/Calculator/App.xaml.cpp
+++ b/src/Calculator/App.xaml.cpp
@@ -70,21 +70,26 @@ App::App()
     this->HighContrastAdjustment = ApplicationHighContrastAdjustment::None;
 
     this->Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
+
+    Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"restartApp", nullptr);
+
     auto value = Windows::Storage::ApplicationData::Current->LocalSettings->Values->Lookup(L"themeSetting");
     auto DefaultTheme = ref new Windows::UI::ViewManagement::UISettings();
     auto uiTheme = DefaultTheme->GetColorValue(Windows::UI::ViewManagement::UIColorType::Background).ToString();
+
     if (value != nullptr)
     {
         String ^ colorSetting = safe_cast<String ^>(value);
+
         // Apply theme choice.
-        if (colorSetting == L"Dark")
-        {
-            App::Current->RequestedTheme = ApplicationTheme::Dark;
-        }
-        else if (colorSetting == L"Light")
+        if (colorSetting == L"Light")
         {
             App::Current->RequestedTheme = ApplicationTheme::Light;
         }
+        else if (colorSetting == L"Dark")
+        {
+            App::Current->RequestedTheme = ApplicationTheme::Dark;
+        }
         else if (colorSetting == L"System")
         {
             if (uiTheme == "#FF000000")
@@ -98,6 +103,7 @@ App::App()
         }
     }
 
+
 #if _DEBUG
     this->DebugSettings->IsBindingTracingEnabled = true;
     this->DebugSettings->BindingFailed += ref new BindingFailedEventHandler([](_In_ Object ^ /*sender*/, _In_ BindingFailedEventArgs ^ e) {
diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index db363621..4da94814 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -4735,7 +4735,7 @@
     <comment>Text for the "Settings" header</comment>
   </data>
   <data name="SettingsContribute" xml:space="preserve">
-    <value>To learn how you can contribute to Windows Calculator, visit the project on %HL%GitHub%HL%.</value>
-    <comment>{Locked="%HL%GitHub%HL%"}</comment>
+    <value>To learn how you can contribute to Windows Calculator, visit the project on%HL%GitHub%HL%.</value>
+    <comment>{Locked="%HL%GitHub%HL%"}. GitHub link, displayed on the settings page.</comment>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/SettingsPage.xaml b/src/Calculator/SettingsPage.xaml
index 2206b4de..70441d3f 100644
--- a/src/Calculator/SettingsPage.xaml
+++ b/src/Calculator/SettingsPage.xaml
@@ -1,7 +1,6 @@
 <Page x:Class="CalculatorApp.SettingsPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:Windows10version1809="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="using:CalculatorApp"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -22,141 +21,133 @@
         <Grid x:Name="PageGrid" AutomationProperties.LandmarkType="Main">
             <Grid.RowDefinitions>
                 <RowDefinition Height="1*"
-                           MinHeight="{StaticResource HamburgerHeight}"
-                           MaxHeight="52"/>
+                               MinHeight="{StaticResource HamburgerHeight}"
+                               MaxHeight="52"/>
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
             <Grid Height="{StaticResource HamburgerHeight}"
-              HorizontalAlignment="Left"
-              VerticalAlignment="Top">
+                  HorizontalAlignment="Left"
+                  VerticalAlignment="Top">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="{StaticResource HamburgerHeightGridLength}"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
 
                 <Button x:Name="BackButton"
-                    x:Uid="BackButton"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Background="{ThemeResource AppChromeAcrylicHostBackdropMediumLowBrush}"
-                    FontFamily="Segoe MDL2 Assets"
-                    FontSize="15"
-                    Windows10version1809:CornerRadius="0"
-                    Click="BackButtonClick"
-                    Content="&#xE72B;"/>
+                        x:Uid="BackButton"
+                        Style="{StaticResource NavigationBackButtonNormalStyle}"
+                        Click="BackButtonClick"/>
 
                 <TextBlock x:Uid="SettingsHeader"
-                       Grid.Column="1"
-                       Margin="8,-3,0,0"
-                       HorizontalAlignment="Left"
-                       VerticalAlignment="Center"
-                       Style="{StaticResource CategoryNameTextBlockStyle}"/>
+                           Grid.Column="1"
+                           Margin="8,-3,0,0"
+                           HorizontalAlignment="Left"
+                           VerticalAlignment="Center"
+                           Style="{StaticResource CategoryNameTextBlockStyle}"/>
             </Grid>
 
             <StackPanel Grid.Row="1" Margin="12,0,12,0">
                 <StackPanel x:Name="SettingsStack"
-                        AutomationProperties.LabeledBy="{Binding ElementName=SettingsAppTheme}"
-                        Orientation="Vertical">
+                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsAppTheme}"
+                            Orientation="Vertical">
 
                     <TextBlock x:Name="SettingsAppTheme"
-                           x:Uid="SettingsAppTheme"
-                           Style="{StaticResource SubtitleTextBlockStyle}"
-                           AutomationProperties.HeadingLevel="Level1"
-                           TextTrimming="Clip"/>
+                               x:Uid="SettingsAppTheme"
+                               Style="{StaticResource SubtitleTextBlockStyle}"
+                               AutomationProperties.HeadingLevel="Level1"
+                               TextTrimming="Clip"/>
 
                     <RadioButton x:Name="SettingsLightTheme"
-                             x:Uid="SettingsLightTheme"
-                             Grid.Row="3"
-                             Checked="LightChecked"/>
+                                 x:Uid="SettingsLightTheme"
+                                 Checked="ThemeChecked"
+                                 Tag="Light"/>
 
                     <RadioButton x:Name="SettingsDarkTheme"
-                             x:Uid="SettingsDarkTheme"
-                             Grid.Row="2"
-                             Checked="DarkChecked"/>
+                                 x:Uid="SettingsDarkTheme"
+                                 Checked="ThemeChecked"
+                                 Tag="Dark"/>
 
                     <RadioButton x:Name="SettingsSystemTheme"
-                             x:Uid="SettingsSystemTheme"
-                             Grid.Row="4"
-                             Checked="SystemChecked"/>
+                                 x:Uid="SettingsSystemTheme"
+                                 Checked="ThemeChecked"
+                                 Tag="System"/>
 
 
                     <TextBlock x:Name="SettingsRestartApp"
-                           Style="{StaticResource CaptionTextBlockStyle}"
-                           Foreground="{StaticResource SystemColorGrayTextColor}"/>
+                               Style="{StaticResource CaptionTextBlockStyle}"
+                               Foreground="{StaticResource SystemBaseMediumColor}"/>
 
                     <HyperlinkButton x:Name="ColorSettingsButton"
-                                 Margin="0,-2"
-                                 HorizontalAlignment="Left"
-                                 Click="ColorSettingsButtonClicked">
+                                     Margin="0,-2"
+                                     HorizontalAlignment="Left"
+                                     Click="ColorSettingsButtonClicked">
                         <TextBlock x:Uid="ColorSettingsButton" TextWrapping="Wrap"/>
                     </HyperlinkButton>
                 </StackPanel>
 
                 <StackPanel x:Name="AboutStack"
-                        Margin="0,32,0,0"
-                        AutomationProperties.LabeledBy="{Binding ElementName=SettingsAboutLabel}"
-                        Orientation="Vertical">
+                            Margin="0,32,0,0"
+                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsAboutLabel}"
+                            Orientation="Vertical">
 
                     <TextBlock x:Name="SettingsAboutLabel"
-                           x:Uid="SettingsAboutLabel"
-                           Style="{StaticResource SubtitleTextBlockStyle}"
-                           AutomationProperties.HeadingLevel="Level2"
-                           TextTrimming="Clip"/>
+                               x:Uid="SettingsAboutLabel"
+                               Style="{StaticResource SubtitleTextBlockStyle}"
+                               AutomationProperties.HeadingLevel="Level2"
+                               TextTrimming="Clip"/>
 
                     <TextBlock Margin="0,0,0,4"
-                           Style="{StaticResource BodyTextBlockStyle}"
-                           IsTextSelectionEnabled="True">
-                    <Run x:Name="SettingsVersion"/>
-                    <LineBreak/>
-                    <Run x:Name="SettingsCopyright"/>
+                               Style="{StaticResource BodyTextBlockStyle}"
+                               IsTextSelectionEnabled="True">
+                        <Run x:Name="SettingsVersion"/>
+                        <LineBreak/>
+                        <Run x:Name="SettingsCopyright"/>
                     </TextBlock>
 
                     <HyperlinkButton Margin="0,-2"
-                                 HorizontalAlignment="Left"
-                                 NavigateUri="https://go.microsoft.com/fwlink/?LinkID=529064"
-                                 ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=529064">
+                                     HorizontalAlignment="Left"
+                                     NavigateUri="https://go.microsoft.com/fwlink/?LinkID=529064"
+                                     ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=529064">
                         <TextBlock x:Uid="SettingsEULA" TextWrapping="Wrap"/>
                     </HyperlinkButton>
 
                     <HyperlinkButton Margin="0,-2"
-                                 HorizontalAlignment="Left"
-                                 NavigateUri="https://go.microsoft.com/fwlink/?LinkID=822631"
-                                 ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=822631">
+                                     HorizontalAlignment="Left"
+                                     NavigateUri="https://go.microsoft.com/fwlink/?LinkID=822631"
+                                     ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=822631">
                         <TextBlock x:Uid="SettingsServicesAgreement" TextWrapping="Wrap"/>
                     </HyperlinkButton>
 
                     <HyperlinkButton Margin="0,-2"
-                                 HorizontalAlignment="Left"
-                                 NavigateUri="https://go.microsoft.com/fwlink/?LinkID=521839"
-                                 ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=521839">
+                                     HorizontalAlignment="Left"
+                                     NavigateUri="https://go.microsoft.com/fwlink/?LinkID=521839"
+                                     ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=521839">
                         <TextBlock x:Uid="SettingsPrivacyStatment" TextWrapping="Wrap"/>
                     </HyperlinkButton>
 
                     <Button x:Name="SettingsFeedbackButton"
-                        x:Uid="SettingsFeedbackButton"
-                        Margin="0,12,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Style="{StaticResource ButtonRevealStyle}"
-                        Click="SettingsFeedbackButtonClick"/>
+                            x:Uid="SettingsFeedbackButton"
+                            Margin="0,12,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Style="{StaticResource ButtonRevealStyle}"
+                            Click="SettingsFeedbackButtonClick"/>
 
-                    <RichTextBlock x:Name="SettingsContribute"
+                    <TextBlock x:Name="SettingsContribute"
                                Margin="0,12,12,6"
                                HorizontalAlignment="Left"
+                               Style="{ThemeResource BodyTextBlockStyle}"
                                Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
-                               Style="{ThemeResource BodyRichTextBlockStyle}"
                                TextWrapping="Wrap">
-                        <Paragraph>
-                            <Run x:Name="ContributeRunBeforeLink"/>
-                            <Hyperlink NavigateUri="https://go.microsoft.com/fwlink/?linkid=2099939"
-                           TextDecorations="None"
-                           ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?linkid=2099939">
-                                <Run x:Name="ContributeRunLink"/>
-                            </Hyperlink>
-                            <Run x:Name="ContributeRunAfterLink"/>
-                        </Paragraph>
-                    </RichTextBlock>
+                        <Run x:Name="ContributeRunBeforeLink"/>
+                        <Hyperlink NavigateUri="https://go.microsoft.com/fwlink/?linkid=2099939"
+                                   TextDecorations="None"
+                                   ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?linkid=2099939">
+                            <Run x:Name="ContributeRunLink"/>
+                        </Hyperlink>
+                        <Run x:Name="ContributeRunAfterLink"/>
+                    </TextBlock>
                 </StackPanel>
             </StackPanel>
         </Grid>
diff --git a/src/Calculator/SettingsPage.xaml.cpp b/src/Calculator/SettingsPage.xaml.cpp
index 04d384bf..5b504514 100644
--- a/src/Calculator/SettingsPage.xaml.cpp
+++ b/src/Calculator/SettingsPage.xaml.cpp
@@ -25,48 +25,65 @@ using namespace winrt::Windows::Storage;
 #define BUILD_YEAR 2021
 #endif
 
-auto resourceLoader = AppResourceProvider::GetInstance();
-auto themevalue = Windows::Storage::ApplicationData::Current -> LocalSettings -> Values -> Lookup(L"themeSetting");
-String ^ colorSetting = safe_cast<String ^>(themevalue);
-
 SettingsPage::SettingsPage()
 {
-    auto locService = LocalizationService::GetInstance();
+    auto resourceLoader = AppResourceProvider::GetInstance();
+    auto themevalue = Windows::Storage::ApplicationData::Current->LocalSettings->Values->Lookup(L"themeSetting");
+    auto restartValue = Windows::Storage::ApplicationData::Current->LocalSettings->Values->Lookup(L"restartApp");
+    String ^ colorSetting = safe_cast<String ^>(themevalue);
+    String ^ restartApp = safe_cast<String ^>(restartValue);
 
-	InitializeComponent();
-
-    Language = locService->GetLanguage();
+    InitializeComponent();
 
     this->SetVersionString();
     this->SetCopyrightString();
-
+    this->InitializeContributeTextBlock();
+    SettingsLightTheme->Focus(::FocusState::Keyboard);
     
     if (themevalue != nullptr)
     {
-        if (colorSetting == L"Dark")
-        {
-            SettingsDarkTheme->IsChecked = true;
-        }
-        else if (colorSetting == L"Light")
+        if (colorSetting == L"Light")
         {
             SettingsLightTheme->IsChecked = true;
+            m_currentTheme = "Light";
+        }
+        else if (colorSetting == L"Dark")
+        {
+            SettingsDarkTheme->IsChecked = true;
+            m_currentTheme = "Dark";
         }
         else if (colorSetting == L"System")
         {
             SettingsSystemTheme->IsChecked = true;
+            m_currentTheme = "System";
         }
     }
     else
     {
         SettingsSystemTheme->IsChecked = true;
+        m_currentTheme = "System";
     }
 
-    InitializeContributeTextBlock();
+    if (restartValue != nullptr)
+    {
+        if (restartApp == L"True")
+        {
+            SettingsRestartApp->Visibility = ::Visibility::Visible;
+        }
+        else if (restartApp == L"False")
+        {
+            SettingsRestartApp->Visibility = ::Visibility::Collapsed;
+        }
+    }
+    else
+    {
+        SettingsRestartApp->Visibility = ::Visibility::Collapsed;
+    }
 }
 
 void SettingsPage::OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs ^ e)
 {
-    MainPage ^ mainPage = (MainPage ^) e->Parameter;
+    MainPage ^ mainPage = dynamic_cast<MainPage ^> (e->Parameter);
     if (mainPage != nullptr)
     {
         MainPageProperty = mainPage;
@@ -75,7 +92,8 @@ void SettingsPage::OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventA
 
 void SettingsPage::InitializeContributeTextBlock()
 {
-    std::wstring contributeHyperlinkText  = resourceLoader->GetResourceString(L"SettingsContribute")->Data();
+    auto resourceLoader = AppResourceProvider::GetInstance();
+    std::wstring contributeHyperlinkText = resourceLoader->GetResourceString(L"SettingsContribute")->Data();
 
     // The resource string has '%HL%' wrapped around 'GitHub'
     // Break the string and assign pieces appropriately.
@@ -83,9 +101,9 @@ void SettingsPage::InitializeContributeTextBlock()
     static const size_t delimiterLength{ delimiter.length() };
 
     // Find the delimiters.
-    size_t firstSplitPosition = contributeHyperlinkText .find(delimiter, 0);
+    size_t firstSplitPosition = contributeHyperlinkText.find(delimiter, 0);
     assert(firstSplitPosition != std::wstring::npos);
-    size_t secondSplitPosition = contributeHyperlinkText .find(delimiter, firstSplitPosition + 1);
+    size_t secondSplitPosition = contributeHyperlinkText.find(delimiter, firstSplitPosition + 1);
     assert(secondSplitPosition != std::wstring::npos);
     size_t hyperlinkTextLength = secondSplitPosition - (firstSplitPosition + delimiterLength);
 
@@ -102,6 +120,14 @@ void SettingsPage::InitializeContributeTextBlock()
 
 void SettingsPage::BackButtonClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
 {
+    if (SettingsRestartApp->Visibility == ::Visibility::Visible)
+    {
+        Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"restartApp", L"True");
+    }
+    else
+    {
+        Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"restartApp", L"False");
+    }
     MainPageProperty->CollapseSettings();
 }
 
@@ -115,6 +141,8 @@ void SettingsPage::SetVersionString()
 
 void SettingsPage::SetCopyrightString()
 {
+    auto resourceLoader = AppResourceProvider::GetInstance();
+
     auto copyrightText = LocalizationStringUtil::GetLocalizedString(resourceLoader->GetResourceString("SettingsCopyright"), StringReference(to_wstring(BUILD_YEAR).c_str()));
 
     SettingsCopyright->Text = copyrightText;
@@ -134,44 +162,32 @@ void SettingsPage::SettingsFeedbackButtonClick(_In_ Object ^ sender, _In_ Routed
     Launcher::LaunchUriAsync(ref new Uri("windows-feedback:?contextid=130&metadata=%7B%22Metadata%22:[%7B%22AppBuild%22:%22" + versionNumber + "%22%7D]%7D"));
 }
 
-void SettingsPage::LightChecked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
+void SettingsPage::ThemeChecked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
 {
-    if (colorSetting == "Light")
-    {
-        SettingsRestartApp->Visibility = Windows::UI::Xaml::Visibility::Collapsed;
-    }
-    else
-    {
-        SettingsRestartApp->Visibility = Windows::UI::Xaml::Visibility::Visible;
-        SettingsRestartApp->Text = resourceLoader->GetResourceString("SettingsRestartNotice");
-    }
-    Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"themeSetting", ApplicationTheme::Light.ToString());
-}
+    auto resourceLoader = AppResourceProvider::GetInstance();
+    RadioButton ^ radioButton = safe_cast<RadioButton ^>(sender);
+    String ^ tag = radioButton->Tag->ToString();
 
-void SettingsPage::DarkChecked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
-{
-    if (colorSetting == "Dark")
+    if (m_currentTheme == tag)
     {
-        SettingsRestartApp->Visibility = Windows::UI::Xaml::Visibility::Collapsed;
+        SettingsRestartApp->Visibility = ::Visibility::Collapsed;
     }
     else
     {
-        SettingsRestartApp->Visibility = Windows::UI::Xaml::Visibility::Visible;
+        SettingsRestartApp->Visibility = ::Visibility::Visible;
         SettingsRestartApp->Text = resourceLoader->GetResourceString("SettingsRestartNotice");
     }
-    Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"themeSetting", ApplicationTheme::Dark.ToString());
-}
 
-void SettingsPage::SystemChecked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
-{
-    if (colorSetting == "System")
+    if (tag == "Light")
     {
-        SettingsRestartApp->Visibility = Windows::UI::Xaml::Visibility::Collapsed;
+        Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"themeSetting", ApplicationTheme::Light.ToString());
     }
-    else
+    else if (tag == "Dark")
     {
-        SettingsRestartApp->Visibility = Windows::UI::Xaml::Visibility::Visible;
-        SettingsRestartApp->Text = resourceLoader->GetResourceString("SettingsRestartNotice");
+        Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"themeSetting", ApplicationTheme::Dark.ToString());
+    }
+    else if (tag == "System")
+    {
+        Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"themeSetting", L"System");
     }
-    Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"themeSetting", L"System");
 }
diff --git a/src/Calculator/SettingsPage.xaml.h b/src/Calculator/SettingsPage.xaml.h
index 5e9ca66c..e49d30cb 100644
--- a/src/Calculator/SettingsPage.xaml.h
+++ b/src/Calculator/SettingsPage.xaml.h
@@ -19,14 +19,13 @@ namespace CalculatorApp
         virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs ^ e) override;
 
     private:
+        Platform::String ^ m_currentTheme;
         void InitializeContributeTextBlock();
         void BackButtonClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
         void ColorSettingsButtonClicked(_In_ Platform::Object ^ sender, _In_ Windows::UI::Xaml::RoutedEventArgs ^ e);
         void SettingsFeedbackButtonClick(_In_ Platform::Object ^ sender, _In_ Windows::UI::Xaml::RoutedEventArgs ^ e);
         void SetVersionString();
         void SetCopyrightString();
-        void LightChecked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
-        void DarkChecked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
-        void SystemChecked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
+        void ThemeChecked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
     };
 }