Merge pull request #23 from nventive/dev/madi/fix-button-themeing

Dev/madi/fix button themeing
2025-08-22 22:23:29 -07:00 · 2019-05-26 08:18:58 -04:00 · 2019-05-26 08:18:58 -04:00 · 6843d212c3
commit 6843d212c3
parent a9dfbeec4e be66b4c8e6
4 changed files with 1872 additions and 1859 deletions
--- a/src/Calculator.Shared/Styles.xaml
+++ b/src/Calculator.Shared/Styles.xaml
--- a/src/Calculator.Shared/Views/CalculatorProgrammerOperators.xaml
+++ b/src/Calculator.Shared/Views/CalculatorProgrammerOperators.xaml
@ -1,49 +1,49 @@
 <UserControl x:Class="CalculatorApp.CalculatorProgrammerOperators"
-						 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-						 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-						 xmlns:common="using:CalculatorApp.Common"
-						 xmlns:controls="using:CalculatorApp.Controls"
-						 xmlns:designdata="using:CalculatorApp.DesignData"
-						 xmlns:local="using:CalculatorApp.Views"
-						 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-						 x:Name="ControlRoot"
-						 mc:Ignorable="">
+			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:common="using:CalculatorApp.Common"
+			 xmlns:controls="using:CalculatorApp.Controls"
+			 xmlns:designdata="using:CalculatorApp.DesignData"
+			 xmlns:local="using:CalculatorApp.Views"
+			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 x:Name="ControlRoot"
+			 mc:Ignorable="">

 	<UserControl.Resources>
 		<!-- Programmer mode display radio button -->
 		<Style x:Key="ProgModeRadioButtonStyle"
-					 TargetType="RadioButton">
+			   TargetType="RadioButton">

 			<Setter Property="Foreground"
-							Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+					Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
 			<Setter Property="MinHeight"
-							Value="12" />
+					Value="12" />
 			<Setter Property="MinWidth"
-							Value="280" />
+					Value="280" />
 			<Setter Property="MaxHeight"
-							Value="60" />
+					Value="60" />
 			<Setter Property="VerticalAlignment"
-							Value="Stretch" />
+					Value="Stretch" />
 			<Setter Property="HorizontalAlignment"
-							Value="Stretch" />
+					Value="Stretch" />
 			<Setter Property="Padding"
-							Value="8,0,0,0" />
+					Value="8,0,0,0" />
 			<Setter Property="Typography.NumeralAlignment"
-							Value="Tabular" />
+					Value="Tabular" />
 			<Setter Property="FontSize"
-							Value="{ThemeResource CaptionFontSize}" />
+					Value="{ThemeResource CaptionFontSize}" />
 			<Setter Property="FontWeight"
-							Value="SemiBold" />
+					Value="SemiBold" />
 			<Setter Property="IsTextScaleFactorEnabled"
-							Value="True" />
+					Value="True" />

 			<Setter Property="Template">
 				<Setter.Value>
 					<ControlTemplate TargetType="RadioButton">

 						<Grid x:Name="ControlRoot"
-									VerticalAlignment="Stretch"
-									Background="{ThemeResource SystemControlBackgroundTransparentBrush}">
+							  VerticalAlignment="Stretch"
+							  Background="{ThemeResource SystemControlBackgroundTransparentBrush}">

 							<VisualStateManager.VisualStateGroups>
 								<VisualStateGroup x:Name="CommonStates">
@ -75,7 +75,7 @@
 									<VisualState x:Name="Disabled">
 										<VisualState.Setters>
 											<Setter Target="RevealBackplate.Visibility"
-															Value="Collapsed" />
+													Value="Collapsed" />
 										</VisualState.Setters>
 									</VisualState>
 								</VisualStateGroup>
@ -83,9 +83,9 @@
 									<VisualState x:Name="Checked">
 										<VisualState.Setters>
 											<Setter Target="CheckedStatesGrid.Opacity"
-															Value="1" />
+													Value="1" />
 											<Setter Target="NormalStatesGrid.Opacity"
-															Value="0" />
+													Value="0" />
 										</VisualState.Setters>
 									</VisualState>
 									<VisualState x:Name="Unchecked" />
@ -94,10 +94,10 @@
 							</VisualStateManager.VisualStateGroups>

 							<Border x:Name="RevealBackplate"
-											Margin="0,-1,0,0"
-											BorderThickness="0,1,0,1" />
+									Margin="0,-1,0,0"
+									BorderThickness="0,1,0,1" />

-											<!--
+							<!--
                      UNO TODO
                      Background="{ThemeResource ListViewItemRevealBackground}"
 											BorderBrush="{ThemeResource ListViewItemRevealBorderBrush}"-->
@ -106,83 +106,83 @@
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="4" />
 									<ColumnDefinition Width="Auto"
-																		MinWidth="48" />
+													  MinWidth="48" />
 									<ColumnDefinition Width="*" />
 								</Grid.ColumnDefinitions>

 								<TextBlock x:Name="ContentPresenter"
-													 Grid.Column="2"
-													 Margin="0,2,4,-2"
-													 HorizontalAlignment="Left"
-													 VerticalAlignment="Center"
-													 Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
-													 FontFamily="{TemplateBinding FontFamily}"
-													 FontSize="{TemplateBinding FontSize}"
-													 FontWeight="{TemplateBinding FontWeight}"
-													 AutomationProperties.AccessibilityView="Raw"
-													 IsTextScaleFactorEnabled="False"
-													 Text="{TemplateBinding Content}"
-													 TextLineBounds="TrimToCapHeight"
-													 TextWrapping="Wrap" />
+										   Grid.Column="2"
+										   Margin="0,2,4,-2"
+										   HorizontalAlignment="Left"
+										   VerticalAlignment="Center"
+										   Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
+										   FontFamily="{TemplateBinding FontFamily}"
+										   FontSize="{TemplateBinding FontSize}"
+										   FontWeight="{TemplateBinding FontWeight}"
+										   AutomationProperties.AccessibilityView="Raw"
+										   IsTextScaleFactorEnabled="False"
+										   Text="{TemplateBinding Content}"
+										   TextLineBounds="TrimToCapHeight"
+										   TextWrapping="Wrap" />

 								<TextBlock x:Name="LabelPresenter"
