diff --git a/src/Calculator.Shared/Styles.xaml b/src/Calculator.Shared/Styles.xaml
index 0ba62184..1b92a499 100644
--- a/src/Calculator.Shared/Styles.xaml
+++ b/src/Calculator.Shared/Styles.xaml
@@ -480,6 +480,15 @@
 				Value="{StaticResource CalcOperatorCaptionSize}" />
 	</Style>
 
+	<Style x:Key="DecimalButtonStyle"
+		   BasedOn="{StaticResource OperatorButtonStyle}"
+		   TargetType="Controls:CalculatorButton">
+		<Setter Property="FontWeight"
+				Value="Bold" />
+		<Setter Property="FontSize"
+				Value="24" />
+	</Style>
+
 	<Style x:Key="SymbolOperatorButtonStyle"
 		   BasedOn="{StaticResource OperatorButtonStyle}"
 		   TargetType="Controls:CalculatorButton">
diff --git a/src/Calculator.Shared/Views/CalculatorProgrammerRadixOperators.xaml b/src/Calculator.Shared/Views/CalculatorProgrammerRadixOperators.xaml
index 3e992862..ce529b67 100644
--- a/src/Calculator.Shared/Views/CalculatorProgrammerRadixOperators.xaml
+++ b/src/Calculator.Shared/Views/CalculatorProgrammerRadixOperators.xaml
@@ -1,16 +1,16 @@
 <UserControl x:Class="CalculatorApp.CalculatorProgrammerRadixOperators"
-             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"
-             Loaded="OnLoaded"
-             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"
+			 Loaded="OnLoaded"
+			 mc:Ignorable="">
 
 	<Grid x:Name="ProgRadixOps">
-		
+
 		<Grid.RowDefinitions>
 			<RowDefinition Height="1*" />
 			<RowDefinition Height="1*" />
@@ -19,24 +19,24 @@
 			<RowDefinition Height="1*" />
 			<RowDefinition Height="1*" />
 		</Grid.RowDefinitions>
-		
+
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition x:Name="GutterLeft"
-												Width="0" />
+							  Width="0" />
 			<ColumnDefinition x:Name="C0"
-												Width="1*" />
+							  Width="1*" />
 			<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="C5"
-												Width="1*" />
+							  Width="1*" />
 			<ColumnDefinition x:Name="GutterRight"
-												Width="0" />
+							  Width="0" />
 		</Grid.ColumnDefinitions>
 
 		<VisualStateManager.VisualStateGroups>
@@ -45,148 +45,148 @@
 				<VisualState x:Name="ErrorLayout">
 					<VisualState.Setters>
 						<Setter Target="rolButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="rorButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="lshButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="rshButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="orButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="xorButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="notButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="andButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 
 						<Setter Target="shiftButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="modButton.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="openParenthesisButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="closeParenthesisButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="negateButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>
-			
+
 			<VisualStateGroup>
 				<VisualState x:Name="Portrait768x1366">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="1366"
-														 MinWindowWidth="768" />
+										 MinWindowWidth="768" />
 					</VisualState.StateTriggers>
-					
+
 					<VisualState.Setters>
 						<Setter Target="clearEntryButton.FontSize"
-										Value="{StaticResource CalcOperatorCaptionSize}" />
+								Value="{StaticResource CalcOperatorCaptionSize}" />
 						<Setter Target="clearButton.FontSize"
-										Value="{StaticResource CalcOperatorCaptionSize}" />
+								Value="{StaticResource CalcOperatorCaptionSize}" />
 						<Setter Target="backSpaceButton.FontSize"
-										Value="{StaticResource CalcOperatorCaptionSize}" />
+								Value="{StaticResource CalcOperatorCaptionSize}" />
 						<Setter Target="divideButton.FontSize"
-										Value="{StaticResource CalcOperatorCaptionSize}" />
+								Value="{StaticResource CalcOperatorCaptionSize}" />
 						<Setter Target="multiplyButton.FontSize"
-										Value="{StaticResource CalcOperatorCaptionSize}" />
+								Value="{StaticResource CalcOperatorCaptionSize}" />
 						<Setter Target="minusButton.FontSize"
-										Value="{StaticResource CalcOperatorCaptionSize}" />
+								Value="{StaticResource CalcOperatorCaptionSize}" />
 						<Setter Target="plusButton.FontSize"
-										Value="{StaticResource CalcOperatorCaptionSize}" />
+								Value="{StaticResource CalcOperatorCaptionSize}" />
 						<Setter Target="equalButton.FontSize"
-										Value="{StaticResource CalcOperatorCaptionSize}" />
+								Value="{StaticResource CalcOperatorCaptionSize}" />
 
 						<Setter Target="aButton.FontSize"
-										Value="{StaticResource TitleFontSize}" />
+								Value="{StaticResource TitleFontSize}" />
 						<Setter Target="bButton.FontSize"
-										Value="{StaticResource TitleFontSize}" />
+								Value="{StaticResource TitleFontSize}" />
 						<Setter Target="cButton.FontSize"
-										Value="{StaticResource TitleFontSize}" />
+								Value="{StaticResource TitleFontSize}" />
 						<Setter Target="dButton.FontSize"
-										Value="{StaticResource TitleFontSize}" />
+								Value="{StaticResource TitleFontSize}" />
 						<Setter Target="eButton.FontSize"
-										Value="{StaticResource TitleFontSize}" />
+								Value="{StaticResource TitleFontSize}" />
 						<Setter Target="fButton.FontSize"
-										Value="{StaticResource TitleFontSize}" />
+								Value="{StaticResource TitleFontSize}" />
 
 						<Setter Target="NumberPad.ButtonStyle"
-										Value="{StaticResource NumericButtonStyle24}" />
+								Value="{StaticResource NumericButtonStyle24}" />
 					</VisualState.Setters>
 				</VisualState>
-				
+
 				<VisualState x:Name="FullLayout">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="768"
-														 MinWindowWidth="1024" />
+										 MinWindowWidth="1024" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
 						<Setter Target="NumberPad.ButtonStyle"
-										Value="{StaticResource NumericButtonStyle24}" />
+								Value="{StaticResource NumericButtonStyle24}" />
 					</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.Setters>
 						<Setter Target="openParenthesisButton.FontSize"
-										Value="12" />
+								Value="12" />
 						<Setter Target="openParenthesisButton.Padding"
-										Value="0" />
+								Value="0" />
 						<Setter Target="closeParenthesisButton.FontSize"
-										Value="12" />
+								Value="12" />
 						<Setter Target="closeParenthesisButton.Padding"
-										Value="0" />
+								Value="0" />
 
 						<Setter Target="NumberPad.ButtonStyle"
-										Value="{StaticResource NumericButtonStyle12}" />
+								Value="{StaticResource NumericButtonStyle12}" />
 						<Setter Target="aButton.Style"
-										Value="{StaticResource NumericButtonStyle12}" />
+								Value="{StaticResource NumericButtonStyle12}" />
 						<Setter Target="bButton.Style"
-										Value="{StaticResource NumericButtonStyle12}" />
+								Value="{StaticResource NumericButtonStyle12}" />
 						<Setter Target="cButton.Style"
-										Value="{StaticResource NumericButtonStyle12}" />
+								Value="{StaticResource NumericButtonStyle12}" />
 						<Setter Target="dButton.Style"
-										Value="{StaticResource NumericButtonStyle12}" />
+								Value="{StaticResource NumericButtonStyle12}" />
 						<Setter Target="eButton.Style"
-										Value="{StaticResource NumericButtonStyle12}" />
+								Value="{StaticResource NumericButtonStyle12}" />
 						<Setter Target="fButton.Style"
-										Value="{StaticResource NumericButtonStyle12}" />
+								Value="{StaticResource NumericButtonStyle12}" />
 
 						<Setter Target="shiftButton.Style"
-										Value="{StaticResource CaptionToggleButtonSmallStyle}" />
+								Value="{StaticResource CaptionToggleButtonSmallStyle}" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>
 		</VisualStateManager.VisualStateGroups>
 
 		<Grid x:Uid="ProgrammerOperators"
-					Grid.Column="1"
-					Grid.ColumnSpan="6"
-					AutomationProperties.HeadingLevel="Level1">
-			
+			  Grid.Column="1"
+			  Grid.ColumnSpan="6"
+			  AutomationProperties.HeadingLevel="Level1">
+
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition />
 				<ColumnDefinition />
@@ -195,112 +195,112 @@
 				<ColumnDefinition />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			
+
 			<controls:CalculatorButton x:Name="rolButton"
