diff --git a/Yugen.Mosaic.Uwp/App.xaml b/Yugen.Mosaic.Uwp/App.xaml
index a8781e9..ec16e0b 100644
--- a/Yugen.Mosaic.Uwp/App.xaml
+++ b/Yugen.Mosaic.Uwp/App.xaml
@@ -109,7 +109,7 @@
                         </Setter>
                     </Style>
 
-                    <Style x:Key="ProgressRingStyle1"
+                    <Style x:Key="YugenProgressRingStyle"
                            TargetType="ProgressRing">
                         <Setter Property="Background"
                                 Value="Transparent" />
@@ -238,6 +238,53 @@
                         </Setter>
                     </Style>
 
+                    <Style x:Key="YugenHyperlinkButtonStyle"
+                           TargetType="HyperlinkButton">
+                        <Setter Property="Foreground"
+                                Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
+                    </Style>
+
+                    <Style x:Key="YugenBodyTextBlockStyle"
+                           BasedOn="{StaticResource BodyTextBlockStyle}"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground"
+                                Value="{ThemeResource AppForegroundBrush}" />
+                    </Style>
+
+                    <Style x:Key="YugenCaptionTextBlockStyle"
+                           BasedOn="{StaticResource CaptionTextBlockStyle}"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground"
+                                Value="{ThemeResource AppForegroundBrush}" />
+                    </Style>
+
+                    <Style x:Key="YugenSubtitleTextBlockStyle"
+                           BasedOn="{StaticResource SubtitleTextBlockStyle}"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground"
+                                Value="{ThemeResource AppForegroundBrush}" />
+                    </Style>
+
+                    <Style x:Key="YugenTitleTextBlockStyle"
+                           BasedOn="{StaticResource TitleTextBlockStyle}"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground"
+                                Value="{ThemeResource AppForegroundBrush}" />
+                    </Style>
+
+                    <Style x:Key="YugenBaseTextBlockStyle"
+                           BasedOn="{StaticResource BaseTextBlockStyle}"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground"
+                                Value="{ThemeResource AppForegroundBrush}" />
+                    </Style>
+
+                    <Style x:Key="YugenRadioButtonStyle"
+                           TargetType="RadioButton">
+                        <Setter Property="Foreground"
+                                Value="{ThemeResource AppForegroundBrush}" />
+                    </Style>
+                    
                 </ResourceDictionary>
 
             </ResourceDictionary.MergedDictionaries>
diff --git a/Yugen.Mosaic.Uwp/App.xaml.cs b/Yugen.Mosaic.Uwp/App.xaml.cs
index f932fcf..3642c6b 100644
--- a/Yugen.Mosaic.Uwp/App.xaml.cs
+++ b/Yugen.Mosaic.Uwp/App.xaml.cs
@@ -7,7 +7,6 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
-using Yugen.Mosaic.Uwp.Extensions;
 using Yugen.Mosaic.Uwp.Services;
 using Yugen.Mosaic.Uwp.Views;
 using Yugen.Toolkit.Standard.Extensions;
diff --git a/Yugen.Mosaic.Uwp/Controls/SettingsDialog.xaml b/Yugen.Mosaic.Uwp/Controls/SettingsDialog.xaml
index 3a65591..f063e38 100644
--- a/Yugen.Mosaic.Uwp/Controls/SettingsDialog.xaml
+++ b/Yugen.Mosaic.Uwp/Controls/SettingsDialog.xaml
@@ -12,107 +12,101 @@
     <ContentDialog.Resources>
         <Thickness x:Key="ContentDialogPadding">0</Thickness>
         <converters:EnumToBooleanConverter x:Key="EnumToBooleanConverter"
-                                        EnumType="ElementTheme" />
+                                           EnumType="ElementTheme" />
     </ContentDialog.Resources>
     
     <ContentDialog.DataContext>
         <vm:SettingsViewModel />
     </ContentDialog.DataContext>
     
-    <Grid Padding="15,15,15,30"
+    <Grid Padding="16,16,16,32"
           Background="{ThemeResource AppDeepBackgroundBrush}">
         
         <StackPanel Orientation="Vertical"
-                    Spacing="15"
+                    Spacing="16"
                     MaxWidth="360">
             
             <Grid>
-                <TextBlock Text="Settings"
+
+                <TextBlock x:Uid="SettingsTitleTextBlock"
                            Style="{ThemeResource TitleTextBlockStyle}"
-                           Foreground="{ThemeResource AppForegroundBrush}"
                            HorizontalAlignment="Left"