-													 Grid.Column="1"
-													 Margin="{TemplateBinding Padding}"
-													 HorizontalAlignment="Left"
-													 VerticalAlignment="Center"
-													 Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
-													 FontFamily="{TemplateBinding FontFamily}"
-													 FontSize="{TemplateBinding FontSize}"
-													 FontWeight="{TemplateBinding FontWeight}"
-													 AutomationProperties.AccessibilityView="Raw"
-													 IsTextScaleFactorEnabled="False"
-													 Text="{TemplateBinding Tag}" />
+										   Grid.Column="1"
+										   Margin="{TemplateBinding Padding}"
+										   HorizontalAlignment="Left"
+										   VerticalAlignment="Center"
+										   Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
+										   FontFamily="{TemplateBinding FontFamily}"
+										   FontSize="{TemplateBinding FontSize}"
+										   FontWeight="{TemplateBinding FontWeight}"
+										   AutomationProperties.AccessibilityView="Raw"
+										   IsTextScaleFactorEnabled="False"
+										   Text="{TemplateBinding Tag}" />
 							</Grid>

 							<Grid x:Name="CheckedStatesGrid"
-										Background="{ThemeResource SystemControlHighlightTransparentBrush}"
-										Opacity="0">
+								  Background="{ThemeResource SystemControlHighlightTransparentBrush}"
+								  Opacity="0">
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="4" />
 									<ColumnDefinition Width="Auto"
-																		MinWidth="48" />
+													  MinWidth="48" />
 									<ColumnDefinition Width="*" />
 								</Grid.ColumnDefinitions>

 								<Rectangle x:Name="CheckedRectangle"
-													 Grid.Column="0"
-													 Margin="0,5,0,5"
-													 HorizontalAlignment="Stretch"
-													 VerticalAlignment="Stretch"
-													 Fill="{ThemeResource SystemControlHighlightAccentBrush}" />
+										   Grid.Column="0"
+										   Margin="0,5,0,5"
+										   HorizontalAlignment="Stretch"
+										   VerticalAlignment="Stretch"
+										   Fill="{ThemeResource SystemControlHighlightAccentBrush}" />

 								<TextBlock x:Name="CheckedContentPresenter"
-													 Grid.Column="2"
-													 Margin="0,2,4,-2"
-													 HorizontalAlignment="Left"
-													 VerticalAlignment="Center"
-													 Foreground="{ThemeResource SystemControlHighlightAltBaseHighBrush}"
-													 FontFamily="{TemplateBinding FontFamily}"
-													 FontSize="{TemplateBinding FontSize}"
-													 FontWeight="{TemplateBinding FontWeight}"
-													 AutomationProperties.AccessibilityView="Raw"
-													 IsTextScaleFactorEnabled="False"
-													 Text="{TemplateBinding Content}"
-													 TextLineBounds="TrimToCapHeight"
-													 TextWrapping="Wrap" />
+										   Grid.Column="2"
+										   Margin="0,2,4,-2"
+										   HorizontalAlignment="Left"
+										   VerticalAlignment="Center"
+										   Foreground="{ThemeResource SystemControlHighlightAltBaseHighBrush}"
+										   FontFamily="{TemplateBinding FontFamily}"
+										   FontSize="{TemplateBinding FontSize}"
+										   FontWeight="{TemplateBinding FontWeight}"
+										   AutomationProperties.AccessibilityView="Raw"
+										   IsTextScaleFactorEnabled="False"
+										   Text="{TemplateBinding Content}"
+										   TextLineBounds="TrimToCapHeight"
+										   TextWrapping="Wrap" />

 								<TextBlock x:Name="CheckedLabelPresenter"
-													 Grid.Column="1"
-													 Margin="{TemplateBinding Padding}"
-													 HorizontalAlignment="Left"
-													 VerticalAlignment="Center"
-													 Foreground="{ThemeResource SystemControlHighlightAltBaseHighBrush}"
-													 FontFamily="{TemplateBinding FontFamily}"
-													 FontSize="{TemplateBinding FontSize}"
-													 FontWeight="{TemplateBinding FontWeight}"
-													 AutomationProperties.AccessibilityView="Raw"
-													 IsTextScaleFactorEnabled="False"
-													 Text="{TemplateBinding Tag}" />
+										   Grid.Column="1"
+										   Margin="{TemplateBinding Padding}"
+										   HorizontalAlignment="Left"
+										   VerticalAlignment="Center"
+										   Foreground="{ThemeResource SystemControlHighlightAltBaseHighBrush}"
+										   FontFamily="{TemplateBinding FontFamily}"
+										   FontSize="{TemplateBinding FontSize}"
+										   FontWeight="{TemplateBinding FontWeight}"
+										   AutomationProperties.AccessibilityView="Raw"
+										   IsTextScaleFactorEnabled="False"
+										   Text="{TemplateBinding Tag}" />
 							</Grid>
 						</Grid>
 					</ControlTemplate>
@ -200,19 +200,19 @@
 	</UserControl.Resources>

 	<Grid x:Name="ProgrammerOperators"
-				x:Uid="RadixGroup"
-				MaxHeight="244"
-				AutomationProperties.HeadingLevel="Level1">
+		  x:Uid="RadixGroup"
+		  MaxHeight="244"
+		  AutomationProperties.HeadingLevel="Level1">

 		<Grid.RowDefinitions>
 			<RowDefinition Height="1*"
-										 MinHeight="0" />
+						   MinHeight="0" />
 			<RowDefinition Height="1*"
-										 MinHeight="0" />
+						   MinHeight="0" />
 			<RowDefinition Height="1*"
-										 MinHeight="0" />
+						   MinHeight="0" />
 			<RowDefinition Height="1*"
-										 MinHeight="{Binding ActualHeight, ElementName=binaryButton, FallbackValue=16, Mode=OneWay}" />
+						   MinHeight="{Binding ActualHeight, ElementName=binaryButton, FallbackValue=16, Mode=OneWay}" />
 			<RowDefinition Height="4" />
 		</Grid.RowDefinitions>