-																 x:Uid="rolButton"
-																 Grid.Column="0"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="rolButton"
-																 ButtonId="Rol"
-																 Content="RoL"
-																 Visibility="Collapsed" />
-			
+									   x:Uid="rolButton"
+									   Grid.Column="0"
+									   Style="{StaticResource OperatorButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="rolButton"
+									   ButtonId="Rol"
+									   Content="RoL"
+									   Visibility="Collapsed" />
+
 			<controls:CalculatorButton x:Name="rorButton"
-																 x:Uid="rorButton"
-																 Grid.Column="1"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="rorButton"
-																 ButtonId="Ror"
-																 Content="RoR"
-																 Visibility="Collapsed" />
-			
+									   x:Uid="rorButton"
+									   Grid.Column="1"
+									   Style="{StaticResource OperatorButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="rorButton"
+									   ButtonId="Ror"
+									   Content="RoR"
+									   Visibility="Collapsed" />
+
 			<controls:CalculatorButton x:Name="lshButton"
-																 x:Uid="lshButton"
-																 Grid.Column="0"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="lshButton"
-																 ButtonId="Lsh"
-																 Content="Lsh" />
-			
+									   x:Uid="lshButton"
+									   Grid.Column="0"
+									   Style="{StaticResource OperatorButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="lshButton"
+									   ButtonId="Lsh"
+									   Content="Lsh" />
+
 			<controls:CalculatorButton x:Name="rshButton"
-																 x:Uid="rshButton"
-																 Grid.Column="1"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="rshButton"
-																 ButtonId="Rsh"
-																 Content="Rsh" />
-			
+									   x:Uid="rshButton"
+									   Grid.Column="1"
+									   Style="{StaticResource OperatorButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="rshButton"
+									   ButtonId="Rsh"
+									   Content="Rsh" />
+
 			<controls:CalculatorButton x:Name="orButton"
-																 x:Uid="orButton"
-																 Grid.Column="2"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="orButton"
-																 ButtonId="Or"
-																 Content="Or" />
-			
+									   x:Uid="orButton"
+									   Grid.Column="2"
+									   Style="{StaticResource OperatorButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="orButton"
+									   ButtonId="Or"
+									   Content="Or" />
+
 			<controls:CalculatorButton x:Name="xorButton"
-																 x:Uid="xorButton"
-																 Grid.Column="3"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="xorButton"
-																 ButtonId="Xor"
-																 Content="Xor" />
-			
+									   x:Uid="xorButton"
+									   Grid.Column="3"
+									   Style="{StaticResource OperatorButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="xorButton"
+									   ButtonId="Xor"
+									   Content="Xor" />
+
 			<controls:CalculatorButton x:Name="notButton"
-																 x:Uid="notButton"
-																 Grid.Column="4"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="notButton"
-																 ButtonId="Not"
-																 Content="Not" />
-			
+									   x:Uid="notButton"
+									   Grid.Column="4"
+									   Style="{StaticResource OperatorButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="notButton"
+									   ButtonId="Not"
+									   Content="Not" />
+
 			<controls:CalculatorButton x:Name="andButton"
-																 x:Uid="andButton"
-																 Grid.Column="5"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="andButton"
-																 ButtonId="And"
-																 Content="And" />
+									   x:Uid="andButton"
+									   Grid.Column="5"
+									   Style="{StaticResource OperatorButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="andButton"
+									   ButtonId="And"
+									   Content="And" />
 		</Grid>
 
 		<ToggleButton x:Name="shiftButton"
-									x:Uid="shiftButton"
-									Grid.Row="1"
-									Grid.Column="1"
-									HorizontalAlignment="Stretch"
-									VerticalAlignment="Stretch"
-									Style="{StaticResource CaptionToggleButtonStyle}"
-									FontFamily="{StaticResource CalculatorFontFamily}"
-									FontSize="16"
-									AutomationProperties.AutomationId="shiftButton"
-									Checked="Shift_Clicked"
-									Content="&#xE752;"
-									Unchecked="Shift_Clicked" />
-		
+					  x:Uid="shiftButton"
+					  Grid.Row="1"
+					  Grid.Column="1"
+					  HorizontalAlignment="Stretch"
+					  VerticalAlignment="Stretch"
+					  Style="{StaticResource CaptionToggleButtonStyle}"
+					  FontFamily="{StaticResource CalculatorFontFamily}"
+					  FontSize="16"
+					  AutomationProperties.AutomationId="shiftButton"
+					  Checked="Shift_Clicked"
+					  Content="&#xE752;"
+					  Unchecked="Shift_Clicked" />
+
 		<controls:CalculatorButton x:Name="modButton"
-															 x:Uid="modButton"
-															 Grid.Row="1"
-															 Grid.Column="2"
-															 Style="{StaticResource OperatorButtonStyle}"
-															 FontSize="12"
-															 AutomationProperties.AutomationId="modButton"
-															 ButtonId="Mod"
-															 Content="Mod" />
+								   x:Uid="modButton"
+								   Grid.Row="1"
+								   Grid.Column="2"
+								   Style="{StaticResource OperatorButtonStyle}"
+								   FontSize="12"
+								   AutomationProperties.AutomationId="modButton"
+								   ButtonId="Mod"
+								   Content="Mod" />
 
 		<Grid x:Uid="StandardOperators"
-					Grid.Row="1"
-					Grid.RowSpan="5"
-					Grid.Column="6"
-					AutomationProperties.HeadingLevel="Level1">
-			
+			  Grid.Row="1"
+			  Grid.RowSpan="5"
+			  Grid.Column="6"
+			  AutomationProperties.HeadingLevel="Level1">
+
 			<Grid.RowDefinitions>
 				<RowDefinition />
 				<RowDefinition />
@@ -308,110 +308,110 @@
 				<RowDefinition />
 				<RowDefinition />
 			</Grid.RowDefinitions>
-			
+
 			<controls:CalculatorButton x:Name="divideButton"
-																 x:Uid="divideButton"
-																 Grid.Row="0"
-																 Style="{StaticResource AccentCalcButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="divideButton"
-																 ButtonId="Divide"
-																 Content="&#xE94A;" />
-			
+									   x:Uid="divideButton"
+									   Grid.Row="0"
+									   Style="{StaticResource AccentCalcButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="divideButton"
+									   ButtonId="Divide"
+									   Content="&#xE94A;" />
+
 			<controls:CalculatorButton x:Name="multiplyButton"
-																 x:Uid="multiplyButton"
-																 Grid.Row="1"
-																 Style="{StaticResource AccentCalcButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="multiplyButton"
-																 ButtonId="Multiply"
-																 Content="&#xE947;" />
-			
+									   x:Uid="multiplyButton"
+									   Grid.Row="1"
+									   Style="{StaticResource AccentCalcButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="multiplyButton"
+									   ButtonId="Multiply"
+									   Content="&#xE947;" />
+
 			<controls:CalculatorButton x:Name="minusButton"
-																 x:Uid="minusButton"
-																 Grid.Row="2"
-																 Style="{StaticResource AccentCalcButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="minusButton"
-																 ButtonId="Subtract"
-																 Content="&#xE949;" />
-			
+									   x:Uid="minusButton"
+									   Grid.Row="2"
+									   Style="{StaticResource AccentCalcButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="minusButton"
+									   ButtonId="Subtract"
+									   Content="&#xE949;" />
+
 			<controls:CalculatorButton x:Name="plusButton"
-																 x:Uid="plusButton"
-																 Grid.Row="3"
-																 Style="{StaticResource AccentCalcButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="plusButton"
-																 ButtonId="Add"
-																 Content="&#xE948;" />
-			
+									   x:Uid="plusButton"
+									   Grid.Row="3"
+									   Style="{StaticResource AccentCalcButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="plusButton"
+									   ButtonId="Add"
+									   Content="&#xE948;" />
+
 			<controls:CalculatorButton x:Name="equalButton"
-																 x:Uid="equalButton"
-																 Grid.Row="4"
-																 Style="{StaticResource AccentCalcButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="equalButton"
-																 ButtonId="Equals"
-																 Content="&#xE94E;" />
+									   x:Uid="equalButton"
+									   Grid.Row="4"
+									   Style="{StaticResource AccentCalcButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="equalButton"
+									   ButtonId="Equals"
+									   Content="&#xE94E;" />
 		</Grid>
 
 		<Grid x:Uid="DisplayControls"
-					Grid.Row="1"
-					Grid.Column="3"
-					Grid.ColumnSpan="3"
-					AutomationProperties.HeadingLevel="Level1">
-			
+			  Grid.Row="1"
+			  Grid.Column="3"
+			  Grid.ColumnSpan="3"
+			  AutomationProperties.HeadingLevel="Level1">
+
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition />
 				<ColumnDefinition />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			
+
 			<controls:CalculatorButton x:Name="clearEntryButton"
