diff --git a/src/Calculator.Shared/Styles.xaml b/src/Calculator.Shared/Styles.xaml
index fecbd691..8d6d41ed 100644
--- a/src/Calculator.Shared/Styles.xaml
+++ b/src/Calculator.Shared/Styles.xaml
@@ -13,13 +13,13 @@
xmlns:local="using:CalculatorApp"
mc:Ignorable="xamarin android ios wasm">
-
-
-
+
-
-
-
- 0,0,0,0
-
+
+ 0,0,0,0
-
- 0
-
+ 0
#FFF2F2F2
#FFE0E0E0
+ #FFB0DCFF
+
+ #FF0077D7
+
+
+
+
+
+
+
+
+
+ Color="{StaticResource AltHighColor}" />
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -229,46 +241,45 @@
-
+
-
+
-
+
-
+
+
+
+
+
-
+
-
-
-
+
-
-
+ Color="{ThemeResource SystemColorWindowColor}" />
-
- 500
- 320
+
+ 500
+ 320
ms-appx:///Assets/CalcMDL2.ttf#Calculator MDL2 Assets
@@ -277,336 +288,336 @@
Calculator MDL2 Assets
256
- 0,1,0,0
- 15
- SemiBold
+ 0,1,0,0
+ 15
+ SemiBold
- 12
- 15
- 24
+ 12
+ 15
+ 24
-
- 40
- 40
+
+ 40
+ 40
- 34
- 24
-
- 20
-
- 15
+ 34
+ 24
+
+ 20
+
+ 15
- 72
- 46
- 28
+ 72
+ 46
+ 28
-
-
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Calculator.Shared/Views/CalculatorProgrammerOperators.xaml b/src/Calculator.Shared/Views/CalculatorProgrammerOperators.xaml
index e24349de..c194bf2a 100644
--- a/src/Calculator.Shared/Views/CalculatorProgrammerOperators.xaml
+++ b/src/Calculator.Shared/Views/CalculatorProgrammerOperators.xaml
@@ -1,50 +1,50 @@
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:common="using:CalculatorApp.Common"
+ xmlns:controls="using:CalculatorApp.Controls"
+ xmlns:designdata="using:CalculatorApp.DesignData"
+ xmlns:local="using:CalculatorApp.Views"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ x:Name="ControlRoot"
+ mc:Ignorable="">
-
-
-
-
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
+ x:Uid="copyButton"
+ Command="{x:Bind Model.CopyCommand}" />
+ x:Uid="pasteButton"
+ Command="{x:Bind Model.PasteCommand}" />
+ x:Uid="copyButtonAlternate"
+ Command="{x:Bind Model.CopyCommand}" />
+ x:Uid="pasteButtonAlternate"
+ Command="{x:Bind Model.PasteCommand}" />
@@ -149,36 +150,37 @@
UseSystemFocusVisuals="True">
-
-
-
+
+
+
-
+ Width="{x:Bind NavView.OpenPaneLength, Mode=Oneway}"
+ x:Load="False"
+ IsItemClickEnabled="True"
+ ItemClick="OnAboutButtonClick">
+
-
+
+ x:Uid="AboutButton"
+ Style="{StaticResource NavViewItemStyle}">
-
+
-
-
+ x:Uid="AboutPageFlyout"
+ Closed="OnAboutFlyoutClosed"
+ FlyoutPresenterStyle="{StaticResource AboutFlyoutPresenterStyle}"
+ Opened="OnAboutFlyoutOpened">
+
+
@@ -188,23 +190,23 @@
-
+
-
+ Margin="52,6,12,0"
+ HorizontalAlignment="Left"
+ VerticalAlignment="Top"
+ Style="{StaticResource SubtitleTextBlockStyle}"
+ Text="{x:Bind Model.CategoryName, Mode=OneWay}" />
+
-
+
-
+