@ -221,70 +221,70 @@
 				<VisualState x:Name="LargeLayout">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="768"
-														 MinWindowWidth="1024" />
+										 MinWindowWidth="1024" />
 					</VisualState.StateTriggers>
 				</VisualState>
 				<VisualState x:Name="MinSizeLayout">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}"
-														 MinWindowWidth="{StaticResource AppMinWindowWidth}" />
+										 MinWindowWidth="{StaticResource AppMinWindowWidth}" />
 					</VisualState.StateTriggers>
 				</VisualState>
 				<VisualState x:Name="DefaultLayout">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="0"
-														 MinWindowWidth="0" />
+										 MinWindowWidth="0" />
 					</VisualState.StateTriggers>
 				</VisualState>
 			</VisualStateGroup>
 		</VisualStateManager.VisualStateGroups>

 		<controls:RadixButton x:Name="hexButton"
-													x:Uid="hexButton"
-													HorizontalAlignment="Stretch"
-													Style="{ThemeResource ProgModeRadioButtonStyle}"
-													AutomationProperties.AutomationId="hexButton"
-													AutomationProperties.Name="{x:Bind Model.HexDisplayValue_AutomationName, Mode=OneWay}"
-													Checked="HexButtonChecked"
-													Content="{x:Bind Model.HexDisplayValue, Mode=OneWay}"
-													GroupName="BaseConversion" />
-													<!--ContextFlyout="{StaticResource ProgrammerOperatorsContextMenu}"-->
+							  x:Uid="hexButton"
+							  HorizontalAlignment="Stretch"
+							  Style="{ThemeResource ProgModeRadioButtonStyle}"
+							  AutomationProperties.AutomationId="hexButton"
+							  AutomationProperties.Name="{x:Bind Model.HexDisplayValue_AutomationName, Mode=OneWay}"
+							  Checked="HexButtonChecked"
+							  Content="{x:Bind Model.HexDisplayValue, Mode=OneWay}"
+							  GroupName="BaseConversion" />
+		<!--ContextFlyout="{StaticResource ProgrammerOperatorsContextMenu}"-->

 		<controls:RadixButton x:Name="decimalButton"
-													x:Uid="decimalButton"
-													Grid.Row="1"
-													HorizontalAlignment="Stretch"
-													Style="{ThemeResource ProgModeRadioButtonStyle}"
-													AutomationProperties.AutomationId="decimalButton"
-													AutomationProperties.Name="{x:Bind Model.DecDisplayValue_AutomationName, Mode=OneWay}"
-													Checked="DecButtonChecked"
-													Content="{x:Bind Model.DecimalDisplayValue, Mode=OneWay}"
-													GroupName="BaseConversion"
-													IsChecked="true" />
-													<!--ContextFlyout="{StaticResource ProgrammerOperatorsContextMenu}"-->
+							  x:Uid="decimalButton"
+							  Grid.Row="1"
+							  HorizontalAlignment="Stretch"
+							  Style="{ThemeResource ProgModeRadioButtonStyle}"
+							  AutomationProperties.AutomationId="decimalButton"
+							  AutomationProperties.Name="{x:Bind Model.DecDisplayValue_AutomationName, Mode=OneWay}"
+							  Checked="DecButtonChecked"
+							  Content="{x:Bind Model.DecimalDisplayValue, Mode=OneWay}"
+							  GroupName="BaseConversion"
+							  IsChecked="true" />
+		<!--ContextFlyout="{StaticResource ProgrammerOperatorsContextMenu}"-->

 		<controls:RadixButton x:Name="octButton"
-													x:Uid="octButton"
-													Grid.Row="2"
-													HorizontalAlignment="Stretch"
-													Style="{ThemeResource ProgModeRadioButtonStyle}"
-													AutomationProperties.AutomationId="octolButton"
-													AutomationProperties.Name="{x:Bind Model.OctDisplayValue_AutomationName, Mode=OneWay}"
-													Checked="OctButtonChecked"
-													Content="{x:Bind Model.OctalDisplayValue, Mode=OneWay}"
-													GroupName="BaseConversion" />
-													<!--ContextFlyout="{StaticResource ProgrammerOperatorsContextMenu}"-->
+							  x:Uid="octButton"
+							  Grid.Row="2"
+							  HorizontalAlignment="Stretch"
+							  Style="{ThemeResource ProgModeRadioButtonStyle}"
+							  AutomationProperties.AutomationId="octolButton"
+							  AutomationProperties.Name="{x:Bind Model.OctDisplayValue_AutomationName, Mode=OneWay}"
+							  Checked="OctButtonChecked"
+							  Content="{x:Bind Model.OctalDisplayValue, Mode=OneWay}"
+							  GroupName="BaseConversion" />
+		<!--ContextFlyout="{StaticResource ProgrammerOperatorsContextMenu}"-->

 		<controls:RadixButton x:Name="binaryButton"
-													x:Uid="binaryButton"
-													Grid.Row="3"
-													HorizontalAlignment="Stretch"
-													Style="{ThemeResource ProgModeRadioButtonStyle}"
-													AutomationProperties.AutomationId="binaryButton"
-													AutomationProperties.Name="{x:Bind Model.BinDisplayValue_AutomationName, Mode=OneWay}"
-													Checked="BinButtonChecked"
-													Content="{x:Bind Model.BinaryDisplayValue, Mode=OneWay}"
-													GroupName="BaseConversion" />
-													<!--ContextFlyout="{StaticResource ProgrammerOperatorsContextMenu}"-->
+							  x:Uid="binaryButton"
+							  Grid.Row="3"
+							  HorizontalAlignment="Stretch"
+							  Style="{ThemeResource ProgModeRadioButtonStyle}"
+							  AutomationProperties.AutomationId="binaryButton"
+							  AutomationProperties.Name="{x:Bind Model.BinDisplayValue_AutomationName, Mode=OneWay}"
+							  Checked="BinButtonChecked"
+							  Content="{x:Bind Model.BinaryDisplayValue, Mode=OneWay}"
+							  GroupName="BaseConversion" />
+		<!--ContextFlyout="{StaticResource ProgrammerOperatorsContextMenu}"-->
 	</Grid>
 </UserControl>