-																 x:Uid="clearEntryButton"
-																 Grid.Column="0"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="12"
-																 FontWeight="SemiBold"
-																 AutomationProperties.AutomationId="clearEntryButton"
-																 ButtonId="ClearEntry"
-																 Content="CE" />
-			
+									   x:Uid="clearEntryButton"
+									   Grid.Column="0"
+									   Style="{StaticResource OperatorButtonStyle}"
+									   FontSize="12"
+									   FontWeight="SemiBold"
+									   AutomationProperties.AutomationId="clearEntryButton"
+									   ButtonId="ClearEntry"
+									   Content="CE" />
+
 			<controls:CalculatorButton x:Name="clearButton"
-																 x:Uid="clearButton"
-																 Grid.Column="1"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="12"
-																 FontWeight="SemiBold"
-																 AutomationProperties.AutomationId="clearButton"
-																 ButtonId="Clear"
-																 Content="C" />
-			
+									   x:Uid="clearButton"
+									   Grid.Column="1"
+									   Style="{StaticResource OperatorButtonStyle}"
+									   FontSize="12"
+									   FontWeight="SemiBold"
+									   AutomationProperties.AutomationId="clearButton"
+									   ButtonId="Clear"
+									   Content="C" />
+
 			<controls:CalculatorButton x:Name="backSpaceButton"
-																 x:Uid="backSpaceButton"
-																 Grid.Column="2"
-																 Style="{StaticResource SymbolOperatorButtonStyle}"
-																 FontSize="12"
-																 AutomationProperties.AutomationId="backSpaceButton"
-																 ButtonId="Backspace"
-																 Content="&#xE94F;" />
+									   x:Uid="backSpaceButton"
+									   Grid.Column="2"
+									   Style="{StaticResource SymbolOperatorButtonStyle}"
+									   FontSize="12"
+									   AutomationProperties.AutomationId="backSpaceButton"
+									   ButtonId="Backspace"
+									   Content="&#xE94F;" />
 		</Grid>
 
 		<Grid x:Uid="NumberPad"
-					Grid.Row="2"
-					Grid.RowSpan="4"
-					Grid.Column="1"
-					Grid.ColumnSpan="5"
-					AutomationProperties.AutomationId="NumberPad"
-					AutomationProperties.HeadingLevel="Level1">
-			
+			  Grid.Row="2"
+			  Grid.RowSpan="4"
+			  Grid.Column="1"
+			  Grid.ColumnSpan="5"
+			  AutomationProperties.AutomationId="NumberPad"
+			  AutomationProperties.HeadingLevel="Level1">
+
 			<Grid.RowDefinitions>
 				<RowDefinition />
 				<RowDefinition />
 				<RowDefinition />
 				<RowDefinition />
 			</Grid.RowDefinitions>
-			
+
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition />
 				<ColumnDefinition />
@@ -419,104 +419,105 @@
 				<ColumnDefinition />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			
+
 			<local:NumberPad x:Name="NumberPad"
-											 Grid.RowSpan="4"
-											 Grid.Column="2"
-											 Grid.ColumnSpan="3"
-											 ButtonStyle="{StaticResource NumericButtonStyle18}" />
+							 Grid.RowSpan="4"
+							 Grid.Column="2"
+							 Grid.ColumnSpan="3"
+							 ButtonStyle="{StaticResource NumericButtonStyle18}"
+							 DecimalButtonStyle="{StaticResource DecimalButtonStyle}" />
 
 			<controls:CalculatorButton x:Name="aButton"
-																 x:Uid="aButton"
-																 Grid.Row="0"
-																 Grid.Column="0"
-																 Style="{StaticResource NumericButtonStyle12}"
-																 AutomationProperties.AutomationId="aButton"
-																 ButtonId="A"
-																 Content="A"
-																 IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}" />
-			
+									   x:Uid="aButton"
+									   Grid.Row="0"
+									   Grid.Column="0"
+									   Style="{StaticResource NumericButtonStyle12}"
+									   AutomationProperties.AutomationId="aButton"
+									   ButtonId="A"
+									   Content="A"
+									   IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}" />
+
 			<controls:CalculatorButton x:Name="bButton"
-																 x:Uid="bButton"
-																 Grid.Row="0"
-																 Grid.Column="1"
-																 Style="{StaticResource NumericButtonStyle12}"
-																 AutomationProperties.AutomationId="bButton"
-																 ButtonId="B"
-																 Content="B"
-																 IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}" />
-			
+									   x:Uid="bButton"
+									   Grid.Row="0"
+									   Grid.Column="1"
+									   Style="{StaticResource NumericButtonStyle12}"
+									   AutomationProperties.AutomationId="bButton"
+									   ButtonId="B"
+									   Content="B"
+									   IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}" />
+
 			<controls:CalculatorButton x:Name="cButton"
-																 x:Uid="cButton"
-																 Grid.Row="1"
-																 Grid.Column="0"
-																 Style="{StaticResource NumericButtonStyle12}"
-																 AutomationProperties.AutomationId="cButton"
-																 ButtonId="C"
-																 Content="C"
-																 IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}" />
-			
+									   x:Uid="cButton"
+									   Grid.Row="1"
+									   Grid.Column="0"
+									   Style="{StaticResource NumericButtonStyle12}"
+									   AutomationProperties.AutomationId="cButton"
+									   ButtonId="C"
+									   Content="C"
+									   IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}" />
+
 			<controls:CalculatorButton x:Name="dButton"
-																 x:Uid="dButton"
-																 Grid.Row="1"
-																 Grid.Column="1"
-																 Style="{StaticResource NumericButtonStyle12}"
-																 AutomationProperties.AutomationId="dButton"
-																 ButtonId="D"
-																 Content="D"
-																 IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}" />
-			
+									   x:Uid="dButton"
+									   Grid.Row="1"
+									   Grid.Column="1"
+									   Style="{StaticResource NumericButtonStyle12}"
+									   AutomationProperties.AutomationId="dButton"
+									   ButtonId="D"
+									   Content="D"
+									   IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}" />
+
 			<controls:CalculatorButton x:Name="eButton"
-																 x:Uid="eButton"
-																 Grid.Row="2"
-																 Grid.Column="0"
-																 Style="{StaticResource NumericButtonStyle12}"
-																 AutomationProperties.AutomationId="eButton"
-																 ButtonId="E"
-																 Content="E"
-																 IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}" />
-			
+									   x:Uid="eButton"
+									   Grid.Row="2"
+									   Grid.Column="0"
+									   Style="{StaticResource NumericButtonStyle12}"
+									   AutomationProperties.AutomationId="eButton"
+									   ButtonId="E"
+									   Content="E"
+									   IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}" />
+
 			<controls:CalculatorButton x:Name="fButton"
-																 x:Uid="fButton"
-																 Grid.Row="2"
-																 Grid.Column="1"
-																 Style="{StaticResource NumericButtonStyle12}"
-																 AutomationProperties.AutomationId="fButton"
-																 ButtonId="F"
-																 Content="F"
-																 IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}" />
+									   x:Uid="fButton"
+									   Grid.Row="2"
+									   Grid.Column="1"
+									   Style="{StaticResource NumericButtonStyle12}"
+									   AutomationProperties.AutomationId="fButton"
+									   ButtonId="F"
+									   Content="F"
+									   IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}" />
 		</Grid>
 
 		<controls:CalculatorButton x:Name="openParenthesisButton"
-															 x:Uid="openParenthesisButton"
-															 Grid.Row="5"
-															 Grid.Column="1"
-															 Style="{StaticResource ParenthesisCalcButtonStyle}"
-															 FontSize="18"
-															 AutomationProperties.AutomationId="openParenthesisButton"
-															 AutomationProperties.Name="{Binding LeftParenthesisAutomationName}"
-															 ButtonId="OpenParenthesis"
-															 Content="("
-															 Tag="{x:Bind Model.OpenParenthesisCount, Mode=OneWay}" />
-		
+								   x:Uid="openParenthesisButton"
+								   Grid.Row="5"
+								   Grid.Column="1"
+								   Style="{StaticResource ParenthesisCalcButtonStyle}"
+								   FontSize="18"
+								   AutomationProperties.AutomationId="openParenthesisButton"
+								   AutomationProperties.Name="{Binding LeftParenthesisAutomationName}"
+								   ButtonId="OpenParenthesis"
+								   Content="("
+								   Tag="{x:Bind Model.OpenParenthesisCount, Mode=OneWay}" />
+
 		<controls:CalculatorButton x:Name="closeParenthesisButton"