-                           Margin="5,0,0,0" />
+                           Margin="4,0,0,0" />
                 <Button Style="{StaticResource SoftRevealButtonStyle}"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Top"
                         Command="{x:Bind HideCommand}">
                     <FontIcon Glyph="" />
                 </Button>
+                
             </Grid>
             
-            <StackPanel Spacing="5"
-                        Padding="15,0,15,0">
-                <TextBlock Text="Theme"
-                           Foreground="{ThemeResource AppForegroundBrush}"
-                           Style="{StaticResource SubtitleTextBlockStyle}" />
-                <RadioButton Content="Light"
+            <StackPanel Spacing="4"
+                        Padding="16,0">
+
+                <TextBlock x:Uid="SettingsThemeTextBlock"
+                           Style="{StaticResource YugenSubtitleTextBlockStyle}" />
+                <RadioButton x:Uid="SettingsThemeLightTextBlock"
                              Command="{x:Bind ViewModel.SwitchThemeCommand}"
                              IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Light, Mode=OneWay}"
-                             Foreground="{ThemeResource AppForegroundBrush}">
+                             Style="{ThemeResource YugenRadioButtonStyle}">
                     <RadioButton.CommandParameter>
                         <xaml:ElementTheme>Light</xaml:ElementTheme>
                     </RadioButton.CommandParameter>
                 </RadioButton>
-                <RadioButton Content="Dark"
+                <RadioButton x:Uid="SettingsThemeDarkTextBlock"
                              Command="{x:Bind ViewModel.SwitchThemeCommand}"
                              IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Dark, Mode=OneWay}"
-                             Foreground="{ThemeResource AppForegroundBrush}">
+                             Style="{ThemeResource YugenRadioButtonStyle}">
                     <RadioButton.CommandParameter>
                         <xaml:ElementTheme>Dark</xaml:ElementTheme>
                     </RadioButton.CommandParameter>
                 </RadioButton>
-                <RadioButton Content="Default"
+                <RadioButton x:Uid="SettingsThemeDefaultTextBlock"
                              Command="{x:Bind ViewModel.SwitchThemeCommand}"
                              IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Default, Mode=OneWay}"
-                             Foreground="{ThemeResource AppForegroundBrush}">
+                             Style="{ThemeResource YugenRadioButtonStyle}">
                     <RadioButton.CommandParameter>
                         <xaml:ElementTheme>Default</xaml:ElementTheme>
                     </RadioButton.CommandParameter>
                 </RadioButton>
+                
             </StackPanel>
             
-            <StackPanel Spacing="5"
-                        Padding="15,0,15,0">
-                
-                <TextBlock Text="About"
-                           Foreground="{ThemeResource AppForegroundBrush}"
-                           Style="{StaticResource SubtitleTextBlockStyle}" />
-                
-                <TextBlock Foreground="{ThemeResource AppForegroundBrush}"
-                           Style="{StaticResource CaptionTextBlockStyle}">
-                    <Run Text="{x:Bind ViewModel.AppName}"
-                         FontWeight="SemiBold" />
-                    <LineBreak />
-                    <Run Text="{x:Bind ViewModel.AppVersion}" />
-                </TextBlock>
-                
+            <StackPanel Spacing="4"
+                        Padding="16,0">
+
+                <TextBlock x:Uid="SettingsAboutTextBlock"
+                           Style="{StaticResource YugenSubtitleTextBlockStyle}" />
 
-                <TextBlock Foreground="{ThemeResource AppForegroundBrush}"
-                           Style="{StaticResource BodyTextBlockStyle}"
-                           Text="Developed by" />
-                <HyperlinkButton Content="{x:Bind ViewModel.Publisher}"
-                                 Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
+                <TextBlock x:Uid="SettingsAppNameTextBlock"
+                           Style="{StaticResource YugenBodyTextBlockStyle}" />
+                <TextBlock Style="{StaticResource YugenCaptionTextBlockStyle}"
+                           Text="{x:Bind ViewModel.AppVersion}" />
+
+                <TextBlock x:Uid="SettingsDevelopedTextBlock"
+                           Margin="0,4,0,0"
+                           Style="{StaticResource YugenBodyTextBlockStyle}"/>
+                <HyperlinkButton x:Uid="SettingsDevelopedHyperlink" 
+                                 Content="{x:Bind ViewModel.Publisher}"
                                  Margin="0,-8,0,0"