--- a/src/Calculator.Shared/Views/CalculatorStandardOperators.xaml
+++ b/src/Calculator.Shared/Views/CalculatorStandardOperators.xaml
@ -1,45 +1,45 @@
 <UserControl x:Class="CalculatorApp.CalculatorStandardOperators"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:common="using:CalculatorApp.Common"
-             xmlns:controls="using:CalculatorApp.Controls"
-             xmlns:local="using:CalculatorApp"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             x:Name="ControlRoot"
-             mc:Ignorable="">
+			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:common="using:CalculatorApp.Common"
+			 xmlns:controls="using:CalculatorApp.Controls"
+			 xmlns:local="using:CalculatorApp"
+			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 x:Name="ControlRoot"
+			 mc:Ignorable="">

 	<Grid x:Name="Root">

 		<Grid.RowDefinitions>
 			<RowDefinition x:Name="R0"
-										 Height="1*" />
+						   Height="1*" />
 			<RowDefinition x:Name="R1"
-										 Height="1*" />
+						   Height="1*" />
 			<RowDefinition x:Name="R2"
-										 Height="1*" />
+						   Height="1*" />
 			<RowDefinition x:Name="R3"
-										 Height="1*" />
+						   Height="1*" />
 			<RowDefinition x:Name="R4"
-										 Height="1*" />
+						   Height="1*" />
 			<RowDefinition x:Name="R5"
-										 Height="1*" />
+						   Height="1*" />
 		</Grid.RowDefinitions>

 		<Grid.ColumnDefinitions>
 			<ColumnDefinition x:Name="GutterLeft"
-												Width="0" />
+							  Width="0" />
 			<ColumnDefinition x:Name="C0"
-												Width="0" />
+							  Width="0" />
 			<ColumnDefinition x:Name="C1"
-												Width="1*" />
+							  Width="1*" />
 			<ColumnDefinition x:Name="C2"
-												Width="1*" />
+							  Width="1*" />
 			<ColumnDefinition x:Name="C3"
-												Width="1*" />
+							  Width="1*" />
 			<ColumnDefinition x:Name="C4"
-												Width="1*" />
+							  Width="1*" />
 			<ColumnDefinition x:Name="GutterRight"
-												Width="0" />
+							  Width="0" />
 		</Grid.ColumnDefinitions>

 		<VisualStateManager.VisualStateGroups>
@ -48,25 +48,25 @@
 				<VisualState x:Name="ErrorLayout">
 					<VisualState.Setters>
 						<Setter Target="percentButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="squareRootButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="xpower2Button.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="xpower3Button.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="invertButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="divideButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="multiplyButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="minusButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="plusButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="negateButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>
@ -77,41 +77,41 @@

 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="1366"
-														 MinWindowWidth="768" />
+										 MinWindowWidth="768" />
 					</VisualState.StateTriggers>

 					<VisualState.Setters>
 						<Setter Target="percentButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="squareRootButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="xpower2Button.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="xpower3Button.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invertButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="negateButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="clearEntryButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="clearButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="backSpaceButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="divideButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="multiplyButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="minusButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="plusButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="equalButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />

 						<Setter Target="NumberPad.ButtonStyle"
-										Value="{StaticResource NumericButtonStyle46}" />
+								Value="{StaticResource NumericButtonStyle46}" />
 					</VisualState.Setters>
 				</VisualState>

@ -119,175 +119,175 @@

 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="768"
-														 MinWindowWidth="1366" />
+										 MinWindowWidth="1366" />
 					</VisualState.StateTriggers>

 					<VisualState.Setters>
 						<Setter Target="C0.Width"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="R0.Height"
-										Value="0" />
+								Value="0" />

 						<Setter Target="StandardFunctions.(Grid.Row)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="StandardFunctions.(Grid.Column)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="StandardFunctions.(Grid.RowSpan)"
-										Value="5" />
+								Value="5" />
 						<Setter Target="StandardFunctions.(Grid.ColumnSpan)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="FnR1.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="FnR2.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="FnR3.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="FnR4.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="FnC1.Width"
-										Value="0" />
+								Value="0" />
 						<Setter Target="FnC2.Width"
-										Value="0" />
+								Value="0" />
 						<Setter Target="FnC3.Width"
-										Value="0" />
+								Value="0" />

 						<Setter Target="squareRootButton.(Grid.Row)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="squareRootButton.(Grid.Column)"
-										Value="0" />
+								Value="0" />
 						<Setter Target="xpower2Button.(Grid.Row)"
-										Value="2" />
+								Value="2" />
 						<Setter Target="xpower2Button.(Grid.Column)"
-										Value="0" />
+								Value="0" />
 						<Setter Target="xpower3Button.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="invertButton.(Grid.Row)"
-										Value="4" />
+								Value="4" />
 						<Setter Target="invertButton.(Grid.Column)"
-										Value="0" />
+								Value="0" />

 						<Setter Target="negateButton.(Grid.Row)"
-										Value="5" />
+								Value="5" />
 						<Setter Target="negateButton.(Grid.Column)"
-										Value="2" />
+								Value="2" />

 						<Setter Target="percentButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="squareRootButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="xpower2Button.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="invertButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="negateButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="clearEntryButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="clearButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="backSpaceButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="divideButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="multiplyButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="minusButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="plusButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="equalButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />

 						<Setter Target="NumberPad.ButtonStyle"
-										Value="{StaticResource NumericButtonStyle34}" />
+								Value="{StaticResource NumericButtonStyle34}" />
 					</VisualState.Setters>
 				</VisualState>

 				<VisualState x:Name="Landscape8InchTab">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="640"
-														 MinWindowWidth="1024" />
+										 MinWindowWidth="1024" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
 						<Setter Target="C0.Width"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="R0.Height"
-										Value="0" />
+								Value="0" />

 						<Setter Target="StandardFunctions.(Grid.Row)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="StandardFunctions.(Grid.Column)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="StandardFunctions.(Grid.RowSpan)"