-															 x:Uid="closeParenthesisButton"
-															 Grid.Row="5"
-															 Grid.Column="2"
-															 Style="{StaticResource OperatorButtonStyle}"
-															 FontSize="18"
-															 AutomationProperties.AutomationId="closeParenthesisButton"
-															 ButtonId="CloseParenthesis"
-															 Content=")" />
-		
+								   x:Uid="closeParenthesisButton"
+								   Grid.Row="5"
+								   Grid.Column="2"
+								   Style="{StaticResource OperatorButtonStyle}"
+								   FontSize="18"
+								   AutomationProperties.AutomationId="closeParenthesisButton"
+								   ButtonId="CloseParenthesis"
+								   Content=")" />
+
 		<controls:CalculatorButton x:Name="negateButton"
-															 x:Uid="negateButton"
-															 Grid.Row="5"
-															 Grid.Column="3"
-															 Style="{StaticResource SymbolOperatorButtonStyle}"
-															 FontSize="12"
-															 AutomationProperties.AutomationId="negateButton"
-															 ButtonId="Negate"
-															 Content="&#xE94D;" />
+								   x:Uid="negateButton"
+								   Grid.Row="5"
+								   Grid.Column="3"
+								   Style="{StaticResource SymbolOperatorButtonStyle}"
+								   FontSize="12"
+								   AutomationProperties.AutomationId="negateButton"
+								   ButtonId="Negate"
+								   Content="&#xE94D;" />
 	</Grid>
 </UserControl>
diff --git a/src/Calculator.Shared/Views/CalculatorScientificOperators.xaml b/src/Calculator.Shared/Views/CalculatorScientificOperators.xaml
index f3bb5baf..8e2767d7 100644
--- a/src/Calculator.Shared/Views/CalculatorScientificOperators.xaml
+++ b/src/Calculator.Shared/Views/CalculatorScientificOperators.xaml
@@ -1,61 +1,61 @@
 <UserControl x:Class="CalculatorApp.CalculatorScientificOperators"
-             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:converters="using:CalculatorApp.Converters"
-             xmlns:designdata="using:CalculatorApp.DesignData"
-             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:converters="using:CalculatorApp.Converters"
+			 xmlns:designdata="using:CalculatorApp.DesignData"
+			 xmlns:local="using:CalculatorApp"
+			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 x:Name="ControlRoot"
+			 mc:Ignorable="">
+
 	<UserControl.Resources>
 		<converters:BooleanNegationConverter x:Key="BooleanNegationConverter" />
 		<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 		<converters:BooleanToVisibilityNegationConverter x:Key="BooleanToVisibilityNegationConverter" />
 	</UserControl.Resources>
-	
+
 	<Grid x:Name="ScientificOperators">
 		<Grid.RowDefinitions>
 			<RowDefinition x:Name="R0"
-										 Height="1*" />
+						   Height="1*" />
 			<RowDefinition x:Name="R1"
-										 Height="0" />
+						   Height="0" />
 			<RowDefinition x:Name="R2"
-										 Height="1*" />
+						   Height="1*" />
 			<RowDefinition x:Name="R3"
-										 Height="0" />
+						   Height="0" />
 			<RowDefinition Height="1*" />
 			<RowDefinition Height="1*" />
 			<RowDefinition Height="1*" />
 			<RowDefinition Height="1*" />
 			<RowDefinition 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="0" />
+							  Width="0" />
 			<ColumnDefinition x:Name="C2"
-												Width="0" />
+							  Width="0" />
 			<ColumnDefinition x:Name="C3"
-												Width="0" />
+							  Width="0" />
 			<ColumnDefinition x:Name="C4"
-												Width="1*" />
+							  Width="1*" />
 			<ColumnDefinition x:Name="C5"
-												Width="1*" />
+							  Width="1*" />
 			<ColumnDefinition x:Name="C6"
-												Width="1*" />
+							  Width="1*" />
 			<ColumnDefinition x:Name="C7"
-												Width="1*" />
+							  Width="1*" />
 			<ColumnDefinition x:Name="C8"
-												Width="1*" />
+							  Width="1*" />
 			<ColumnDefinition x:Name="GutterRight"
-												Width="0" />
+							  Width="0" />
 		</Grid.ColumnDefinitions>
 
 		<VisualStateManager.VisualStateGroups>
@@ -64,513 +64,513 @@
 				<VisualState x:Name="ErrorLayout">
 					<VisualState.Setters>
 						<Setter Target="xpower2Button.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="powerButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="sinButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="cosButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="tanButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="sinhButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="coshButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="tanhButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 
 						<Setter Target="xpower3Button.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="ySquareRootButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="invsinButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="invcosButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="invtanButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="invsinhButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="invcoshButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="invtanhButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 
 						<Setter Target="squareRootButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="powerOf10Button.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="logBase10Button.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="expButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="modButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 
 						<Setter Target="invertButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="powerOfEButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="logBaseEButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="dmsButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="degreesButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 
 						<Setter Target="shiftButton.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="piButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="factorialButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="negateButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="openParenthesisButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 						<Setter Target="closeParenthesisButton.IsEnabled"
-										Value="False" />
+								Value="False" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>
-			
+
 			<VisualStateGroup x:Name="SizeLayouts">
 				<VisualState x:Name="Portrait">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="1366"
-														 MinWindowWidth="768" />
+										 MinWindowWidth="768" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
 						<Setter Target="R1.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="R3.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="OpR2.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="OpR3.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="Row1.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="Row2.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="InvRow1.(Grid.Row)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="Row2.(Grid.Row)"
-										Value="2" />
+								Value="2" />
 						<Setter Target="InvRow2.(Grid.Row)"
-										Value="3" />
+								Value="3" />
 						<Setter Target="InvRow1.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="InvRow2.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 
 						<Setter Target="negateButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="piButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="factorialButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="openParenthesisButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="closeParenthesisButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="sinButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="cosButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="tanButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="sinhButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="coshButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="tanhButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 
 						<Setter Target="invsinButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invcosButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invtanButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invsinhButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invcoshButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invtanhButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="powerButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="powerOf10Button.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="logBase10Button.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="expButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="modButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="ySquareRootButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="powerOfEButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="logBaseEButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="dmsButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="degreesButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="xpower2Button.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="xpower3Button.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="squareRootButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invertButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 
 						<Setter Target="clearEntryButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="clearButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="backSpaceButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="divideButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="multiplyButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="minusButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="plusButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="equalButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="NumberPad.ButtonStyle"
-										Value="{ThemeResource NumericButtonStyle34}" />
+								Value="{ThemeResource NumericButtonStyle34}" />
 					</VisualState.Setters>
 					<Storyboard Completed="WideLayout_Completed" />
 				</VisualState>
-				
+
 				<VisualState x:Name="WideL">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="768"
-														 MinWindowWidth="1200" />
+										 MinWindowWidth="1200" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
 						<Setter Target="R0.Height"
-										Value="0" />
+								Value="0" />
 						<Setter Target="R2.Height"
-										Value="0" />
+								Value="0" />
 						<Setter Target="C0.Width"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="C1.Width"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="C2.Width"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="C3.Width"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="shiftButton.(Grid.Row)"
-										Value="8" />
+								Value="8" />
 						<Setter Target="shiftButton.(Grid.Column)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="ScientificFunctions.(Grid.Row)"
-										Value="4" />
+								Value="4" />
 						<Setter Target="ScientificFunctions.(Grid.Column)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="OpR2.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="OpR3.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="Row1.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="Row2.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="InvRow1.(Grid.Row)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="Row2.(Grid.Row)"
-										Value="2" />
+								Value="2" />
 						<Setter Target="InvRow2.(Grid.Row)"
-										Value="3" />
+								Value="3" />
 						<Setter Target="InvRow1.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="InvRow2.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 
 						<Setter Target="negateButton.(Grid.Row)"
-										Value="8" />
+								Value="8" />
 						<Setter Target="negateButton.(Grid.Column)"
-										Value="6" />
+								Value="6" />
 						<Setter Target="piButton.(Grid.Row)"
-										Value="8" />
+								Value="8" />
 						<Setter Target="piButton.(Grid.Column)"
-										Value="2" />
+								Value="2" />
 						<Setter Target="factorialButton.(Grid.Row)"
-										Value="8" />
+								Value="8" />
 						<Setter Target="factorialButton.(Grid.Column)"
-										Value="3" />
+								Value="3" />
 						<Setter Target="openParenthesisButton.(Grid.Row)"
-										Value="8" />
+								Value="8" />
 						<Setter Target="openParenthesisButton.(Grid.Column)"
-										Value="4" />
+								Value="4" />
 						<Setter Target="closeParenthesisButton.(Grid.Row)"
-										Value="8" />
+								Value="8" />
 						<Setter Target="closeParenthesisButton.(Grid.Column)"