-                                 NavigateUri="http://www.yugenapps.com"/>
+                                 Style="{ThemeResource YugenHyperlinkButtonStyle}"/>
 
-                <TextBlock Foreground="{ThemeResource AppForegroundBrush}"
-                           Style="{StaticResource BodyTextBlockStyle}"
-                           Text="UI" />
-                <HyperlinkButton Content="Leisvan"
-                                 Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
-                                 Margin="0,-8,0,0" />
+                <TextBlock x:Uid="SettingsUITextBlock"
+                           Style="{StaticResource YugenBodyTextBlockStyle}" />
+                <HyperlinkButton x:Uid="SettingsUIHyperlink"
+                                 Margin="0,-8,0,0"
+                                 Style="{ThemeResource YugenHyperlinkButtonStyle}" />
 
-                <TextBlock Foreground="{ThemeResource AppForegroundBrush}"
-                           Style="{StaticResource BodyTextBlockStyle}" 
-                           Text="Icon"/>
-                <HyperlinkButton Content="Yoshi"
-                                 Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
+                <TextBlock x:Uid="SettingsIconTextBlock"
+                           Style="{StaticResource YugenBodyTextBlockStyle}" />
+                <HyperlinkButton x:Uid="SettingsIconHyperlink"
                                  Margin="0,-8,0,0"
-                                 NavigateUri="http://www.yoshi.com"/>
+                                 Style="{ThemeResource YugenHyperlinkButtonStyle}"/>
 
-                <HyperlinkButton Content="Rate and review"
-                                 Command="{x:Bind ViewModel.LaunchRateAndReviewCommand}"
-                                 Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"/>
+                <HyperlinkButton x:Uid="SettingsRateHyperlink"
+                                 NavigateUri="{x:Bind ViewModel.RateAndReviewUri}"
+                                 Style="{ThemeResource YugenHyperlinkButtonStyle}"/>
                 
             </StackPanel>
             
diff --git a/Yugen.Mosaic.Uwp/Strings/en-US/Resources.resw b/Yugen.Mosaic.Uwp/Strings/en-US/Resources.resw
index 1825bf9..939fbb6 100644
--- a/Yugen.Mosaic.Uwp/Strings/en-US/Resources.resw
+++ b/Yugen.Mosaic.Uwp/Strings/en-US/Resources.resw
@@ -117,6 +117,54 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="MainAddMasterTextBlock.Text" xml:space="preserve">
+    <value>Click here to choose a Master image</value>
+  </data>
+  <data name="MainAddTilesTextBlock.Text" xml:space="preserve">
+    <value>Add Tiles</value>
+  </data>
+  <data name="MainGenerateButton.Content" xml:space="preserve">
+    <value>Generate</value>
+  </data>
+  <data name="MainHeightTextBlock.Text" xml:space="preserve">
+    <value>H:</value>
+  </data>
+  <data name="MainHelpTextBlock.Text" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="MainMasterImageTextBlock.Text" xml:space="preserve">
+    <value>Master Image</value>
+  </data>
+  <data name="MainMosaicTypeTextBlock.Text" xml:space="preserve">
+    <value>MosaicType</value>
+  </data>
+  <data name="MainOutputPropertiesTextBlock.Text" xml:space="preserve">
+    <value>Output Properties</value>
+  </data>
+  <data name="MainResetButton.Content" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="MainSaveButton.Content" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="MainSettingsTextBlock.Text" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="MainShowGridCheckBox.Content" xml:space="preserve">
+    <value>Show Grid</value>
+  </data>
+  <data name="MainTileProperties.Text" xml:space="preserve">
+    <value>Tile Properties</value>
+  </data>
+  <data name="MainTilesListTextBlock.Text" xml:space="preserve">
+    <value>Tiles list</value>
+  </data>
+  <data name="MainTitleTextBlock.Text" xml:space="preserve">
+    <value>Yugen Mosaic</value>
+  </data>
+  <data name="MainWidthTextBlock.Text" xml:space="preserve">
+    <value>W:</value>
+  </data>
   <data name="OnboardingStageAddTilesDescription" xml:space="preserve">
     <value>Then add images. Yugen Mosaic will use them as tiles to build your mosaic. The more tiles you choose, the better result you will get!</value>
   </data>
@@ -163,4 +211,55 @@
   <data name="OnboardingStageTilePropertiesTitle" xml:space="preserve">
     <value>Set the tile properties</value>
   </data>