-										Value="5" />
+								Value="5" />
 						<Setter Target="StandardFunctions.(Grid.ColumnSpan)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="FnR1.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="FnR2.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="FnR3.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="FnR4.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="FnC1.Width"
-										Value="0" />
+								Value="0" />
 						<Setter Target="FnC2.Width"
-										Value="0" />
+								Value="0" />
 						<Setter Target="FnC3.Width"
-										Value="0" />
+								Value="0" />

 						<Setter Target="squareRootButton.(Grid.Row)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="squareRootButton.(Grid.Column)"
-										Value="0" />
+								Value="0" />
 						<Setter Target="xpower2Button.(Grid.Row)"
-										Value="2" />
+								Value="2" />
 						<Setter Target="xpower2Button.(Grid.Column)"
-										Value="0" />
+								Value="0" />
 						<Setter Target="xpower3Button.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="invertButton.(Grid.Row)"
-										Value="4" />
+								Value="4" />
 						<Setter Target="invertButton.(Grid.Column)"
-										Value="0" />
+								Value="0" />

 						<Setter Target="negateButton.(Grid.Row)"
-										Value="5" />
+								Value="5" />
 						<Setter Target="negateButton.(Grid.Column)"
-										Value="2" />
+								Value="2" />

 						<Setter Target="percentButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="squareRootButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="xpower2Button.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="xpower3Button.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invertButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="negateButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="clearEntryButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="clearButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="backSpaceButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="divideButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="multiplyButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="minusButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="plusButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="equalButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />

 						<Setter Target="NumberPad.ButtonStyle"
-										Value="{StaticResource NumericButtonStyle28}" />
+								Value="{StaticResource NumericButtonStyle28}" />
 					</VisualState.Setters>
 				</VisualState>

@ -295,41 +295,41 @@

 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="1024"
-														 MinWindowWidth="640" />
+										 MinWindowWidth="640" />
 					</VisualState.StateTriggers>

 					<VisualState.Setters>
 						<Setter Target="percentButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="squareRootButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="xpower2Button.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="xpower3Button.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invertButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="negateButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="clearEntryButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="clearButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="backSpaceButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="divideButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="multiplyButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="minusButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="plusButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="equalButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />

 						<Setter Target="NumberPad.ButtonStyle"
-										Value="{StaticResource NumericButtonStyle28}" />
+								Value="{StaticResource NumericButtonStyle28}" />
 					</VisualState.Setters>
 				</VisualState>

@ -337,39 +337,39 @@

 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="854"
-														 MinWindowWidth="480" />
+										 MinWindowWidth="480" />
 					</VisualState.StateTriggers>

 					<VisualState.Setters>
 						<Setter Target="percentButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="squareRootButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="xpower2Button.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="invertButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="negateButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="clearEntryButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="clearButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="backSpaceButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="divideButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="multiplyButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="minusButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="plusButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
 						<Setter Target="equalButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}" />

 						<Setter Target="NumberPad.ButtonStyle"
-										Value="{StaticResource NumericButtonStyle34}" />
+								Value="{StaticResource NumericButtonStyle34}" />
 					</VisualState.Setters>
 				</VisualState>

@ -377,136 +377,136 @@

 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="640"
-														 MinWindowWidth="360" />
+										 MinWindowWidth="360" />
 					</VisualState.StateTriggers>

 					<VisualState.Setters>
 						<Setter Target="percentButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="squareRootButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="xpower2Button.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invertButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="negateButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="clearEntryButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="clearButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="backSpaceButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="divideButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="multiplyButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="minusButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="plusButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="equalButton.FontSize"
-										Value="{StaticResource CalcStandardOperatorCaptionSize}" />
+								Value="{StaticResource CalcStandardOperatorCaptionSize}" />

 						<Setter Target="NumberPad.ButtonStyle"
-										Value="{StaticResource NumericButtonStyle28}" />
+								Value="{StaticResource NumericButtonStyle28}" />
 					</VisualState.Setters>
 				</VisualState>
 				<VisualState x:Name="MinSizeLayout">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}"
-														 MinWindowWidth="{StaticResource AppMinWindowWidth}" />
+										 MinWindowWidth="{StaticResource AppMinWindowWidth}" />
 					</VisualState.StateTriggers>
 				</VisualState>
 				<VisualState x:Name="DefaultLayout">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="0"
-														 MinWindowWidth="0" />
+										 MinWindowWidth="0" />
 					</VisualState.StateTriggers>
 				</VisualState>
 			</VisualStateGroup>
 		</VisualStateManager.VisualStateGroups>

 		<Grid x:Name="StandardFunctions"
-					x:Uid="StandardFunctions"
-					Grid.Row="0"
-					Grid.Column="2"
-					Grid.ColumnSpan="4"
-					AutomationProperties.HeadingLevel="Level1">
+			  x:Uid="StandardFunctions"
+			  Grid.Row="0"
+			  Grid.Column="2"
+			  Grid.ColumnSpan="4"
+			  AutomationProperties.HeadingLevel="Level1">

 			<Grid.RowDefinitions>
 				<RowDefinition Height="1*" />
 				<RowDefinition x:Name="FnR1"
-											 Height="0" />
+							   Height="0" />
 				<RowDefinition x:Name="FnR2"
-											 Height="0" />
+							   Height="0" />
 				<RowDefinition x:Name="FnR3"
-											 Height="0" />
+							   Height="0" />
 				<RowDefinition x:Name="FnR4"
-											 Height="0" />
+							   Height="0" />
 			</Grid.RowDefinitions>

 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="1*" />
 				<ColumnDefinition x:Name="FnC1"
-													Width="1*" />
+								  Width="1*" />
 				<ColumnDefinition x:Name="FnC2"
-													Width="1*" />
+								  Width="1*" />
 				<ColumnDefinition x:Name="FnC3"
-													Width="1*" />
+								  Width="1*" />
 			</Grid.ColumnDefinitions>

 			<controls:CalculatorButton x:Name="percentButton"