-										Value="5" />
+								Value="5" />
 
 						<Setter Target="negateButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="piButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="factorialButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="openParenthesisButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="closeParenthesisButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="sinButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="cosButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="tanButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="sinhButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="coshButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="tanhButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 
 						<Setter Target="invsinButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invcosButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invtanButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invsinhButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invcoshButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invtanhButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="powerButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="powerOf10Button.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="logBase10Button.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="expButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="modButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="ySquareRootButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="powerOfEButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="logBaseEButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="dmsButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="degreesButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="xpower2Button.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="xpower3Button.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="squareRootButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="invertButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 
 						<Setter Target="clearEntryButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="clearButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="backSpaceButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="divideButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="multiplyButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="minusButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="plusButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="equalButton.FontSize"
-										Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
+								Value="{ThemeResource CalcStandardOperatorCaptionSize}" />
 						<Setter Target="NumberPad.ButtonStyle"
-										Value="{ThemeResource NumericButtonStyle34}" />
+								Value="{ThemeResource NumericButtonStyle34}" />
 					</VisualState.Setters>
 					<Storyboard Completed="WideLayout_Completed" />
 				</VisualState>
-				
+
 				<VisualState x:Name="WideMINI">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="0"
-														 MinWindowWidth="1024" />
+										 MinWindowWidth="1024" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
 						<Setter Target="R0.Height"
-										Value="0" />
+								Value="0" />
 						<Setter Target="R2.Height"
-										Value="0" />
+								Value="0" />
 						<Setter Target="C0.Width"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="C1.Width"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="C2.Width"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="C3.Width"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="shiftButton.(Grid.Row)"
-										Value="8" />
+								Value="8" />
 						<Setter Target="shiftButton.(Grid.Column)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="ScientificFunctions.(Grid.Row)"
-										Value="4" />
+								Value="4" />
 						<Setter Target="ScientificFunctions.(Grid.Column)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="OpR2.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="OpR3.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="Row1.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="Row2.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="InvRow1.(Grid.Row)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="Row2.(Grid.Row)"
-										Value="2" />
+								Value="2" />
 						<Setter Target="InvRow2.(Grid.Row)"
-										Value="3" />
+								Value="3" />
 						<Setter Target="InvRow1.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="InvRow2.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 
 						<Setter Target="negateButton.(Grid.Row)"
-										Value="8" />
+								Value="8" />
 						<Setter Target="negateButton.(Grid.Column)"
-										Value="6" />
+								Value="6" />
 						<Setter Target="piButton.(Grid.Row)"
-										Value="8" />
+								Value="8" />
 						<Setter Target="piButton.(Grid.Column)"
-										Value="2" />
+								Value="2" />
 						<Setter Target="factorialButton.(Grid.Row)"
-										Value="8" />
+								Value="8" />
 						<Setter Target="factorialButton.(Grid.Column)"
-										Value="3" />
+								Value="3" />
 						<Setter Target="openParenthesisButton.(Grid.Row)"
-										Value="8" />
+								Value="8" />
 						<Setter Target="openParenthesisButton.(Grid.Column)"
-										Value="4" />
+								Value="4" />
 						<Setter Target="closeParenthesisButton.(Grid.Row)"
-										Value="8" />
+								Value="8" />
 						<Setter Target="closeParenthesisButton.(Grid.Column)"
-										Value="5" />
+								Value="5" />
 					</VisualState.Setters>
 					<Storyboard Completed="WideLayout_Completed" />
 				</VisualState>
-				
+
 				<VisualState x:Name="Fill640x800">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="800"
-														 MinWindowWidth="640" />
+										 MinWindowWidth="640" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
 						<Setter Target="R1.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="R3.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="OpR2.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="OpR3.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="Row1.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="Row2.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="InvRow1.(Grid.Row)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="Row2.(Grid.Row)"
-										Value="2" />
+								Value="2" />
 						<Setter Target="InvRow2.(Grid.Row)"
-										Value="3" />
+								Value="3" />
 						<Setter Target="InvRow1.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="InvRow2.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 					</VisualState.Setters>
 					<Storyboard Completed="WideLayout_Completed" />
 				</VisualState>
-				
+
 				<VisualState x:Name="Fill640x528">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="0"
-														 MinWindowWidth="640" />
+										 MinWindowWidth="640" />
 					</VisualState.StateTriggers>
 					<Storyboard Completed="ShortLayout_Completed" />
 				</VisualState>
-				
+
 				<VisualState x:Name="Snap320x800">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="800"
-														 MinWindowWidth="0" />
+										 MinWindowWidth="0" />
 					</VisualState.StateTriggers>
-					
+
 					<VisualState.Setters>
 						<Setter Target="R1.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="R3.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="OpR2.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="OpR3.Height"
-										Value="1*" />
+								Value="1*" />
 						<Setter Target="Row1.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="Row2.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="InvRow1.(Grid.Row)"
-										Value="1" />
+								Value="1" />
 						<Setter Target="Row2.(Grid.Row)"
-										Value="2" />
+								Value="2" />
 						<Setter Target="InvRow2.(Grid.Row)"
-										Value="3" />
+								Value="3" />
 						<Setter Target="InvRow1.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 						<Setter Target="InvRow2.Visibility"
-										Value="Visible" />
+								Value="Visible" />
 					</VisualState.Setters>
 					<Storyboard Completed="WideLayout_Completed" />
 				</VisualState>
-				
+
 				<VisualState x:Name="MinSizeLayout">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="{StaticResource AppMinWindowHeight}"
-														 MinWindowWidth="{StaticResource AppMinWindowWidth}" />
+										 MinWindowWidth="{StaticResource AppMinWindowWidth}" />
 					</VisualState.StateTriggers>
 					<Storyboard Completed="ShortLayout_Completed" />
 				</VisualState>
-				
+
 				<VisualState x:Name="DefaultLayout">
 					<VisualState.StateTriggers>
 						<AdaptiveTrigger MinWindowHeight="0"
-														 MinWindowWidth="0" />
+										 MinWindowWidth="0" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
 						<Setter Target="shiftButton.Style"
-										Value="{StaticResource CaptionToggleButtonSmallStyle}" />
+								Value="{StaticResource CaptionToggleButtonSmallStyle}" />
 					</VisualState.Setters>
 					<Storyboard Completed="ShortLayout_Completed" />
 				</VisualState>
@@ -578,19 +578,19 @@
 		</VisualStateManager.VisualStateGroups>
 
 		<Grid x:Name="ScientificFunctions"
-					x:Uid="ScientificFunctions"
-					Grid.RowSpan="4"
-					Grid.Column="5"
-					Grid.ColumnSpan="5"
-					AutomationProperties.HeadingLevel="Level1">
-			
+			  x:Uid="ScientificFunctions"
+			  Grid.RowSpan="4"
+			  Grid.Column="5"
+			  Grid.ColumnSpan="5"
+			  AutomationProperties.HeadingLevel="Level1">
+
 			<Grid.RowDefinitions>
 				<RowDefinition />
 				<RowDefinition />
 				<RowDefinition x:Name="OpR2"
-											 Height="0" />
+							   Height="0" />
 				<RowDefinition x:Name="OpR3"
-											 Height="0" />
+							   Height="0" />
 			</Grid.RowDefinitions>
 
 			<!-- Scientific Row 1 -->
@@ -604,164 +604,164 @@
 				</Grid.ColumnDefinitions>
 
 				<controls:CalculatorButton x:Name="xpower2Button"
-																	 x:Uid="xpower2Button"
-																	 Style="{StaticResource SymbolOperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="xpower2Button"
-																	 ButtonId="XPower2"
-																	 Content="&#xf7c8;" />
-				
+										   x:Uid="xpower2Button"
+										   Style="{StaticResource SymbolOperatorButtonStyle}"
+										   AutomationProperties.AutomationId="xpower2Button"
+										   ButtonId="XPower2"
+										   Content="&#xf7c8;" />
+
 				<controls:CalculatorButton x:Name="powerButton"
-																	 x:Uid="powerButton"
-																	 Grid.Column="1"
-																	 Style="{StaticResource SymbolOperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="powerButton"
-																	 ButtonId="XPowerY"
-																	 Content="&#xf7ca;" />
-				
+										   x:Uid="powerButton"
+										   Grid.Column="1"
+										   Style="{StaticResource SymbolOperatorButtonStyle}"
+										   AutomationProperties.AutomationId="powerButton"
+										   ButtonId="XPowerY"
+										   Content="&#xf7ca;" />
+
 				<controls:CalculatorButton x:Name="sinButton"
-																	 x:Uid="sinButton"
-																	 Grid.Column="2"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="sinButton"
-																	 ButtonId="Sin"
-																	 Content="sin"
-																	 Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
-				
+										   x:Uid="sinButton"
+										   Grid.Column="2"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="sinButton"
+										   ButtonId="Sin"
+										   Content="sin"
+										   Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
+
 				<controls:CalculatorButton x:Name="cosButton"