+  <data name="SettingsAboutTextBlock.Text" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="SettingsAppNameTextBlock.Text" xml:space="preserve">
+    <value>Yugen Mosaic</value>
+  </data>
+  <data name="SettingsDevelopedHyperlink.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="SettingsDevelopedHyperlink.NavigateUri" xml:space="preserve">
+    <value>http://www.yugenapps.com</value>
+  </data>
+  <data name="SettingsDevelopedTextBlock.Text" xml:space="preserve">
+    <value>Developed By</value>
+  </data>
+  <data name="SettingsIconHyperlink.Content" xml:space="preserve">
+    <value>Yoshi</value>
+  </data>
+  <data name="SettingsIconHyperlink.NavigateUri" xml:space="preserve">
+    <value>https://github.com/yoshiask</value>
+  </data>
+  <data name="SettingsIconTextBlock.Text" xml:space="preserve">
+    <value>Icon</value>
+  </data>
+  <data name="SettingsRateHyperlink.Content" xml:space="preserve">
+    <value>Rate and review</value>
+  </data>
+  <data name="SettingsThemeDarkTextBlock.Content" xml:space="preserve">
+    <value>Dark</value>
+  </data>
+  <data name="SettingsThemeDefaultTextBlock.Content" xml:space="preserve">
+    <value>System Default</value>
+  </data>
+  <data name="SettingsThemeLightTextBlock.Content" xml:space="preserve">
+    <value>Light</value>
+  </data>
+  <data name="SettingsThemeTextBlock.Text" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+  <data name="SettingsTitleTextBlock.Text" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="SettingsUIHyperlink.Content" xml:space="preserve">
+    <value>Leisvan</value>
+  </data>
+  <data name="SettingsUIHyperlink.NavigateUri" xml:space="preserve">
+    <value>https://twitter.com/leisvanCT</value>
+  </data>
+  <data name="SettingsUITextBlock.Text" xml:space="preserve">
+    <value>UI</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Yugen.Mosaic.Uwp/ViewModels/SettingsViewModel.cs b/Yugen.Mosaic.Uwp/ViewModels/SettingsViewModel.cs
index 331e44e..d28a16e 100644
--- a/Yugen.Mosaic.Uwp/ViewModels/SettingsViewModel.cs
+++ b/Yugen.Mosaic.Uwp/ViewModels/SettingsViewModel.cs
@@ -13,16 +13,12 @@ namespace Yugen.Mosaic.Uwp.ViewModels
 {
     public class SettingsViewModel : BaseViewModel
     {
-        private const string STORE_REVIEWFORMAT = "ms-windows-store:REVIEW?PFN={0}";
         private ElementTheme _elementTheme = ThemeSelectorService.Theme;
-        private ICommand _launchRateAndReviewCommand;
         private ICommand _switchThemeCommand;
-        //This may change if the app gets localized
-        public string AppName => "Yugen Mosaic";
 
         public string AppVersion => SystemHelper.AppVersion;
-
-        public string[] Collaborator => new[] { "Leisvan", "Yoshi" };
+        public string Publisher => SystemHelper.Publisher;
+        public string RateAndReviewUri => $"ms-windows-store:REVIEW?PFN={Package.Current.Id.FamilyName}";
 
         public ElementTheme ElementTheme
         {
@@ -30,13 +26,8 @@ public ElementTheme ElementTheme
             set => Set(ref _elementTheme, value);
         }
 
-        public string Publisher => SystemHelper.Publisher;
-
-        public ICommand LaunchRateAndReviewCommand => _launchRateAndReviewCommand ?? (_launchRateAndReviewCommand = new AsyncRelayCommand(LaunchRateAndReviewCommandBehavior));
         public ICommand SwitchThemeCommand => _switchThemeCommand ?? (_switchThemeCommand = new AsyncRelayCommand<ElementTheme>(SwitchThemeCommandBehavior));
 
-        private async Task LaunchRateAndReviewCommandBehavior() => await Launcher.LaunchUriAsync(new Uri(string.Format(STORE_REVIEWFORMAT, Package.Current.Id.FamilyName)));
-
         private async Task SwitchThemeCommandBehavior(ElementTheme param)
         {
             ElementTheme = param;
diff --git a/Yugen.Mosaic.Uwp/Views/MainPage.xaml b/Yugen.Mosaic.Uwp/Views/MainPage.xaml
index e21163d..e072516 100644
--- a/Yugen.Mosaic.Uwp/Views/MainPage.xaml
+++ b/Yugen.Mosaic.Uwp/Views/MainPage.xaml
@@ -39,10 +39,9 @@
                 <StackPanel Orientation="Horizontal"
                             Margin="32,0,0,0">
 
-                    <TextBlock Text="Yugen Mosaic"
+                    <TextBlock x:Uid="MainTitleTextBlock"
                                VerticalAlignment="Center"
-                               Foreground="{ThemeResource AppForegroundBrush}"
-                               Style="{StaticResource BaseTextBlockStyle}" />
+                               Style="{StaticResource YugenBaseTextBlockStyle}" />
 
                 </StackPanel>
 
@@ -60,9 +59,8 @@
 
                 <StackPanel Spacing="5">
 
-                    <TextBlock Foreground="{ThemeResource AppForegroundBrush}"
-                               Style="{StaticResource CaptionTextBlockStyle}"
-                               Text="Master Image" />
+                    <TextBlock x:Uid="MainMasterImageTextBlock"
+                               Style="{StaticResource YugenCaptionTextBlockStyle}" />
 
                     <Border Height="230"
                             Width="230">
@@ -98,7 +96,7 @@
                                             Spacing="10">
                                     <FontIcon Glyph=""
                                               FontSize="32" />
-                                    <TextBlock Text="Click here to choose a Master image"
+                                    <TextBlock x:Uid="MainAddMasterTextBlock"
                                                TextWrapping="WrapWholeWords"
                                                TextAlignment="Center" />
                                 </StackPanel>
@@ -115,9 +113,8 @@
                             Spacing="5"
                             Margin="0,25,0,10">
 
-                    <TextBlock Foreground="{ThemeResource AppForegroundBrush}"
-                               Style="{StaticResource CaptionTextBlockStyle}"
-                               Text="Tiles list" />
+                    <TextBlock x:Uid="MainTilesListTextBlock" 
+                               Style="{StaticResource YugenCaptionTextBlockStyle}" />
 
                     <Button x:Name="AddTilesButton"
                             Command="{x:Bind ViewModel.AddTilesCommand}"
@@ -125,7 +122,7 @@
                         <StackPanel Orientation="Horizontal"
                                     Spacing="5">
                             <FontIcon Glyph="" />
-                            <TextBlock Text="Add Tiles" />
+                            <TextBlock x:Uid="MainAddTilesTextBlock" />
                         </StackPanel>
                     </Button>
 
@@ -176,7 +173,7 @@
                                Stretch="Uniform" />
                     </Border>
 
-                    <controls:AlignmentGrid Opacity="0.28"
+                    <controls:AlignmentGrid Opacity="0.3"
                                             LineBrush="Firebrick"
                                             HorizontalStep="{x:Bind ViewModel.TileWidth, Mode=OneWay}"
                                             VerticalStep="{x:Bind ViewModel.TileHeight, Mode=OneWay}"
@@ -202,9 +199,8 @@
 
                     <StackPanel Spacing="10">
 
-                        <TextBlock Foreground="{ThemeResource AppForegroundBrush}"
-                                   Style="{StaticResource CaptionTextBlockStyle}"
-                                   Text="Tile Properties" />
+                        <TextBlock x:Uid="MainTileProperties" 
+                                   Style="{StaticResource YugenCaptionTextBlockStyle}" />
 
                         <Grid x:Name="TilePropertiesGrid">
 
@@ -215,10 +211,9 @@
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
 
-                            <TextBlock Text="W:"
+                            <TextBlock x:Uid="MainWidthTextBlock"
                                        VerticalAlignment="Center"
-                                       Foreground="{ThemeResource AppForegroundBrush}"
-                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Style="{StaticResource YugenCaptionTextBlockStyle}"
                                        Margin="5,0,5,0" />
 
                             <validation:ValidatingTextBox Grid.Column="1"
@@ -229,10 +224,9 @@
                                                           IsRealTimeValidationEnabled="True" />
 
                             <TextBlock Grid.Column="2"
-                                       Text="H:"
+                                       x:Uid="MainHeightTextBlock"
                                        VerticalAlignment="Center"
-                                       Foreground="{ThemeResource AppForegroundBrush}"
-                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Style="{StaticResource YugenCaptionTextBlockStyle}"
                                        Margin="5,0,5,0" />
 
                             <validation:ValidatingTextBox Grid.Column="3"
@@ -248,9 +242,8 @@
                                    Fill="{ThemeResource AppBorderBrush}"
                                    Margin="0,15,0,0" />
 
-                        <TextBlock Foreground="{ThemeResource AppForegroundBrush}"
-                                   Style="{StaticResource CaptionTextBlockStyle}"
-                                   Text="Mosaic Type" />
+                        <TextBlock x:Uid="MainMosaicTypeTextBlock"
+                                   Style="{StaticResource YugenCaptionTextBlockStyle}" />
 
                         <ComboBox x:Name="MosaicTypeComboBox"
                                   HorizontalAlignment="Stretch"
@@ -262,9 +255,8 @@
                                    Fill="{ThemeResource AppBorderBrush}"
                                    Margin="0,15,0,0" />
 
-                        <TextBlock Foreground="{ThemeResource AppForegroundBrush}"
-                                   Style="{StaticResource CaptionTextBlockStyle}"
-                                   Text="Output Properties" />
+                        <TextBlock x:Uid="MainOutputPropertiesTextBlock"
+                                   Style="{StaticResource YugenCaptionTextBlockStyle}" />
 
                         <Grid x:Name="OutputPropertiesGrid">
 
@@ -275,10 +267,9 @@
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
 
-                            <TextBlock Text="W:"
+                            <TextBlock x:Uid="MainWidthTextBlock"
                                        VerticalAlignment="Center"
-                                       Foreground="{ThemeResource AppForegroundBrush}"
-                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Style="{StaticResource YugenCaptionTextBlockStyle}"
                                        Margin="5,0,5,0" />
 
                             <validation:ValidatingTextBox Grid.Column="1"
@@ -289,10 +280,9 @@
                                                           IsRealTimeValidationEnabled="True" />
 
                             <TextBlock Grid.Column="2"
-                                       Text="H:"
+                                       x:Uid="MainHeightTextBlock"
                                        VerticalAlignment="Center"
-                                       Foreground="{ThemeResource AppForegroundBrush}"
-                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                       Style="{StaticResource YugenCaptionTextBlockStyle}"
                                        Margin="5,0,5,0" />
 
                             <validation:ValidatingTextBox Grid.Column="3"
@@ -309,14 +299,14 @@
                                    Margin="0,15,0,0" />
 
                         <validation:ValidatingButton x:Name="GenerateButton"
+                                                     x:Uid="MainGenerateButton"
                                                      Command="{x:Bind ViewModel.GenerateCommand}"
-                                                     Content="Generate"
                                                      HorizontalAlignment="Stretch"
                                                      Margin="5,0,0,0"
                                                      Style="{ThemeResource AccentButtonStyle}"
                                                      ValidatingForm="{x:Bind ValidatingForm}" />
 
-                        <CheckBox Content="Show Grid"
+                        <CheckBox x:Uid="MainShowGridCheckBox"
                                   IsChecked="{x:Bind ViewModel.IsAlignmentGridVisibile,Mode=TwoWay}" />
 
                         <Grid Margin="5,0,0,0">
@@ -327,13 +317,13 @@
                             </Grid.ColumnDefinitions>
 
                             <Button x:Name="SaveButton"
-                                    Content="Save"
+                                    x:Uid="MainSaveButton"
                                     HorizontalAlignment="Stretch"
                                     Margin="0,0,5,0"
                                     Command="{x:Bind ViewModel.SaveCommand}" />
 
                             <Button Grid.Column="1"
-                                    Content="Reset"
+                                    x:Uid="MainResetButton"
                                     HorizontalAlignment="Stretch"
                                     Margin="5,0,0,0"
                                     Command="{x:Bind ViewModel.ResetCommand}" />
@@ -343,7 +333,7 @@
                         <ProgressRing IsActive="{x:Bind ViewModel.IsLoading, Mode=OneWay}"
                                       Height="80"
                                       Margin="2"
-                                      Style="{StaticResource ProgressRingStyle1}"
+                                      Style="{StaticResource YugenProgressRingStyle}"
                                       Width="80" />
 
                         <!--<toolkitControls:RadialProgressBar x:Name="RadialProgressBarControl"
@@ -370,7 +360,7 @@
                     <StackPanel Orientation="Horizontal"
                                 Spacing="5">
                         <FontIcon Glyph="&#xE897;" />
-                        <TextBlock Text="Help" />
+                        <TextBlock x:Uid="MainHelpTextBlock" />
                     </StackPanel>
                 </Button>
 
@@ -382,7 +372,7 @@
                     <StackPanel Orientation="Horizontal"
                                 Spacing="5">
                         <FontIcon Glyph="" />
-                        <TextBlock Text="Settings" />
+                        <TextBlock x:Uid="MainSettingsTextBlock" />
                     </StackPanel>
                 </Button>