-																 x:Uid="percentButton"
-																 Grid.Column="0"
-																 Style="{StaticResource SymbolOperatorButtonStyle}"
-																 AutomationProperties.AutomationId="percentButton"
-																 ButtonId="Percent"
-																 Content="&#xE94C;" />
+									   x:Uid="percentButton"
+									   Grid.Column="0"
+									   Style="{StaticResource SymbolOperatorButtonStyle}"
+									   AutomationProperties.AutomationId="percentButton"
+									   ButtonId="Percent"
+									   Content="&#xE94C;" />

 			<controls:CalculatorButton x:Name="squareRootButton"
-																 x:Uid="squareRootButton"
-																 Grid.Column="1"
-																 Style="{StaticResource SymbolOperatorButtonStyle}"
-																 AutomationProperties.AutomationId="squareRootButton"
-																 ButtonId="Sqrt"
-																 Content="&#xE94B;" />
+									   x:Uid="squareRootButton"
+									   Grid.Column="1"
+									   Style="{StaticResource SymbolOperatorButtonStyle}"
+									   AutomationProperties.AutomationId="squareRootButton"
+									   ButtonId="Sqrt"
+									   Content="&#xE94B;" />

 			<controls:CalculatorButton x:Name="xpower2Button"
-																 x:Uid="xpower2Button"
-																 Grid.Column="2"
-																 Style="{StaticResource SymbolOperatorButtonStyle}"
-																 FontSize="18"
-																 AutomationProperties.AutomationId="xpower2Button"
-																 ButtonId="XPower2"
-																 Content="&#xf7c8;" />
+									   x:Uid="xpower2Button"
+									   Grid.Column="2"
+									   Style="{StaticResource SymbolOperatorButtonStyle}"
+									   FontSize="18"
+									   AutomationProperties.AutomationId="xpower2Button"
+									   ButtonId="XPower2"
+									   Content="&#xf7c8;" />

 			<controls:CalculatorButton x:Name="xpower3Button"
-																 x:Uid="xpower3Button"
-																 Grid.Row="3"
-																 Style="{StaticResource SymbolOperatorButtonStyle}"
-																 FontSize="18"
-																 AutomationProperties.AutomationId="xpower3Button"
-																 ButtonId="Cube"
-																 Content="&#xf7cb;"
-																 Visibility="Collapsed" />
+									   x:Uid="xpower3Button"
+									   Grid.Row="3"
+									   Style="{StaticResource SymbolOperatorButtonStyle}"
+									   FontSize="18"
+									   AutomationProperties.AutomationId="xpower3Button"
+									   ButtonId="Cube"
+									   Content="&#xf7cb;"
+									   Visibility="Collapsed" />

 			<controls:CalculatorButton x:Name="invertButton"
-																 x:Uid="invertButton"
-																 Grid.Column="3"
-																 Style="{StaticResource SymbolOperatorButtonStyle}"
-																 FontSize="18"
-																 AutomationProperties.AutomationId="invertButton"
-																 ButtonId="Invert"
-																 Content="&#xf7c9;" />
+									   x:Uid="invertButton"
+									   Grid.Column="3"
+									   Style="{StaticResource SymbolOperatorButtonStyle}"
+									   FontSize="18"
+									   AutomationProperties.AutomationId="invertButton"
+									   ButtonId="Invert"
+									   Content="&#xf7c9;" />
 		</Grid>

 		<Grid x:Name="StandardOperators"
-					x:Uid="StandardOperators"
-					Grid.Row="1"
-					Grid.RowSpan="5"
-					Grid.Column="5"
-					AutomationProperties.HeadingLevel="Level1">
+			  x:Uid="StandardOperators"
+			  Grid.Row="1"
+			  Grid.RowSpan="5"
+			  Grid.Column="5"
+			  AutomationProperties.HeadingLevel="Level1">

 			<Grid.RowDefinitions>
 				<RowDefinition />
@ -517,52 +517,52 @@
 			</Grid.RowDefinitions>

 			<controls:CalculatorButton x:Name="divideButton"
-																 x:Uid="divideButton"
-																 Grid.Row="0"
-																 Style="{StaticResource AccentCalcButtonStyle}"
-																 AutomationProperties.AutomationId="divideButton"
-																 ButtonId="Divide"
-																 Content="&#xE94A;" />
+									   x:Uid="divideButton"
+									   Grid.Row="0"
+									   Style="{StaticResource AccentCalcButtonStyle}"
+									   AutomationProperties.AutomationId="divideButton"
+									   ButtonId="Divide"
+									   Content="&#xE94A;" />

 			<controls:CalculatorButton x:Name="multiplyButton"
-																 x:Uid="multiplyButton"
-																 Grid.Row="1"
-																 Style="{StaticResource AccentCalcButtonStyle}"
-																 AutomationProperties.AutomationId="multiplyButton"
-																 ButtonId="Multiply"
-																 Content="&#xE947;" />
+									   x:Uid="multiplyButton"
+									   Grid.Row="1"
+									   Style="{StaticResource AccentCalcButtonStyle}"
+									   AutomationProperties.AutomationId="multiplyButton"
+									   ButtonId="Multiply"
+									   Content="&#xE947;" />

 			<controls:CalculatorButton x:Name="minusButton"
-																 x:Uid="minusButton"
-																 Grid.Row="2"
-																 Style="{StaticResource AccentCalcButtonStyle}"
-																 AutomationProperties.AutomationId="minusButton"
-																 ButtonId="Subtract"
-																 Content="&#xE949;" />
+									   x:Uid="minusButton"
+									   Grid.Row="2"
+									   Style="{StaticResource AccentCalcButtonStyle}"
+									   AutomationProperties.AutomationId="minusButton"
+									   ButtonId="Subtract"
+									   Content="&#xE949;" />

 			<controls:CalculatorButton x:Name="plusButton"
-																 x:Uid="plusButton"
-																 Grid.Row="3"
-																 Style="{StaticResource AccentCalcButtonStyle}"
-																 AutomationProperties.AutomationId="plusButton"
-																 ButtonId="Add"
-																 Content="&#xE948;" />
+									   x:Uid="plusButton"
+									   Grid.Row="3"
+									   Style="{StaticResource AccentCalcButtonStyle}"
+									   AutomationProperties.AutomationId="plusButton"
+									   ButtonId="Add"
+									   Content="&#xE948;" />

 			<controls:CalculatorButton x:Name="equalButton"