-																	 x:Uid="cosButton"
-																	 Grid.Column="3"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="cosButton"
-																	 ButtonId="Cos"
-																	 Content="cos"
-																	 Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
-				
+										   x:Uid="cosButton"
+										   Grid.Column="3"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="cosButton"
+										   ButtonId="Cos"
+										   Content="cos"
+										   Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
+
 				<controls:CalculatorButton x:Name="tanButton"
-																	 x:Uid="tanButton"
-																	 Grid.Column="4"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="tanButton"
-																	 ButtonId="Tan"
-																	 Content="tan"
-																	 Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
-				
+										   x:Uid="tanButton"
+										   Grid.Column="4"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="tanButton"
+										   ButtonId="Tan"
+										   Content="tan"
+										   Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
+
 				<controls:CalculatorButton x:Name="sinhButton"
-																	 x:Uid="sinhButton"
-																	 Grid.Column="2"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="sinhButton"
-																	 ButtonId="Sinh"
-																	 Content="sinh"
-																	 Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
-				
+										   x:Uid="sinhButton"
+										   Grid.Column="2"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="sinhButton"
+										   ButtonId="Sinh"
+										   Content="sinh"
+										   Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
+
 				<controls:CalculatorButton x:Name="coshButton"
-																	 x:Uid="coshButton"
-																	 Grid.Column="3"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="coshButton"
-																	 ButtonId="Cosh"
-																	 Content="cosh"
-																	 Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
-				
+										   x:Uid="coshButton"
+										   Grid.Column="3"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="coshButton"
+										   ButtonId="Cosh"
+										   Content="cosh"
+										   Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
+
 				<controls:CalculatorButton x:Name="tanhButton"
-																	 x:Uid="tanhButton"
-																	 Grid.Column="4"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="tanhButton"
-																	 ButtonId="Tanh"
-																	 Content="tanh"
-																	 Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
+										   x:Uid="tanhButton"
+										   Grid.Column="4"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="tanhButton"
+										   ButtonId="Tanh"
+										   Content="tanh"
+										   Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
 			</Grid>
 
 			<!-- Scientific INV Row 1 -->
 			<Grid x:Name="InvRow1"
-						Visibility="Collapsed">
+				  Visibility="Collapsed">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition x:Name="CX0"
-														Width="1*" />
+									  Width="1*" />
 					<ColumnDefinition x:Name="CX1"
-														Width="1*" />
+									  Width="1*" />
 					<ColumnDefinition x:Name="CX2"
-														Width="1*" />
+									  Width="1*" />
 					<ColumnDefinition x:Name="Cx3"
-														Width="1*" />
+									  Width="1*" />
 					<ColumnDefinition x:Name="CX4"
-														Width="1*" />
+									  Width="1*" />
 				</Grid.ColumnDefinitions>
 
 				<controls:CalculatorButton x:Name="xpower3Button"
-																	 x:Uid="xpower3Button"
-																	 Style="{StaticResource SymbolOperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="xpower3Button"
-																	 ButtonId="Cube"
-																	 Content="&#xf7cb;" />
-				
+										   x:Uid="xpower3Button"
+										   Style="{StaticResource SymbolOperatorButtonStyle}"
+										   AutomationProperties.AutomationId="xpower3Button"
+										   ButtonId="Cube"
+										   Content="&#xf7cb;" />
+
 				<controls:CalculatorButton x:Name="ySquareRootButton"
-																	 x:Uid="ySquareRootButton"
-																	 Grid.Column="1"
-																	 Style="{StaticResource SymbolOperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="ySquareRootButton"
-																	 ButtonId="YRootX"
-																	 Content="&#xf7cd;" />
-				
+										   x:Uid="ySquareRootButton"
+										   Grid.Column="1"
+										   Style="{StaticResource SymbolOperatorButtonStyle}"
+										   AutomationProperties.AutomationId="ySquareRootButton"
+										   ButtonId="YRootX"
+										   Content="&#xf7cd;" />
+
 				<controls:CalculatorButton x:Name="invsinButton"
-																	 x:Uid="invsinButton"
-																	 Grid.Column="2"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="invsinButton"
-																	 ButtonId="InvSin"
-																	 Content="sin⁻¹"
-																	 Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
-				
+										   x:Uid="invsinButton"
+										   Grid.Column="2"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="invsinButton"
+										   ButtonId="InvSin"
+										   Content="sin⁻¹"
+										   Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
+
 				<controls:CalculatorButton x:Name="invcosButton"
-																	 x:Uid="invcosButton"
-																	 Grid.Column="3"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="invcosButton"
-																	 ButtonId="InvCos"
-																	 Content="cos⁻¹"
-																	 Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
-				
+										   x:Uid="invcosButton"
+										   Grid.Column="3"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="invcosButton"
+										   ButtonId="InvCos"
+										   Content="cos⁻¹"
+										   Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
+
 				<controls:CalculatorButton x:Name="invtanButton"
-																	 x:Uid="invtanButton"
-																	 Grid.Column="4"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="invtanButton"
-																	 ButtonId="InvTan"
-																	 Content="tan⁻¹"
-																	 Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
-				
+										   x:Uid="invtanButton"
+										   Grid.Column="4"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="invtanButton"
+										   ButtonId="InvTan"
+										   Content="tan⁻¹"
+										   Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
+
 				<controls:CalculatorButton x:Name="invsinhButton"
-																	 x:Uid="invsinhButton"
-																	 Grid.Column="2"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="invsinhButton"
-																	 ButtonId="InvSinh"
-																	 Content="sinh⁻¹"
-																	 Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
-				
+										   x:Uid="invsinhButton"
+										   Grid.Column="2"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="invsinhButton"
+										   ButtonId="InvSinh"
+										   Content="sinh⁻¹"
+										   Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
+
 				<controls:CalculatorButton x:Name="invcoshButton"
-																	 x:Uid="invcoshButton"
-																	 Grid.Column="3"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="invcoshButton"
-																	 ButtonId="InvCosh"
-																	 Content="cosh⁻¹"
-																	 Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
-				
+										   x:Uid="invcoshButton"
+										   Grid.Column="3"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="invcoshButton"
+										   ButtonId="InvCosh"
+										   Content="cosh⁻¹"
+										   Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
+
 				<controls:CalculatorButton x:Name="invtanhButton"
-																	 x:Uid="invtanhButton"
-																	 Grid.Column="4"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="invtanhButton"
-																	 ButtonId="InvTanh"
-																	 Content="tanh⁻¹"
-																	 Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
+										   x:Uid="invtanhButton"
+										   Grid.Column="4"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="invtanhButton"
+										   ButtonId="InvTanh"
+										   Content="tanh⁻¹"
+										   Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
 			</Grid>
 
 			<!-- Scientific Row 2 -->
 			<Grid x:Name="Row2"
-						Grid.Row="1">
+				  Grid.Row="1">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="1*" />
 					<ColumnDefinition Width="1*" />
@@ -771,49 +771,49 @@
 				</Grid.ColumnDefinitions>
 
 				<controls:CalculatorButton x:Name="squareRootButton"
-																	 x:Uid="squareRootButton"
-																	 Style="{StaticResource SymbolOperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="squareRootButton"
-																	 ButtonId="Sqrt"
-																	 Content="&#xE94B;" />
-				
+										   x:Uid="squareRootButton"
+										   Style="{StaticResource SymbolOperatorButtonStyle}"
+										   AutomationProperties.AutomationId="squareRootButton"
+										   ButtonId="Sqrt"
+										   Content="&#xE94B;" />
+
 				<controls:CalculatorButton x:Name="powerOf10Button"
-																	 x:Uid="powerOf10Button"
-																	 Grid.Column="1"
-																	 Style="{StaticResource SymbolOperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="powerOf10Button"
-																	 ButtonId="TenPowerX"
-																	 Content="&#xF7CC;" />
-				
+										   x:Uid="powerOf10Button"
+										   Grid.Column="1"
+										   Style="{StaticResource SymbolOperatorButtonStyle}"
+										   AutomationProperties.AutomationId="powerOf10Button"
+										   ButtonId="TenPowerX"
+										   Content="&#xF7CC;" />
+
 				<controls:CalculatorButton x:Name="logBase10Button"
-																	 x:Uid="logBase10Button"
-																	 Grid.Column="2"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="logBase10Button"
-																	 ButtonId="LogBase10"
-																	 Content="log" />
-				
+										   x:Uid="logBase10Button"
+										   Grid.Column="2"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="logBase10Button"
+										   ButtonId="LogBase10"
+										   Content="log" />
+
 				<controls:CalculatorButton x:Name="expButton"
-																	 x:Uid="expButton"
-																	 Grid.Column="3"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="expButton"
-																	 ButtonId="Exp"
-																	 Content="Exp" />
-				
+										   x:Uid="expButton"
+										   Grid.Column="3"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="expButton"
+										   ButtonId="Exp"
+										   Content="Exp" />
+
 				<controls:CalculatorButton x:Name="modButton"
-																	 x:Uid="modButton"
-																	 Grid.Column="4"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="modButton"
-																	 ButtonId="Mod"
-																	 Content="Mod" />
+										   x:Uid="modButton"
+										   Grid.Column="4"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="modButton"
+										   ButtonId="Mod"
+										   Content="Mod" />
 			</Grid>
 
 			<!-- Scientific INV Row 2 -->
 			<Grid x:Name="InvRow2"
-						Grid.Row="1"
-						Visibility="Collapsed">
+				  Grid.Row="1"
+				  Visibility="Collapsed">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="1*" />
 					<ColumnDefinition Width="1*" />
@@ -823,67 +823,67 @@
 				</Grid.ColumnDefinitions>
 
 				<controls:CalculatorButton x:Name="invertButton"
-																	 x:Uid="invertButton"
-																	 Style="{StaticResource SymbolOperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="invertButton"
-																	 ButtonId="Invert"
-																	 Content="&#xf7c9;" />
-				
+										   x:Uid="invertButton"
+										   Style="{StaticResource SymbolOperatorButtonStyle}"
+										   AutomationProperties.AutomationId="invertButton"
+										   ButtonId="Invert"
+										   Content="&#xf7c9;" />
+
 				<controls:CalculatorButton x:Name="powerOfEButton"
-																	 x:Uid="powerOfEButton"
-																	 Grid.Column="1"
-																	 Style="{StaticResource SymbolOperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="powerOfEButton"
-																	 ButtonId="EPowerX"
-																	 Content="&#xf7ce;" />
-				
+										   x:Uid="powerOfEButton"
+										   Grid.Column="1"
+										   Style="{StaticResource SymbolOperatorButtonStyle}"
+										   AutomationProperties.AutomationId="powerOfEButton"
+										   ButtonId="EPowerX"
+										   Content="&#xf7ce;" />
+
 				<controls:CalculatorButton x:Name="logBaseEButton"
-																	 x:Uid="logBaseEButton"
-																	 Grid.Column="2"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="logBaseEButton"
-																	 ButtonId="LogBaseE"
-																	 Content="ln" />
-				
+										   x:Uid="logBaseEButton"
+										   Grid.Column="2"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="logBaseEButton"
+										   ButtonId="LogBaseE"
+										   Content="ln" />
+
 				<controls:CalculatorButton x:Name="dmsButton"
-																	 x:Uid="dmsButton"
-																	 Grid.Column="3"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="dmsButton"
-																	 ButtonId="DMS"
-																	 Content="dms" />
-				
+										   x:Uid="dmsButton"
+										   Grid.Column="3"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="dmsButton"
+										   ButtonId="DMS"
+										   Content="dms" />
+
 				<controls:CalculatorButton x:Name="degreesButton"
-																	 x:Uid="degreesButton"
-																	 Grid.Column="4"
-																	 Style="{StaticResource OperatorButtonStyle}"
-																	 AutomationProperties.AutomationId="degreesButton"
-																	 ButtonId="Degrees"
-																	 Content="deg" />
+										   x:Uid="degreesButton"
+										   Grid.Column="4"
+										   Style="{StaticResource OperatorButtonStyle}"
+										   AutomationProperties.AutomationId="degreesButton"
+										   ButtonId="Degrees"
+										   Content="deg" />
 			</Grid>
 		</Grid>
 
 		<ToggleButton x:Name="shiftButton"
-									x:Uid="shiftButton"
-									Grid.Row="4"
-									Grid.Column="5"
-									Style="{StaticResource CaptionToggleButtonStyle}"
-									FontFamily="{StaticResource CalculatorFontFamily}"
-									FontSize="20"
-									AutomationProperties.AutomationId="shiftButton"
-									Checked="shiftButton_Check"
-									Content="&#xE752;"
-									IsEnabled="{x:Bind IsShiftEnabled(IsWideLayout, IsErrorVisualState), Mode=OneWay}"
-									IsEnabledChanged="shiftButton_IsEnabledChanged"
-									Unchecked="shiftButton_Check" />
+					  x:Uid="shiftButton"
+					  Grid.Row="4"
+					  Grid.Column="5"
+					  Style="{StaticResource CaptionToggleButtonStyle}"
+					  FontFamily="{StaticResource CalculatorFontFamily}"
+					  FontSize="20"
+					  AutomationProperties.AutomationId="shiftButton"
+					  Checked="shiftButton_Check"
+					  Content="&#xE752;"
+					  IsEnabled="{x:Bind IsShiftEnabled(IsWideLayout, IsErrorVisualState), Mode=OneWay}"
+					  IsEnabledChanged="shiftButton_IsEnabledChanged"
+					  Unchecked="shiftButton_Check" />
 
 		<Grid x:Name="StandardOperators"
-					x:Uid="StandardOperators"
-					Grid.Row="4"
-					Grid.RowSpan="5"
-					Grid.Column="9"
-					AutomationProperties.HeadingLevel="Level1">
-			
+			  x:Uid="StandardOperators"
+			  Grid.Row="4"
+			  Grid.RowSpan="5"
+			  Grid.Column="9"
+			  AutomationProperties.HeadingLevel="Level1">
+
 			<Grid.RowDefinitions>
 				<RowDefinition />
 				<RowDefinition />
@@ -891,149 +891,150 @@
 				<RowDefinition />
 				<RowDefinition />
 			</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="4"
-					Grid.Column="6"
-					Grid.ColumnSpan="3"
-					AutomationProperties.HeadingLevel="Level1">
-			
+			  x:Uid="DisplayControls"
+			  Grid.Row="4"
+			  Grid.Column="6"
+			  Grid.ColumnSpan="3"
+			  AutomationProperties.HeadingLevel="Level1">
+
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition />
 				<ColumnDefinition />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			
+
 			<controls:CalculatorButton x:Name="clearEntryButton"
-																 x:Uid="clearEntryButton"
-																 Style="{StaticResource OperatorButtonStyle}"
-																 FontSize="16"
-																 AutomationProperties.AutomationId="clearEntryButton"
-																 ButtonId="ClearEntry"
-																 Content="CE" />
-			
+									   x:Uid="clearEntryButton"
+									   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}"
-																 FontFamily="{StaticResource CalculatorFontFamily}"
-																 FontSize="16"
-																 AutomationProperties.AutomationId="backSpaceButton"
-																 ButtonId="Backspace"
-																 Content="&#xE94F;" />
+									   x:Uid="backSpaceButton"
+									   Grid.Column="2"
+									   Style="{StaticResource SymbolOperatorButtonStyle}"
+									   FontFamily="{StaticResource CalculatorFontFamily}"
+									   FontSize="16"
+									   AutomationProperties.AutomationId="backSpaceButton"
+									   ButtonId="Backspace"
+									   Content="&#xE94F;" />
 		</Grid>
 
 		<controls:CalculatorButton x:Name="piButton"
-															 x:Uid="piButton"
-															 Grid.Row="5"
-															 Grid.Column="5"
-															 Style="{StaticResource SymbolOperatorButtonStyle}"
-															 FontSize="14"
-															 AutomationProperties.AutomationId="piButton"
-															 ButtonId="Pi"
-															 Content="&#xf7cf;" />
-		
+								   x:Uid="piButton"
+								   Grid.Row="5"
+								   Grid.Column="5"
+								   Style="{StaticResource SymbolOperatorButtonStyle}"
+								   FontSize="14"
+								   AutomationProperties.AutomationId="piButton"
+								   ButtonId="Pi"
+								   Content="&#xf7cf;" />
+
 		<controls:CalculatorButton x:Name="factorialButton"
-															 x:Uid="factorialButton"
-															 Grid.Row="6"
-															 Grid.Column="5"
-															 Style="{StaticResource OperatorButtonStyle}"
-															 FontSize="18"
-															 AutomationProperties.AutomationId="factorialButton"
-															 ButtonId="Factorial"
-															 Content="n!" />
-		
+								   x:Uid="factorialButton"
+								   Grid.Row="6"
+								   Grid.Column="5"
+								   Style="{StaticResource OperatorButtonStyle}"
+								   FontSize="18"
+								   AutomationProperties.AutomationId="factorialButton"
+								   ButtonId="Factorial"
+								   Content="n!" />
+
 		<controls:CalculatorButton x:Name="negateButton"