-																 x:Uid="equalButton"
-																 Grid.Row="4"
-																 Style="{StaticResource AccentCalcButtonStyle}"
-																 AutomationProperties.AutomationId="equalButton"
-																 ButtonId="Equals"
-																 Content="&#xE94E;" />
+									   x:Uid="equalButton"
+									   Grid.Row="4"
+									   Style="{StaticResource AccentCalcButtonStyle}"
+									   AutomationProperties.AutomationId="equalButton"
+									   ButtonId="Equals"
+									   Content="&#xE94E;" />
 		</Grid>

 		<Grid x:Name="DisplayControls"
-					x:Uid="DisplayControls"
-					Grid.Row="1"
-					Grid.Column="2"
-					Grid.ColumnSpan="3"
-					AutomationProperties.HeadingLevel="Level1">
+			  x:Uid="DisplayControls"
+			  Grid.Row="1"
+			  Grid.Column="2"
+			  Grid.ColumnSpan="3"
+			  AutomationProperties.HeadingLevel="Level1">

 			<Grid.ColumnDefinitions>
 				<ColumnDefinition />
@ -571,49 +571,49 @@
 			</Grid.ColumnDefinitions>

 			<controls:CalculatorButton x:Name="clearEntryButton"
-																 x:Uid="clearEntryButton"
-																 Grid.Column="0"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="16"
-																 AutomationProperties.AutomationId="clearEntryButton"
-																 ButtonId="ClearEntry"
-																 Content="CE" />
+									   x:Uid="clearEntryButton"
+									   Grid.Column="0"
+									   Style="{StaticResource OperatorButtonStyle}"
+									   FontSize="16"
+									   AutomationProperties.AutomationId="clearEntryButton"
+									   ButtonId="ClearEntry"
+									   Content="CE" />

 			<controls:CalculatorButton x:Name="clearButton"
-																 x:Uid="clearButton"
-																 Grid.Column="1"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="16"
-																 AutomationProperties.AutomationId="clearButton"
-																 ButtonId="Clear"
-																 Content="C" />
+									   x:Uid="clearButton"
+									   Grid.Column="1"
+									   Style="{StaticResource OperatorButtonStyle}"
+									   FontSize="16"
+									   AutomationProperties.AutomationId="clearButton"
+									   ButtonId="Clear"
+									   Content="C" />

 			<controls:CalculatorButton x:Name="backSpaceButton"
-																 x:Uid="backSpaceButton"
-																 Grid.Column="2"
-																 Style="{StaticResource SymbolOperatorButtonStyle}"
-																 FontSize="16"
-																 AutomationProperties.AutomationId="backSpaceButton"
-																 ButtonId="Backspace"
-																 Content="&#xE94F;" />
+									   x:Uid="backSpaceButton"
+									   Grid.Column="2"
+									   Style="{StaticResource SymbolOperatorButtonStyle}"
+									   FontSize="16"
+									   AutomationProperties.AutomationId="backSpaceButton"
+									   ButtonId="Backspace"
+									   Content="&#xE94F;" />
 		</Grid>

 		<local:NumberPad x:Name="NumberPad"
-										 x:Uid="NumberPad"
-										 Grid.Row="2"
-										 Grid.RowSpan="4"
-										 Grid.Column="2"
-										 Grid.ColumnSpan="3"
-										 AutomationProperties.HeadingLevel="Level1"
-										 ButtonStyle="{StaticResource NumericButtonStyle24}" />
+						 x:Uid="NumberPad"
+						 Grid.Row="2"
+						 Grid.RowSpan="4"
+						 Grid.Column="2"
+						 Grid.ColumnSpan="3"
+						 AutomationProperties.HeadingLevel="Level1"
+						 ButtonStyle="{StaticResource NumericButtonStyle24}" />

 		<controls:CalculatorButton x:Name="negateButton"
-															 x:Uid="negateButton"
-															 Grid.Row="5"
-															 Grid.Column="2"
-															 Style="{StaticResource SymbolOperatorButtonStyle}"
-															 AutomationProperties.AutomationId="negateButton"
-															 ButtonId="Negate"
-															 Content="&#xE94D;" />
+								   x:Uid="negateButton"
+								   Grid.Row="5"
+								   Grid.Column="2"
+								   Style="{StaticResource SymbolOperatorButtonStyle}"
+								   AutomationProperties.AutomationId="negateButton"
+								   ButtonId="Negate"
+								   Content="&#xE94D;" />
 	</Grid>
 </UserControl>
--- a/src/Calculator.Shared/Views/MainPage.xaml
+++ b/src/Calculator.Shared/Views/MainPage.xaml
@ -26,28 +26,28 @@
 		-->

 		<!-- CalculatorBaseStyle -->
-		<Style x:Key="CalculatorBaseStyle" 
-					 TargetType="local:Calculator">
+		<Style x:Name="CalculatorBaseStyle"
+			   TargetType="local:Calculator">
 			<Setter Property="Margin"
-							Value="0,0,0,0"/>
+					Value="0,0,0,0" />
 		</Style>

 		<!-- UnitConverterBaseStyle -->
-		<Style x:Key="UnitConverterBaseStyle" 
-					 TargetType="local:UnitConverter">
+		<Style x:Name="UnitConverterBaseStyle"
+			   TargetType="local:UnitConverter">
 			<Setter Property="Visibility"
-							Value="Collapsed"/>
+					Value="Collapsed" />
 			<Setter Property="IsEnabled"
-							Value="False"/>
+					Value="False" />
 			<Setter Property="Margin"
-							Value="0,0,0,0"/>
+					Value="0,0,0,0" />
 		</Style>

 		<!-- AboutFlyoutPresenterStyle -->
 		<Style x:Key="AboutFlyoutPresenterStyle"
-					 TargetType="FlyoutPresenter">
+			   TargetType="FlyoutPresenter">
 			<Setter Property="IsTabStop"
-							Value="False"/>
+					Value="False" />
 			<!--
 			<Setter Property="AutomationProperties.AccessibilityView" 
 							Value="Raw"/>