-															 x:Uid="negateButton"
-															 Grid.Row="7"
-															 Grid.Column="5"
-															 Style="{StaticResource SymbolOperatorButtonStyle}"
-															 FontSize="16"
-															 AutomationProperties.AutomationId="negateButton"
-															 ButtonId="Negate"
-															 Content="&#xE94D;"
-															 IsEnabled="{x:Bind Model.IsNegateEnabled, Mode=OneWay}" />
-		
+								   x:Uid="negateButton"
+								   Grid.Row="7"
+								   Grid.Column="5"
+								   Style="{StaticResource SymbolOperatorButtonStyle}"
+								   FontSize="16"
+								   AutomationProperties.AutomationId="negateButton"
+								   ButtonId="Negate"
+								   Content="&#xE94D;"
+								   IsEnabled="{x:Bind Model.IsNegateEnabled, Mode=OneWay}" />
+
 		<controls:CalculatorButton x:Name="openParenthesisButton"
-															 x:Uid="openParenthesisButton"
-															 Grid.Row="8"
-															 Grid.Column="5"
-															 Style="{StaticResource ParenthesisCalcButtonStyle}"
-															 FontSize="19"
-															 AutomationProperties.AutomationId="openParenthesisButton"
-															 AutomationProperties.Name="{Binding LeftParenthesisAutomationName}"
-															 ButtonId="OpenParenthesis"
-															 Content="("
-															 Tag="{x:Bind Model.OpenParenthesisCount, Mode=OneWay}" />
-		
+								   x:Uid="openParenthesisButton"
+								   Grid.Row="8"
+								   Grid.Column="5"
+								   Style="{StaticResource ParenthesisCalcButtonStyle}"
+								   FontSize="19"
+								   AutomationProperties.AutomationId="openParenthesisButton"
+								   AutomationProperties.Name="{Binding LeftParenthesisAutomationName}"
+								   ButtonId="OpenParenthesis"
+								   Content="("
+								   Tag="{x:Bind Model.OpenParenthesisCount, Mode=OneWay}" />
+
 		<controls:CalculatorButton x:Name="closeParenthesisButton"
-															 x:Uid="closeParenthesisButton"
-															 Grid.Row="8"
-															 Grid.Column="6"
-															 Style="{StaticResource OperatorButtonStyle}"
-															 FontSize="19"
-															 AutomationProperties.AutomationId="closeParenthesisButton"
-															 ButtonId="CloseParenthesis"
-															 Content=")" />
+								   x:Uid="closeParenthesisButton"
+								   Grid.Row="8"
+								   Grid.Column="6"
+								   Style="{StaticResource OperatorButtonStyle}"
+								   FontSize="19"
+								   AutomationProperties.AutomationId="closeParenthesisButton"
+								   ButtonId="CloseParenthesis"
+								   Content=")" />
 
 		<local:NumberPad x:Name="NumberPad"
-										 x:Uid="NumberPad"
-										 Grid.Row="5"
-										 Grid.RowSpan="4"
-										 Grid.Column="6"
-										 Grid.ColumnSpan="3"
-										 AutomationProperties.HeadingLevel="Level1"
-										 ButtonStyle="{StaticResource NumericButtonStyle24}" />
+						 x:Uid="NumberPad"
+						 Grid.Row="5"
+						 Grid.RowSpan="4"
+						 Grid.Column="6"
+						 Grid.ColumnSpan="3"
+						 AutomationProperties.HeadingLevel="Level1"
+						 ButtonStyle="{StaticResource NumericButtonStyle24}"
+						 DecimalButtonStyle="{StaticResource DecimalButtonStyle}" />
 	</Grid>
 </UserControl>
diff --git a/src/Calculator.Shared/Views/CalculatorStandardOperators.xaml b/src/Calculator.Shared/Views/CalculatorStandardOperators.xaml
index 14627134..32ed5b36 100644
--- a/src/Calculator.Shared/Views/CalculatorStandardOperators.xaml
+++ b/src/Calculator.Shared/Views/CalculatorStandardOperators.xaml
@@ -605,7 +605,8 @@
 						 Grid.Column="2"
 						 Grid.ColumnSpan="3"
 						 AutomationProperties.HeadingLevel="Level1"
-						 ButtonStyle="{StaticResource NumericButtonStyle24}" />
+						 ButtonStyle="{StaticResource NumericButtonStyle24}"
+						 DecimalButtonStyle="{StaticResource DecimalButtonStyle}" />
 
 		<controls:CalculatorButton x:Name="negateButton"
 								   x:Uid="negateButton"
diff --git a/src/Calculator.Shared/Views/NumberPad.xaml b/src/Calculator.Shared/Views/NumberPad.xaml
index 72d45a48..8ba73f20 100644
--- a/src/Calculator.Shared/Views/NumberPad.xaml
+++ b/src/Calculator.Shared/Views/NumberPad.xaml
@@ -118,10 +118,9 @@
         -->
 		<controls:CalculatorButton x:Name="decimalSeparatorButton"
 								   x:Uid="decimalSeparatorButton"
-								   Grid.Row="4"
+								   Grid.Row="3"
 								   Grid.Column="2"
-								   Style="{Binding ElementName=ControlRoot, Path=ButtonStyle}"
-								   Background="{ThemeResource AppBackgroundAltMediumLowBrush}"
+								   Style="{x:Bind Path=DecimalButtonStyle, Mode=OneWay}"
 								   AutomationProperties.AutomationId="decimalSeparatorButton"
 								   ButtonId="Decimal"
 								   IsEnabled="{Binding IsDecimalEnabled}" />
diff --git a/src/Calculator.Shared/Views/NumberPad.xaml.cs b/src/Calculator.Shared/Views/NumberPad.xaml.cs
index 6caf3fe5..d02d1fad 100644
--- a/src/Calculator.Shared/Views/NumberPad.xaml.cs
+++ b/src/Calculator.Shared/Views/NumberPad.xaml.cs
@@ -22,7 +22,8 @@ namespace CalculatorApp
 {
 	public sealed partial class NumberPad : UserControl
 	{
-        public Style ButtonStyle
+		#region ButtonStyle
+		public Style ButtonStyle
         {
             get { return (Style)GetValue(ButtonStyleProperty); }
             set { SetValue(ButtonStyleProperty, value); }
@@ -30,8 +31,21 @@ namespace CalculatorApp
 
         // Using a DependencyProperty as the backing store for ButtonStyle.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty ButtonStyleProperty =
-            DependencyProperty.Register("ButtonStyle", typeof(Style), typeof(NumberPad), new PropertyMetadata(null));
-        private bool m_isErrorVisualState;
+            DependencyProperty.Register(nameof(ButtonStyle), typeof(Style), typeof(NumberPad), new PropertyMetadata(null));
+		#endregion
+
+		#region DecimalButtonStyle
+		public Style DecimalButtonStyle
+		{
+			get { return (Style)GetValue(DecimalButtonStyleProperty); }
+			set { SetValue(DecimalButtonStyleProperty, value); }
+		}
+
+		public static readonly DependencyProperty DecimalButtonStyleProperty =
+			DependencyProperty.Register(nameof(DecimalButtonStyle), typeof(Style), typeof(NumberPad), new PropertyMetadata(null));
+		#endregion
+
+		private bool m_isErrorVisualState;
 
         public NumberPad()
 		{
diff --git a/src/Calculator.Shared/Views/UnitConverter.xaml b/src/Calculator.Shared/Views/UnitConverter.xaml
index 96a95b6b..0a6b36b9 100644
--- a/src/Calculator.Shared/Views/UnitConverter.xaml
+++ b/src/Calculator.Shared/Views/UnitConverter.xaml
@@ -849,16 +849,17 @@
 			</Grid>
 
 			<local:NumberPad x:Name="NumberPad"
-							 x:Uid="NumberPad"
-							 Grid.Row="2"
-							 Grid.RowSpan="4"
-							 Grid.Column="1"
-							 Grid.ColumnSpan="3"
-							 VerticalAlignment="Stretch"
-							 AutomationProperties.HeadingLevel="Level1"
-							 ButtonStyle="{StaticResource NumericButtonStyle24}"
-							 TabIndex="10"
-							 TabNavigation="Local" />
+                             x:Uid="NumberPad"
+                             Grid.Row="2"
+                             Grid.RowSpan="4"
+                             Grid.Column="1"
+                             Grid.ColumnSpan="3"
+                             VerticalAlignment="Stretch"
+                             AutomationProperties.HeadingLevel="Level1"
+                             ButtonStyle="{StaticResource NumericButtonStyle24}"
+							 DecimalButtonStyle="{StaticResource DecimalButtonStyle}"
+                             TabIndex="10"
+                             TabNavigation="Local"/>
 			<controls:CalculatorButton x:Name="ConverterNegateButton"
 									   x:Uid="converterNegateButton"
 									   Grid.Row="5"