@ -56,22 +56,23 @@

 		<!-- NavViewItemStyle -->
 		<Style x:Key="NavViewItemStyle"
-					 TargetType="NavigationViewItem">
+			   TargetType="NavigationViewItem">
 			<Setter Property="KeyTipPlacementMode"
-							Value="Right"/>
+					Value="Right" />
 		</Style>
 	</Page.Resources>

 	<Grid toolkit:VisibleBoundsPadding.PaddingMask="All"
 		  android:Background="White">
 		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto"/>
-				<!--
+			<RowDefinition Height="Auto" />
+			<!--
 					This row is padding for the SystemFocusVisuals,
 					otherwise the focus rectangles render under the title bar controls.
 				-->
-			<RowDefinition x:Name="FocusVisualMargin" Height="3"/>
-			<RowDefinition Height="*"/>
+			<RowDefinition x:Name="FocusVisualMargin"
+						   Height="3" />
+			<RowDefinition Height="*" />
 		</Grid.RowDefinitions>

 		<VisualStateManager.VisualStateGroups>
@ -79,25 +80,25 @@
 				<VisualState x:Name="ConverterWide">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}"
-														 MinWindowWidth="640"/>
+										 MinWindowWidth="640" />
 					</VisualState.StateTriggers>
 				</VisualState>
 				<VisualState x:Name="DockVisible">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}"
-														 MinWindowWidth="560"/>
+										 MinWindowWidth="560" />
 					</VisualState.StateTriggers>
 				</VisualState>
 				<VisualState x:Name="MinSizeLayout">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}"
-														 MinWindowWidth="{StaticResource AppMinWindowWidth}"/>
+										 MinWindowWidth="{StaticResource AppMinWindowWidth}" />
 					</VisualState.StateTriggers>
 				</VisualState>
 				<VisualState x:Name="DefaultLayout">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="0"
-														 MinWindowWidth="0"/>
+										 MinWindowWidth="0" />
 					</VisualState.StateTriggers>
 				</VisualState>
 			</VisualStateGroup>
@ -109,17 +110,17 @@
 				they are not to be shown, only to have the command and shortcut assigned to them.
 			-->
 			<Button x:Name="copyButton"
-							x:Uid="copyButton"
-							Command="{x:Bind Model.CopyCommand}"/>
+					x:Uid="copyButton"
+					Command="{x:Bind Model.CopyCommand}" />
 			<Button x:Name="pasteButton"
-							x:Uid="pasteButton"
-							Command="{x:Bind Model.PasteCommand}"/>
+					x:Uid="pasteButton"
+					Command="{x:Bind Model.PasteCommand}" />
 			<Button x:Name="copyButtonAlternate"
-							x:Uid="copyButtonAlternate"
-							Command="{x:Bind Model.CopyCommand}"/>
+					x:Uid="copyButtonAlternate"
+					Command="{x:Bind Model.CopyCommand}" />
 			<Button x:Name="pasteButtonAlternate"
-							x:Uid="pasteButtonAlternate"
-							Command="{x:Bind Model.PasteCommand}"/>
+					x:Uid="pasteButtonAlternate"
+					Command="{x:Bind Model.PasteCommand}" />
 		</StackPanel>

 		<!-- Title Bar -->
@ -150,35 +151,36 @@
 			
 			<NavigationView.PaneFooter>

-				<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
+				<StackPanel HorizontalAlignment="Stretch"
+							Orientation="Vertical">

 					<NavigationViewList x:Name="NavFooter"
-																	 Width="{x:Bind NavView.OpenPaneLength, Mode=Oneway}"
-																	 x:Load="False"
-																	 IsItemClickEnabled="True"
-																	 ItemClick="OnAboutButtonClick">
+										Width="{x:Bind NavView.OpenPaneLength, Mode=Oneway}"
+										x:Load="False"
+										IsItemClickEnabled="True"
+										ItemClick="OnAboutButtonClick">

 						<NavigationViewList.Items>

 							<NavigationViewItem x:Name="AboutButton"
-																			 x:Uid="AboutButton"
-																			 Style="{StaticResource NavViewItemStyle}">
+												x:Uid="AboutButton"
+												Style="{StaticResource NavViewItemStyle}">
 								<NavigationViewItem.Icon>
 									<FontIcon FontFamily="{StaticResource CalculatorFontFamily}"
-														Glyph="&#xe946;"/>
+											  Glyph="&#xe946;" />
 								</NavigationViewItem.Icon>
 								<TextBlock Text=""
 										   x:Name="AboutText" />
 								<NavigationViewItem.ContextFlyout>
 									
 									<Flyout x:Name="AboutPageFlyout"
-													x:Uid="AboutPageFlyout"
-													Closed="OnAboutFlyoutClosed"
-													FlyoutPresenterStyle="{StaticResource AboutFlyoutPresenterStyle}"
-													Opened="OnAboutFlyoutOpened">
+											x:Uid="AboutPageFlyout"
+											Closed="OnAboutFlyoutClosed"
+											FlyoutPresenterStyle="{StaticResource AboutFlyoutPresenterStyle}"
+											Opened="OnAboutFlyoutOpened">

 										<local:AboutFlyout x:Name="AboutPage"
-																			 x:Load="False"/>
+														   x:Load="False" />
 									</Flyout>
 								</NavigationViewItem.ContextFlyout>
 							</NavigationViewItem>
@ -191,11 +193,11 @@

 				<!-- Header -->
 				<TextBlock x:Name="Header"
-									 Margin="52,6,12,0"
-									 HorizontalAlignment="Left"
-									 VerticalAlignment="Top"
-									 Style="{StaticResource SubtitleTextBlockStyle}"
-									 Text="{x:Bind Model.CategoryName, Mode=OneWay}"/>
+						   Margin="52,6,12,0"
+						   HorizontalAlignment="Left"
+						   VerticalAlignment="Top"
+						   Style="{StaticResource SubtitleTextBlockStyle}"
+						   Text="{x:Bind Model.CategoryName, Mode=OneWay}" />

 				<Border x:Name="CalcHolder">
 					<!-- PLACEHOLDER!!!! This is where the calculator goes when it is delay loaded -->