diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 1ef22a72..ce1e68c9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -27,14 +27,15 @@ assignees: ''
 <!--If applicable, add screenshots to help explain your problem.-->
 
 **Device and Application Information (please complete the following information):**
- - OS Build Number:
+ - OS Build:
  - Architecture:
- - Application Version Number:
+ - Application Version:
 
- <!--Run the following commands in Powershell and copy/paste the output.
- - OS Build: "$([Environment]::OSVersion.Version)"
- - Architecture: "$((Get-AppxPackage -Name Microsoft.WindowsCalculator).Architecture)"
- - Application Version: "$((Get-AppxPackage -Name Microsoft.WindowsCalculator).Version)"-->
+<!--Run the following commands in Powershell and copy/paste the output.
+" - OS Build: $([Environment]::OSVersion.Version)"
+" - Architecture: $((Get-AppxPackage -Name Microsoft.WindowsCalculator).Architecture)"
+" - Application Version: $((Get-AppxPackage -Name Microsoft.WindowsCalculator).Version)"
+-->
 
 **Additional context**
 <!--Add any other context about the problem here.-->
diff --git a/build/pipelines/azure-pipelines.ci.yaml b/build/pipelines/azure-pipelines.ci.yaml
index f8c70188..31ce98fb 100644
--- a/build/pipelines/azure-pipelines.ci.yaml
+++ b/build/pipelines/azure-pipelines.ci.yaml
@@ -11,7 +11,7 @@ pr:
 - master
 - servicing/*
 
-name: 0.$(Date:yyMM).$(Date:dd)$(Rev:rr).0
+name: 0.$(Date:yyMM).$(DayOfMonth)$(Rev:rr).0
 
 jobs:
 - template: ./templates/build-app-public.yaml
@@ -36,9 +36,15 @@ jobs:
 - template: ./templates/run-unit-tests.yaml
   parameters:
     platform: x64
+    reimageServiceConnection: essential-experiences-interactive-reimage
+    reimageSubscriptionId: a8f5eb47-e59c-44b4-8e42-e70811a047b5
+    reimageResourceGroup: EETestPublic
 
 - template: ./templates/run-unit-tests.yaml
   parameters:
     platform: x86
+    reimageServiceConnection: essential-experiences-interactive-reimage
+    reimageSubscriptionId: a8f5eb47-e59c-44b4-8e42-e70811a047b5
+    reimageResourceGroup: EETestPublic
 
 - template: ./templates/package-appxbundle.yaml
diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml
index 59cd41c3..78b4fd90 100644
--- a/build/pipelines/azure-pipelines.release.yaml
+++ b/build/pipelines/azure-pipelines.release.yaml
@@ -38,10 +38,16 @@ jobs:
 - template: ./templates/run-unit-tests.yaml
   parameters:
     platform: x64
+    reimageServiceConnection: macool-sandbox-interactiveDesktopRS5
+    reimageSubscriptionId: 012a8008-c00f-45b3-9828-41ebba30141d
+    reimageResourceGroup: interactiveDesktopRS5
 
 - template: ./templates/run-unit-tests.yaml
   parameters:
     platform: x86
+    reimageServiceConnection: macool-sandbox-interactiveDesktopRS5
+    reimageSubscriptionId: 012a8008-c00f-45b3-9828-41ebba30141d
+    reimageResourceGroup: interactiveDesktopRS5
 
 - template: ./templates/package-appxbundle.yaml
 
diff --git a/build/pipelines/templates/run-unit-tests.yaml b/build/pipelines/templates/run-unit-tests.yaml
index 708b30b1..6123609e 100644
--- a/build/pipelines/templates/run-unit-tests.yaml
+++ b/build/pipelines/templates/run-unit-tests.yaml
@@ -2,6 +2,9 @@
 
 parameters:
   platform: ''
+  reimageServiceConnection: ''
+  reimageSubscriptionId: ''
+  reimageResourceGroup: ''
 
 jobs:
 - job: UnitTests${{ parameters.platform }}
@@ -49,6 +52,6 @@ jobs:
     displayName: Reimage test machine
     inputs:
       connectionType: connectedServiceNameARM
-      azureServiceConnection: macool-sandbox-interactiveDesktopRS5
-      urlSuffix: subscriptions/012a8008-c00f-45b3-9828-41ebba30141d/resourceGroups/interactiveDesktopRS5/providers/Microsoft.Compute/virtualMachineScaleSets/essential/reimage?api-version=2018-10-01
+      azureServiceConnection: ${{ parameters.reimageServiceConnection }}
+      urlSuffix: subscriptions/${{ parameters.reimageSubscriptionId }}/resourceGroups/${{ parameters.reimageResourceGroup }}/providers/Microsoft.Compute/virtualMachineScaleSets/essential/reimage?api-version=2018-10-01
       body: '{ "instanceIds": ["$(agentInstanceId)"] }'
\ No newline at end of file
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp
index 78ad7dd2..c8b87071 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.cpp
+++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp
@@ -69,7 +69,7 @@ StandardCalculatorViewModel::StandardCalculatorViewModel() :
     m_HexDisplayValue(L"0"),
     m_BinaryDisplayValue(L"0"),
     m_OctalDisplayValue(L"0"),
-    m_standardCalculatorManager(make_unique<CalculatorManager>(&m_calculatorDisplay, &m_resourceProvider)),
+    m_standardCalculatorManager(&m_calculatorDisplay, &m_resourceProvider),
     m_MemorizedNumbers(ref new Vector<MemoryItemViewModel^>()),
     m_IsMemoryEmpty(true),
     m_IsFToEChecked(false),
@@ -110,7 +110,7 @@ StandardCalculatorViewModel::StandardCalculatorViewModel() :
     CalculationExpressionAutomationName = GetLocalizedStringFormat(m_expressionAutomationNameFormat, L"");
 
     // Initialize history view model
-    m_HistoryVM = ref new HistoryViewModel(m_standardCalculatorManager.get());
+    m_HistoryVM = ref new HistoryViewModel(&m_standardCalculatorManager);
     m_HistoryVM->SetCalculatorDisplay(m_calculatorDisplay);
 
     m_decimalSeparator = LocalizationSettings::GetInstance().GetDecimalSeparator();
@@ -215,7 +215,7 @@ void StandardCalculatorViewModel::SetPrimaryDisplay(_In_ wstring const &displayS
 
 void StandardCalculatorViewModel::DisplayPasteError()
 {
-    m_standardCalculatorManager->DisplayPasteError();
+    m_standardCalculatorManager.DisplayPasteError();
 }
 
 void StandardCalculatorViewModel::SetParenthesisCount(_In_ const wstring& parenthesisCount)
@@ -285,9 +285,9 @@ void StandardCalculatorViewModel::SetHistoryExpressionDisplay(_Inout_ shared_ptr
     IsEditingEnabled = false;
 
     // Setting the History Item Load Mode so that UI does not get updated with recalculation of every token
-    m_standardCalculatorManager->SetInHistoryItemLoadMode(true);
+    m_standardCalculatorManager.SetInHistoryItemLoadMode(true);
     Recalculate(true);
-    m_standardCalculatorManager->SetInHistoryItemLoadMode(false);
+    m_standardCalculatorManager.SetInHistoryItemLoadMode(false);
     m_isLastOperationHistoryLoad = true;
 }
 
@@ -573,7 +573,7 @@ void StandardCalculatorViewModel::OnButtonPressed(Object^ parameter)
 
     if (IsInError)
     {
-        m_standardCalculatorManager->SendCommand(Command::CommandCLEAR);
+        m_standardCalculatorManager.SendCommand(Command::CommandCLEAR);
         
         if (!IsRecoverableCommand((int)numOpEnum))
         {
@@ -643,7 +643,7 @@ void StandardCalculatorViewModel::OnButtonPressed(Object^ parameter)
                 m_isLastOperationHistoryLoad = false;
             }
 
-            m_standardCalculatorManager->SendCommand(cmdenum);
+            m_standardCalculatorManager.SendCommand(cmdenum);
         }
     }
 }
@@ -746,7 +746,7 @@ void StandardCalculatorViewModel::OnPaste(String^ pastedString, ViewMode mode)
 
     TraceLogger::GetInstance().LogValidInputPasted(mode);
     bool isFirstLegalChar = true;
-    m_standardCalculatorManager->SendCommand(Command::CommandCENTR);
+    m_standardCalculatorManager.SendCommand(Command::CommandCENTR);
     bool sendNegate = false;
     bool processedExp = false;
     bool processedDigit = false;
@@ -836,7 +836,7 @@ void StandardCalculatorViewModel::OnPaste(String^ pastedString, ViewMode mode)
             {
                 sentEquals = (mappedNumOp == NumbersAndOperatorsEnum::Equals);
                 Command cmdenum = ConvertToOperatorsEnum(mappedNumOp);
-                m_standardCalculatorManager->SendCommand(cmdenum);
+                m_standardCalculatorManager.SendCommand(cmdenum);
 
                 // The CalcEngine state machine won't allow the negate command to be sent before any 
                 // other digits, so instead a flag is set and the command is sent after the first appropriate 
@@ -846,7 +846,7 @@ void StandardCalculatorViewModel::OnPaste(String^ pastedString, ViewMode mode)
                     if (canSendNegate)
                     {
                         Command cmdNegate = ConvertToOperatorsEnum(NumbersAndOperatorsEnum::Negate);
-                        m_standardCalculatorManager->SendCommand(cmdNegate);
+                        m_standardCalculatorManager.SendCommand(cmdNegate);
                     }
 
                     // Can't send negate on a leading zero, so wait until the appropriate time to send it.
@@ -865,7 +865,7 @@ void StandardCalculatorViewModel::OnPaste(String^ pastedString, ViewMode mode)
             if (!(MapCharacterToButtonId(*it, canSendNegate) == NumbersAndOperatorsEnum::Add))
             {
                 Command cmdNegate = ConvertToOperatorsEnum(NumbersAndOperatorsEnum::Negate);
-                m_standardCalculatorManager->SendCommand(cmdNegate);
+                m_standardCalculatorManager.SendCommand(cmdNegate);
             }
         }
 
@@ -876,7 +876,7 @@ void StandardCalculatorViewModel::OnPaste(String^ pastedString, ViewMode mode)
 void StandardCalculatorViewModel::OnClearMemoryCommand(
     Object^ parameter)
 {
-    m_standardCalculatorManager->MemorizedNumberClearAll();
+    m_standardCalculatorManager.MemorizedNumberClearAll();
 
     int windowId = Utils::GetWindowId();
     TraceLogger::GetInstance().LogMemoryClearAll(windowId);
@@ -1013,7 +1013,7 @@ NumbersAndOperatorsEnum StandardCalculatorViewModel::MapCharacterToButtonId(
 
 void StandardCalculatorViewModel::OnMemoryButtonPressed()
 {
-    m_standardCalculatorManager->MemorizeNumber();
+    m_standardCalculatorManager.MemorizeNumber();
 
     int windowId = Utils::GetWindowId();
     TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsStandard, IsScientific, IsProgrammer);
@@ -1051,7 +1051,7 @@ void StandardCalculatorViewModel::OnMemoryItemPressed(Object^ memoryItemPosition
     if (MemorizedNumbers && MemorizedNumbers->Size > 0)
     {
         auto boxedPosition = safe_cast<Box<int>^>(memoryItemPosition);
-        m_standardCalculatorManager->MemorizedNumberLoad(boxedPosition->Value);
+        m_standardCalculatorManager.MemorizedNumberLoad(boxedPosition->Value);
         HideMemoryClicked();
         int windowId = Utils::GetWindowId();
         TraceLogger::GetInstance().LogMemoryUsed(windowId, boxedPosition->Value, IsStandard, IsScientific, IsProgrammer, MemorizedNumbers->Size);
@@ -1075,7 +1075,7 @@ void StandardCalculatorViewModel::OnMemoryAdd(Object^ memoryItemPosition)
         {
             TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsStandard, IsScientific, IsProgrammer);
         }
-        m_standardCalculatorManager->MemorizedNumberAdd(boxedPosition->Value);
+        m_standardCalculatorManager.MemorizedNumberAdd(boxedPosition->Value);
     }
 }
 
@@ -1096,7 +1096,7 @@ void StandardCalculatorViewModel::OnMemorySubtract(Object^ memoryItemPosition)
         {
             TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsStandard, IsScientific, IsProgrammer);
         }
-        m_standardCalculatorManager->MemorizedNumberSubtract(boxedPosition->Value);
+        m_standardCalculatorManager.MemorizedNumberSubtract(boxedPosition->Value);
     }
 }
 
@@ -1110,7 +1110,7 @@ void StandardCalculatorViewModel::OnMemoryClear(_In_ Object^ memoryItemPosition)
         if (boxedPosition->Value >= 0)
         {
             unsigned int unsignedPosition = safe_cast<unsigned int>(boxedPosition->Value);
-            m_standardCalculatorManager->MemorizedNumberClear(unsignedPosition);
+            m_standardCalculatorManager.MemorizedNumberClear(unsignedPosition);
 
             MemorizedNumbers->RemoveAt(unsignedPosition);
             for (unsigned int i = 0; i < MemorizedNumbers->Size; i++)
@@ -1145,11 +1145,11 @@ Array<unsigned char>^ StandardCalculatorViewModel::Serialize()
     writer->WriteUInt32(static_cast<UINT32>(m_CurrentAngleType));
     writer->WriteBoolean(IsFToEChecked);
     writer->WriteBoolean(IsCurrentViewPinned);
-    writer->WriteUInt32(static_cast<UINT32>(m_standardCalculatorManager->SerializeSavedDegreeMode()));
+    writer->WriteUInt32(static_cast<UINT32>(m_standardCalculatorManager.SerializeSavedDegreeMode()));
 
     // Serialize Memory
     vector<long> serializedMemory;
-    serializedMemory = m_standardCalculatorManager->GetSerializedMemory();
+    serializedMemory = m_standardCalculatorManager.GetSerializedMemory();
     size_t lengthOfSerializedMemory = serializedMemory.size();
     writer->WriteUInt32(static_cast<UINT32>(lengthOfSerializedMemory));
     for (auto data : serializedMemory)
@@ -1158,7 +1158,7 @@ Array<unsigned char>^ StandardCalculatorViewModel::Serialize()
     }
 
     // Serialize Primary Display
-    vector<long> serializedPrimaryDisplay = m_standardCalculatorManager->GetSerializedPrimaryDisplay();
+    vector<long> serializedPrimaryDisplay = m_standardCalculatorManager.GetSerializedPrimaryDisplay();
     writer->WriteUInt32(static_cast<UINT32>(serializedPrimaryDisplay.size()));
     for (auto data : serializedPrimaryDisplay)
     {
@@ -1169,7 +1169,7 @@ Array<unsigned char>^ StandardCalculatorViewModel::Serialize()
     writer->WriteUInt32(static_cast<UINT32>(CurrentRadixType));
 
     //Serialize commands of calculator manager
-    vector<unsigned char> serializedCommand = m_standardCalculatorManager->SerializeCommands();
+    vector<unsigned char> serializedCommand = m_standardCalculatorManager.SerializeCommands();
     writer->WriteUInt32(static_cast<UINT32>(serializedCommand.size()));
     writer->WriteBytes(ref new Array<unsigned char>(serializedCommand.data(), static_cast<unsigned int>(serializedCommand.size())));
 
@@ -1205,7 +1205,7 @@ void StandardCalculatorViewModel::Deserialize(Array<unsigned char>^ state)
         IsCurrentViewPinned = reader->ReadBoolean();
         Command serializedDegreeMode = static_cast<Command>(reader->ReadUInt32());
 
-        m_standardCalculatorManager->SendCommand(serializedDegreeMode);
+        m_standardCalculatorManager.SendCommand(serializedDegreeMode);
 
         // Deserialize Memory
         UINT32 memoryDataLength = reader->ReadUInt32();
@@ -1214,7 +1214,7 @@ void StandardCalculatorViewModel::Deserialize(Array<unsigned char>^ state)
         {
             serializedMemory.push_back(reader->ReadInt32());
         }
-        m_standardCalculatorManager->DeSerializeMemory(serializedMemory);
+        m_standardCalculatorManager.DeSerializeMemory(serializedMemory);
 
         // Serialize Primary Display
         UINT32 serializedPrimaryDisplayLength = reader->ReadUInt32();
@@ -1223,14 +1223,14 @@ void StandardCalculatorViewModel::Deserialize(Array<unsigned char>^ state)
         {
             serializedPrimaryDisplay.push_back(reader->ReadInt32());
         }
-        m_standardCalculatorManager->DeSerializePrimaryDisplay(serializedPrimaryDisplay);
+        m_standardCalculatorManager.DeSerializePrimaryDisplay(serializedPrimaryDisplay);
 
         CurrentRadixType = reader->ReadUInt32();
         //Read command data and Deserialize
         UINT32 modeldatalength = reader->ReadUInt32();
         Array<unsigned char>^ modelDataAsBytes = ref new Array<unsigned char>(modeldatalength);
         reader->ReadBytes(modelDataAsBytes);
-        m_standardCalculatorManager->DeSerializeCommands(vector<unsigned char>(modelDataAsBytes->begin(), modelDataAsBytes->end()));
+        m_standardCalculatorManager.DeSerializeCommands(vector<unsigned char>(modelDataAsBytes->begin(), modelDataAsBytes->end()));
 
         // After recalculation. If there is an error then
         // IsInError should be set synchronously.
@@ -1326,31 +1326,31 @@ void StandardCalculatorViewModel::ResetDisplay()
 {
     AreHEXButtonsEnabled = false;
     CurrentRadixType = (int)RADIX_TYPE::DEC_RADIX;
-    m_standardCalculatorManager->SetRadix(DEC_RADIX);
+    m_standardCalculatorManager.SetRadix(DEC_RADIX);
     ProgModeRadixChange();
 }
 
 void StandardCalculatorViewModel::SetPrecision(int32_t precision)
 {
-    m_standardCalculatorManager->SetPrecision(precision);
+    m_standardCalculatorManager.SetPrecision(precision);
 }
 
 void StandardCalculatorViewModel::SwitchProgrammerModeBase(RADIX_TYPE radixType)
 {
     if (IsInError)
     {
-        m_standardCalculatorManager->SendCommand(Command::CommandCLEAR);
+        m_standardCalculatorManager.SendCommand(Command::CommandCLEAR);
     }
 
     AreHEXButtonsEnabled = (radixType == RADIX_TYPE::HEX_RADIX);
     CurrentRadixType = (int)radixType;
-    m_standardCalculatorManager->SetRadix(radixType);
+    m_standardCalculatorManager.SetRadix(radixType);
     ProgModeRadixChange();
 }
 
 void StandardCalculatorViewModel::SetMemorizedNumbersString()
 {
-    m_standardCalculatorManager->SetMemorizedNumbersString();
+    m_standardCalculatorManager.SetMemorizedNumbersString();
 }
 
 ANGLE_TYPE GetAngleTypeFromCommand(Command command)
@@ -1384,7 +1384,7 @@ void StandardCalculatorViewModel::SaveEditedCommand(_In_ unsigned int tokenPosit
 
     if (IsUnaryOp(nOpCode) && command != Command::CommandSIGN)
     {
-        int angleCmd = static_cast<int>(m_standardCalculatorManager->GetCurrentDegreeMode());
+        int angleCmd = static_cast<int>(m_standardCalculatorManager.GetCurrentDegreeMode());
         ANGLE_TYPE angleType = GetAngleTypeFromCommand(static_cast<Command>(angleCmd));
 
         if (IsTrigOp(nOpCode))
@@ -1452,7 +1452,7 @@ void StandardCalculatorViewModel::SaveEditedCommand(_In_ unsigned int tokenPosit
         {
             shared_ptr<IOpndCommand> spOpndCommand = dynamic_pointer_cast<IOpndCommand>(tokenCommand);
             spOpndCommand->ToggleSign();
-            updatedToken = spOpndCommand->GetToken(m_standardCalculatorManager->DecimalSeparator());
+            updatedToken = spOpndCommand->GetToken(m_standardCalculatorManager.DecimalSeparator());
         }
         IsOperandUpdatedUsingViewModel = true;
     }
@@ -1481,7 +1481,7 @@ void StandardCalculatorViewModel::SaveEditedCommand(_In_ unsigned int tokenPosit
 void StandardCalculatorViewModel::Recalculate(bool fromHistory)
 {
     // Recalculate
-    Command currentDegreeMode = m_standardCalculatorManager->GetCurrentDegreeMode();
+    Command currentDegreeMode = m_standardCalculatorManager.GetCurrentDegreeMode();
     shared_ptr <CalculatorVector<shared_ptr<IExpressionCommand>>> savedCommands = make_shared <CalculatorVector<shared_ptr<IExpressionCommand>>>();
 
     vector<int> currentCommands;
@@ -1556,29 +1556,29 @@ void StandardCalculatorViewModel::Recalculate(bool fromHistory)
         savedTokens->Append(currentToken);
     }
 
-    m_standardCalculatorManager->Reset(false);
+    m_standardCalculatorManager.Reset(false);
     if (IsScientific)
     {
-        m_standardCalculatorManager->SendCommand(Command::ModeScientific);
+        m_standardCalculatorManager.SendCommand(Command::ModeScientific);
     }
 
     if (IsFToEChecked)
     {
-        m_standardCalculatorManager->SendCommand(Command::CommandFE);
+        m_standardCalculatorManager.SendCommand(Command::CommandFE);
     }
 
-    m_standardCalculatorManager->SendCommand(currentDegreeMode);
+    m_standardCalculatorManager.SendCommand(currentDegreeMode);
     size_t currentCommandsSize = currentCommands.size();
     for (size_t i = 0; i < currentCommandsSize; i++)
     {
-        m_standardCalculatorManager->SendCommand(static_cast<CalculationManager::Command>(currentCommands[i]));
+        m_standardCalculatorManager.SendCommand(static_cast<CalculationManager::Command>(currentCommands[i]));
     }
 
     if (fromHistory)   // This is for the cases where the expression is loaded from history    
     {
         // To maintain F-E state of the engine, as the last operand hasn't reached engine by now
-        m_standardCalculatorManager->SendCommand(Command::CommandFE);
-        m_standardCalculatorManager->SendCommand(Command::CommandFE);
+        m_standardCalculatorManager.SendCommand(Command::CommandFE);
+        m_standardCalculatorManager.SendCommand(Command::CommandFE);
     }
 
     // After recalculation. If there is an error then
@@ -1785,7 +1785,7 @@ void StandardCalculatorViewModel::UpdateProgrammerPanelDisplay()
     {
         // we want the precision to be set to maximum value so that the autoconversions result as desired
         int32_t precision = 64;
-        if (m_standardCalculatorManager->GetResultForRadix(16, precision) == L"")
+        if (m_standardCalculatorManager.GetResultForRadix(16, precision) == L"")
         {
             hexDisplayString = DisplayValue->Data();
             decimalDisplayString = DisplayValue->Data();
@@ -1794,10 +1794,10 @@ void StandardCalculatorViewModel::UpdateProgrammerPanelDisplay()
         }
         else
         {
-            hexDisplayString = m_standardCalculatorManager->GetResultForRadix(16, precision);
-            decimalDisplayString = m_standardCalculatorManager->GetResultForRadix(10, precision);
-            octalDisplayString = m_standardCalculatorManager->GetResultForRadix(8, precision);
-            binaryDisplayString = m_standardCalculatorManager->GetResultForRadix(2, precision);
+            hexDisplayString = m_standardCalculatorManager.GetResultForRadix(16, precision);
+            decimalDisplayString = m_standardCalculatorManager.GetResultForRadix(10, precision);
+            octalDisplayString = m_standardCalculatorManager.GetResultForRadix(8, precision);
+            binaryDisplayString = m_standardCalculatorManager.GetResultForRadix(2, precision);
         }
     }
     const auto& localizer = LocalizationSettings::GetInstance();
@@ -1909,7 +1909,7 @@ void StandardCalculatorViewModel::UpdateOperand(int pos, String^ text)
 
 void  StandardCalculatorViewModel::UpdatecommandsInRecordingMode()
 {
-    vector<unsigned char> savedCommands = m_standardCalculatorManager->GetSavedCommands();
+    vector<unsigned char> savedCommands = m_standardCalculatorManager.GetSavedCommands();
     shared_ptr<CalculatorVector<int>> commands = make_shared<CalculatorVector<int>>();
     bool isDecimal = false;
     bool isNegative = false;
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.h b/src/CalcViewModel/StandardCalculatorViewModel.h
index 1a95a232..7fb311c5 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.h
+++ b/src/CalcViewModel/StandardCalculatorViewModel.h
@@ -214,7 +214,7 @@ namespace CalculatorApp
             }
 
             property bool IsEngineRecording {
-                bool get() { return m_standardCalculatorManager->IsEngineRecording(); }
+                bool get() { return m_standardCalculatorManager.IsEngineRecording(); }
             }
 
             property bool  IsOperandEnabled {
@@ -311,7 +311,7 @@ namespace CalculatorApp
             void ResetDisplay();
             RADIX_TYPE GetCurrentRadixType() { return (RADIX_TYPE)m_CurrentRadixType; }
             void SetPrecision(int32_t precision);
-            void UpdateMaxIntDigits() { m_standardCalculatorManager->UpdateMaxIntDigits(); }
+            void UpdateMaxIntDigits() { m_standardCalculatorManager.UpdateMaxIntDigits(); }
             NumbersAndOperatorsEnum GetCurrentAngleType() { return m_CurrentAngleType; }
 
         private:
@@ -323,7 +323,7 @@ namespace CalculatorApp
             wchar_t m_decimalSeparator;
             CalculatorDisplay m_calculatorDisplay;
             CalculatorApp::EngineResourceProvider m_resourceProvider;
-            std::unique_ptr<CalculationManager::CalculatorManager> m_standardCalculatorManager;
+            CalculationManager::CalculatorManager m_standardCalculatorManager;
             Platform::String^ m_expressionAutomationNameFormat;
             Platform::String^ m_localizedCalculationResultAutomationFormat;
             Platform::String^ m_localizedCalculationResultDecimalAutomationFormat;
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-100.png
index 47a1860c..6a3af461 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-100.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-125.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-125.png
index 790a8930..90c20773 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-125.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-125.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-150.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-150.png
index 5b407160..292c6db4 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-150.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-150.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-200.png
index 3be99668..3fe92534 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-200.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-400.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-400.png
index a91408ee..ec8143d9 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-400.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-400.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-16.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-16.png
index d58618da..dd7e068c 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-16.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-16.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-20.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-20.png
index ca584a3d..497fb90d 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-20.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-20.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-24.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-24.png
index 6f904255..89f78b6d 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-24.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-24.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-256.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-256.png
index 4c601517..fe20d448 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-256.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-256.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-30.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-30.png
index d1d10643..27060604 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-30.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-30.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-32.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-32.png
index 73e3d415..e4b2ecbb 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-32.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-32.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-36.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-36.png
index 1de3f6c6..c6599e87 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-36.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-36.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-40.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-40.png
index be55cd05..f963a7a1 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-40.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-40.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-48.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-48.png
index 02e793af..b801ca63 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-48.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-48.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-60.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-60.png
index 8ac9d445..63ffe785 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-60.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-60.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-64.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-64.png
index 6bd47b58..6261dd17 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-64.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-64.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-72.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-72.png
index 99f23797..6642f98f 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-72.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-72.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-80.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-80.png
index a12e46fe..11905219 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-80.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-80.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-96.png b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-96.png
index 3a587d80..bbe1ebc9 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-96.png and b/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-96.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-100.png
index cfad3bfd..c6f47b8e 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-100.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-125.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-125.png
index 3bd0b85b..5324dad9 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-125.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-125.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-150.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-150.png
index 05f1eb44..e218ef89 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-150.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-150.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-200.png
index e0632d7b..0f424423 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-200.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-400.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-400.png
index e43ac51c..ba6c8b48 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-400.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-400.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-16.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-16.png
index b33b1caf..c3a1da94 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-16.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-16.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-20.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-20.png
index dfe95170..a4b0d7a5 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-20.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-20.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-24.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-24.png
index 2d989296..ef4f1d2c 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-24.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-24.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-256.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-256.png
index b59d0f8e..fcd75a2b 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-256.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-256.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-30.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-30.png
index b623996c..5f8f8955 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-30.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-30.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-32.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-32.png
index f9cbcf8b..4f65a30b 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-32.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-32.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-36.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-36.png
index b16fa5b6..a43f92f8 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-36.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-36.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-40.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-40.png
index 432563f5..623e6594 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-40.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-40.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-48.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-48.png
index 95ec20f0..de3eb465 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-48.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-48.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-60.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-60.png
index d3608f1b..c987aef4 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-60.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-60.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-64.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-64.png
index afbb74ed..a1958c46 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-64.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-64.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-72.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-72.png
index e0ff1b51..c839943e 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-72.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-72.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-80.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-80.png
index 7b118f0e..1c47ded7 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-80.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-80.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-96.png b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-96.png
index 22761459..f1921a51 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-96.png and b/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-96.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-16.png b/src/Calculator/Assets/CalculatorAppList.targetsize-16.png
index d58618da..dd7e068c 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-16.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-16.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-colorize.png
index d58618da..dd7e068c 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-fullcolor.png
index b33b1caf..c3a1da94 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-lightunplated.png
index b33b1caf..c3a1da94 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-unplated.png
index d58618da..dd7e068c 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-unplated_contrast-black.png
index d58618da..dd7e068c 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-unplated_contrast-white.png
index b33b1caf..c3a1da94 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-16_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-20.png b/src/Calculator/Assets/CalculatorAppList.targetsize-20.png
index ca584a3d..497fb90d 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-20.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-20.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-colorize.png
index ca584a3d..497fb90d 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-fullcolor.png
index dfe95170..a4b0d7a5 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-lightunplated.png
index dfe95170..a4b0d7a5 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-unplated.png
index ca584a3d..497fb90d 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-unplated_contrast-black.png
index ca584a3d..497fb90d 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-unplated_contrast-white.png
index dfe95170..a4b0d7a5 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-20_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-24.png b/src/Calculator/Assets/CalculatorAppList.targetsize-24.png
index 6f904255..89f78b6d 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-24.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-24.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-colorize.png
index 6f904255..89f78b6d 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-fullcolor.png
index 2d989296..ef4f1d2c 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-lightunplated.png
index 2d989296..ef4f1d2c 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-unplated.png
index 6f904255..89f78b6d 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-unplated_contrast-black.png
index 6f904255..89f78b6d 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-unplated_contrast-white.png
index 2d989296..ef4f1d2c 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-24_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-256.png b/src/Calculator/Assets/CalculatorAppList.targetsize-256.png
index 4c601517..fe20d448 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-256.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-256.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-colorize.png
index 4c601517..fe20d448 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-fullcolor.png
index b59d0f8e..7cfe42e8 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-lightunplated.png
index b59d0f8e..7cfe42e8 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-unplated.png
index 4c601517..fe20d448 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-unplated_contrast-black.png
index 4c601517..fe20d448 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-unplated_contrast-white.png
index b59d0f8e..7cfe42e8 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-256_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-30.png b/src/Calculator/Assets/CalculatorAppList.targetsize-30.png
index d1d10643..27060604 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-30.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-30.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-colorize.png
index d1d10643..27060604 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-fullcolor.png
index b623996c..5f8f8955 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-lightunplated.png
index b623996c..5f8f8955 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-unplated.png
index d1d10643..27060604 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-unplated_contrast-black.png
index d1d10643..27060604 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-unplated_contrast-white.png
index b623996c..5f8f8955 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-30_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-32.png b/src/Calculator/Assets/CalculatorAppList.targetsize-32.png
index 73e3d415..e4b2ecbb 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-32.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-32.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-colorize.png
index 73e3d415..e4b2ecbb 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-fullcolor.png
index f9cbcf8b..4f65a30b 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-lightunplated.png
index f9cbcf8b..4f65a30b 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-unplated.png
index 73e3d415..e4b2ecbb 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-unplated_contrast-black.png
index 73e3d415..e4b2ecbb 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-unplated_contrast-white.png
index f9cbcf8b..4f65a30b 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-32_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-36.png b/src/Calculator/Assets/CalculatorAppList.targetsize-36.png
index 1de3f6c6..c6599e87 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-36.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-36.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-colorize.png
index 1de3f6c6..c6599e87 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-fullcolor.png
index b16fa5b6..a43f92f8 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-lightunplated.png
index b16fa5b6..a43f92f8 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-unplated.png
index 1de3f6c6..c6599e87 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-unplated_contrast-black.png
index 1de3f6c6..c6599e87 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-unplated_contrast-white.png
index b16fa5b6..a43f92f8 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-36_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-40.png b/src/Calculator/Assets/CalculatorAppList.targetsize-40.png
index be55cd05..f963a7a1 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-40.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-40.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-colorize.png
index be55cd05..f963a7a1 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-fullcolor.png
index 432563f5..623e6594 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-lightunplated.png
index 432563f5..623e6594 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-unplated.png
index be55cd05..f963a7a1 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-unplated_contrast-black.png
index be55cd05..f963a7a1 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-unplated_contrast-white.png
index 432563f5..623e6594 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-40_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-48.png b/src/Calculator/Assets/CalculatorAppList.targetsize-48.png
index 02e793af..b801ca63 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-48.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-48.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-colorize.png
index 02e793af..b801ca63 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-fullcolor.png
index 95ec20f0..de3eb465 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-lightunplated.png
index 95ec20f0..de3eb465 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-unplated.png
index 02e793af..b801ca63 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-unplated_contrast-black.png
index 02e793af..b801ca63 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-unplated_contrast-white.png
index 95ec20f0..de3eb465 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-48_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-60.png b/src/Calculator/Assets/CalculatorAppList.targetsize-60.png
index 8ac9d445..63ffe785 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-60.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-60.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-colorize.png
index 8ac9d445..63ffe785 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-fullcolor.png
index d3608f1b..c987aef4 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-lightunplated.png
index d3608f1b..c987aef4 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-unplated.png
index 8ac9d445..63ffe785 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-unplated_contrast-black.png
index 8ac9d445..63ffe785 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-unplated_contrast-white.png
index d3608f1b..c987aef4 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-60_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-64.png b/src/Calculator/Assets/CalculatorAppList.targetsize-64.png
index 6bd47b58..6261dd17 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-64.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-64.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-colorize.png
index 6bd47b58..6261dd17 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-fullcolor.png
index afbb74ed..a1958c46 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-lightunplated.png
index afbb74ed..a1958c46 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-unplated.png
index 6bd47b58..6261dd17 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-unplated_contrast-black.png
index 6bd47b58..6261dd17 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-unplated_contrast-white.png
index afbb74ed..a1958c46 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-64_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-72.png b/src/Calculator/Assets/CalculatorAppList.targetsize-72.png
index 99f23797..6642f98f 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-72.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-72.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-colorize.png
index 99f23797..6642f98f 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-fullcolor.png
index e0ff1b51..c839943e 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-lightunplated.png
index e0ff1b51..c839943e 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-unplated.png
index 99f23797..6642f98f 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-unplated_contrast-black.png
index 99f23797..6642f98f 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-unplated_contrast-white.png
index e0ff1b51..c839943e 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-72_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-80.png b/src/Calculator/Assets/CalculatorAppList.targetsize-80.png
index a12e46fe..11905219 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-80.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-80.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-colorize.png
index a12e46fe..11905219 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-fullcolor.png
index 7b118f0e..1c47ded7 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-lightunplated.png
index 7b118f0e..1c47ded7 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-unplated.png
index a12e46fe..11905219 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-unplated_contrast-black.png
index a12e46fe..11905219 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-unplated_contrast-white.png
index 7b118f0e..1c47ded7 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-80_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-96.png b/src/Calculator/Assets/CalculatorAppList.targetsize-96.png
index 3a587d80..bbe1ebc9 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-96.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-96.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-colorize.png b/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-colorize.png
index 3a587d80..bbe1ebc9 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-colorize.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-colorize.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-fullcolor.png b/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-fullcolor.png
index 22761459..f1921a51 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-fullcolor.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-fullcolor.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-lightunplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-lightunplated.png
index 22761459..f1921a51 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-lightunplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-lightunplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-unplated.png b/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-unplated.png
index 3a587d80..bbe1ebc9 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-unplated.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-unplated.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-unplated_contrast-black.png b/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-unplated_contrast-black.png
index 3a587d80..bbe1ebc9 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-unplated_contrast-black.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-unplated_contrast-black.png differ
diff --git a/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-unplated_contrast-white.png b/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-unplated_contrast-white.png
index 22761459..f1921a51 100644
Binary files a/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-unplated_contrast-white.png and b/src/Calculator/Assets/CalculatorAppList.targetsize-96_altform-unplated_contrast-white.png differ
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-100.png
index 7d84f4f3..10a5c1c9 100644
Binary files a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-100.png and b/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-125.png b/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-125.png
index a87c16cd..5a1857e9 100644
Binary files a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-125.png and b/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-125.png differ
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-150.png b/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-150.png
index b880069d..0c51ac67 100644
Binary files a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-150.png and b/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-150.png differ
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-200.png
index 26a399d8..3c6e6099 100644
Binary files a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-200.png and b/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-400.png b/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-400.png
index 5169de0b..65310d23 100644
Binary files a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-400.png and b/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-400.png differ
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-100.png
index 7330c220..87d74cd2 100644
Binary files a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-100.png and b/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-125.png b/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-125.png
index 3d13a45d..a656fb81 100644
Binary files a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-125.png and b/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-125.png differ
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-150.png b/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-150.png
index c0e650a0..71661756 100644
Binary files a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-150.png and b/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-150.png differ
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-200.png
index 4fc2319a..26bedbf2 100644
Binary files a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-200.png and b/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-400.png b/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-400.png
index 9c20bd69..ad474316 100644
Binary files a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-400.png and b/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-400.png differ
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-100.png
index b706fa41..bddf62b2 100644
Binary files a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-100.png and b/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-125.png b/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-125.png
index e27f9e23..00b6ee58 100644
Binary files a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-125.png and b/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-125.png differ
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-150.png b/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-150.png
index 5d0a043b..76507134 100644
Binary files a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-150.png and b/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-150.png differ
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-200.png
index 7479b5cf..93476fcd 100644
Binary files a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-200.png and b/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-400.png b/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-400.png
index 3a11a362..94c7c704 100644
Binary files a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-400.png and b/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-400.png differ
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-100.png
index b2b6f38e..8bd4677f 100644
Binary files a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-100.png and b/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-125.png b/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-125.png
index 698ef6c2..dd46d0cd 100644
Binary files a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-125.png and b/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-125.png differ
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-150.png b/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-150.png
index bbc67571..419299ca 100644
Binary files a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-150.png and b/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-150.png differ
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-200.png
index cdfef256..84cad255 100644
Binary files a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-200.png and b/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-400.png b/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-400.png
index ec0da5de..c4716d8d 100644
Binary files a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-400.png and b/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-400.png differ
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-100.png
index ff162707..06d001e5 100644
Binary files a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-100.png and b/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-125.png b/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-125.png
index 6f36c55a..0d5acb3c 100644
Binary files a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-125.png and b/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-125.png differ
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-150.png b/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-150.png
index 8054a8b3..9172076a 100644
Binary files a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-150.png and b/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-150.png differ
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-200.png
index 11b65ec3..4f959cf4 100644
Binary files a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-200.png and b/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-400.png b/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-400.png
index 2ae1c42b..d8cf7fce 100644
Binary files a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-400.png and b/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-400.png differ
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-100.png
index 11274752..ec09997a 100644
Binary files a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-100.png and b/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-125.png b/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-125.png
index 81bc0917..36c0419f 100644
Binary files a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-125.png and b/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-125.png differ
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-150.png b/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-150.png
index efde3cc8..ceb0a0d1 100644
Binary files a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-150.png and b/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-150.png differ
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-200.png
index c10684a0..9a19e6d4 100644
Binary files a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-200.png and b/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-400.png b/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-400.png
index 17ca8520..791b5870 100644
Binary files a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-400.png and b/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-400.png differ
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-100.png
index 228828b8..7839982a 100644
Binary files a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-100.png and b/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-125.png b/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-125.png
index 6a422936..8556d5f7 100644
Binary files a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-125.png and b/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-125.png differ
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-150.png b/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-150.png
index be9c553b..3de17af6 100644
Binary files a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-150.png and b/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-150.png differ
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-200.png
index 58fefa76..9ae50cbb 100644
Binary files a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-200.png and b/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-400.png b/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-400.png
index 850d8e99..053f0376 100644
Binary files a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-400.png and b/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-400.png differ
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-100.png
index 309b48f6..be2d7005 100644
Binary files a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-100.png and b/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-125.png b/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-125.png
index 66468489..c156fff8 100644
Binary files a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-125.png and b/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-125.png differ
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-150.png b/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-150.png
index 39f4882e..678fdd5f 100644
Binary files a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-150.png and b/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-150.png differ
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-200.png
index 59e34154..7f8df9ca 100644
Binary files a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-200.png and b/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-400.png b/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-400.png
index 857103d0..98b11f1f 100644
Binary files a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-400.png and b/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-400.png differ
diff --git a/src/Calculator/Assets/CalculatorStoreLogo.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorStoreLogo.contrast-black_scale-100.png
index f0b450a4..205ba873 100644
Binary files a/src/Calculator/Assets/CalculatorStoreLogo.contrast-black_scale-100.png and b/src/Calculator/Assets/CalculatorStoreLogo.contrast-black_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorStoreLogo.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorStoreLogo.contrast-black_scale-200.png
index 7cff4d2e..414125fc 100644
Binary files a/src/Calculator/Assets/CalculatorStoreLogo.contrast-black_scale-200.png and b/src/Calculator/Assets/CalculatorStoreLogo.contrast-black_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorStoreLogo.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorStoreLogo.contrast-white_scale-100.png
index b4a6a2c7..ea5dd4f8 100644
Binary files a/src/Calculator/Assets/CalculatorStoreLogo.contrast-white_scale-100.png and b/src/Calculator/Assets/CalculatorStoreLogo.contrast-white_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorStoreLogo.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorStoreLogo.contrast-white_scale-200.png
index 40543748..a505472d 100644
Binary files a/src/Calculator/Assets/CalculatorStoreLogo.contrast-white_scale-200.png and b/src/Calculator/Assets/CalculatorStoreLogo.contrast-white_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-100.png
index 8dc45a80..41d59040 100644
Binary files a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-100.png and b/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-125.png b/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-125.png
index 3c4258ac..4b21c818 100644
Binary files a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-125.png and b/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-125.png differ
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-150.png b/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-150.png
index d17d2ae2..cdd47484 100644
Binary files a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-150.png and b/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-150.png differ
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-200.png
index 90e2f821..7839982a 100644
Binary files a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-200.png and b/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-400.png b/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-400.png
index 4ab08c93..0953c500 100644
Binary files a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-400.png and b/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-400.png differ
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-100.png
index 2266d8c4..821feddc 100644
Binary files a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-100.png and b/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-100.png differ
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-125.png b/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-125.png
index 1f31c6f4..1885cfe6 100644
Binary files a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-125.png and b/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-125.png differ
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-150.png b/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-150.png
index 5bd2a324..621073b8 100644
Binary files a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-150.png and b/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-150.png differ
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-200.png
index 0e5d6f5d..be2d7005 100644
Binary files a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-200.png and b/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-200.png differ
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-400.png b/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-400.png
index 4d790570..189a7185 100644
Binary files a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-400.png and b/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-400.png differ
diff --git a/src/Calculator/Resources/af-ZA/Resources.resw b/src/Calculator/Resources/af-ZA/Resources.resw
index 37eb7705..1e563e89 100644
--- a/src/Calculator/Resources/af-ZA/Resources.resw
+++ b/src/Calculator/Resources/af-ZA/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>%1 %2 is bygewerk</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Werk tariewe by</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/am-ET/Resources.resw b/src/Calculator/Resources/am-ET/Resources.resw
index 0e9a197b..476e41bd 100644
--- a/src/Calculator/Resources/am-ET/Resources.resw
+++ b/src/Calculator/Resources/am-ET/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>የዘመነው %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>የዝማኔ ክፍያዎች</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/ar-SA/Resources.resw b/src/Calculator/Resources/ar-SA/Resources.resw
index 78ec422d..aab109b7 100644
--- a/src/Calculator/Resources/ar-SA/Resources.resw
+++ b/src/Calculator/Resources/ar-SA/Resources.resw
@@ -2616,7 +2616,7 @@
     <value>تم تحديث %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>تحديث الأسعار</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/az-Latn-AZ/Resources.resw b/src/Calculator/Resources/az-Latn-AZ/Resources.resw
index 0b733f8f..32a24559 100644
--- a/src/Calculator/Resources/az-Latn-AZ/Resources.resw
+++ b/src/Calculator/Resources/az-Latn-AZ/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Yeniləndi: %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Tarifləri yeniləyin</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/be-BY/Resources.resw b/src/Calculator/Resources/be-BY/Resources.resw
index b4d936a9..d5f0cd53 100644
--- a/src/Calculator/Resources/be-BY/Resources.resw
+++ b/src/Calculator/Resources/be-BY/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Абноўлена %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Абнавіць курсы</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/bg-BG/Resources.resw b/src/Calculator/Resources/bg-BG/Resources.resw
index b2b750f9..3ef8f7fe 100644
--- a/src/Calculator/Resources/bg-BG/Resources.resw
+++ b/src/Calculator/Resources/bg-BG/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Актуализирано на %1 в %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Актуализиране на обменни курсове</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/bn-BD/Resources.resw b/src/Calculator/Resources/bn-BD/Resources.resw
index e55d13c3..3dec2e26 100644
--- a/src/Calculator/Resources/bn-BD/Resources.resw
+++ b/src/Calculator/Resources/bn-BD/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>%1 %2 হালনাগাদ</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>হালনাগাদ হার</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/ca-ES/Resources.resw b/src/Calculator/Resources/ca-ES/Resources.resw
index 9dfe10fd..6e9fd54f 100644
--- a/src/Calculator/Resources/ca-ES/Resources.resw
+++ b/src/Calculator/Resources/ca-ES/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Data d'actualització: %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Actualitza les tarifes</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/cs-CZ/Resources.resw b/src/Calculator/Resources/cs-CZ/Resources.resw
index 46c7d3ef..656df8e3 100644
--- a/src/Calculator/Resources/cs-CZ/Resources.resw
+++ b/src/Calculator/Resources/cs-CZ/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Aktualizováno %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Aktualizovat sazby</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/da-DK/Resources.resw b/src/Calculator/Resources/da-DK/Resources.resw
index 4c463444..6b3d2e30 100644
--- a/src/Calculator/Resources/da-DK/Resources.resw
+++ b/src/Calculator/Resources/da-DK/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Opdateret %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Opdater valutakurser</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/de-DE/Resources.resw b/src/Calculator/Resources/de-DE/Resources.resw
index 52631d95..f68e5607 100644
--- a/src/Calculator/Resources/de-DE/Resources.resw
+++ b/src/Calculator/Resources/de-DE/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Aktualisiert: %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Preise aktualisieren</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/el-GR/Resources.resw b/src/Calculator/Resources/el-GR/Resources.resw
index 32c28e4a..677de0e6 100644
--- a/src/Calculator/Resources/el-GR/Resources.resw
+++ b/src/Calculator/Resources/el-GR/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Ενημέρωση %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Ενημέρωση χρεώσεων</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/en-GB/Resources.resw b/src/Calculator/Resources/en-GB/Resources.resw
index b55f1c51..e89ffae7 100644
--- a/src/Calculator/Resources/en-GB/Resources.resw
+++ b/src/Calculator/Resources/en-GB/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Updated %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Update rates</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index 06a348dc..e7383a35 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -3099,7 +3099,7 @@
     <value>Updated %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Update rates</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/es-ES/Resources.resw b/src/Calculator/Resources/es-ES/Resources.resw
index 0eac4555..a417822d 100644
--- a/src/Calculator/Resources/es-ES/Resources.resw
+++ b/src/Calculator/Resources/es-ES/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Actualizado el %1 a las %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Actualizar tipos</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/es-MX/Resources.resw b/src/Calculator/Resources/es-MX/Resources.resw
index 3cdb17d5..f843a7c0 100644
--- a/src/Calculator/Resources/es-MX/Resources.resw
+++ b/src/Calculator/Resources/es-MX/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Actualizado el %1 a las %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Actualizar tarifas</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/et-EE/Resources.resw b/src/Calculator/Resources/et-EE/Resources.resw
index 793b818d..664f5af1 100644
--- a/src/Calculator/Resources/et-EE/Resources.resw
+++ b/src/Calculator/Resources/et-EE/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Värskendatud %1 kell %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Värskenda valuutakursse</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/eu-ES/Resources.resw b/src/Calculator/Resources/eu-ES/Resources.resw
index 8fd90d5c..66168a0d 100644
--- a/src/Calculator/Resources/eu-ES/Resources.resw
+++ b/src/Calculator/Resources/eu-ES/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Eguneratze-data: %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Eguneratu tarifak</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/fa-IR/Resources.resw b/src/Calculator/Resources/fa-IR/Resources.resw
index b0f80d1c..78ef4c25 100644
--- a/src/Calculator/Resources/fa-IR/Resources.resw
+++ b/src/Calculator/Resources/fa-IR/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>در %1 %2 به‌روزرسانی شد</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>به‌روزرسانی نرخ‌‌ها</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/fi-FI/Resources.resw b/src/Calculator/Resources/fi-FI/Resources.resw
index ff7f7c89..cc8766ef 100644
--- a/src/Calculator/Resources/fi-FI/Resources.resw
+++ b/src/Calculator/Resources/fi-FI/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Päivitetty %1 klo %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Päivitä kurssit</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/fil-PH/Resources.resw b/src/Calculator/Resources/fil-PH/Resources.resw
index e601976a..a9141ffe 100644
--- a/src/Calculator/Resources/fil-PH/Resources.resw
+++ b/src/Calculator/Resources/fil-PH/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Na-update noong %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>I-update ang mga rate</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/fr-CA/Resources.resw b/src/Calculator/Resources/fr-CA/Resources.resw
index bc64c860..5024cb49 100644
--- a/src/Calculator/Resources/fr-CA/Resources.resw
+++ b/src/Calculator/Resources/fr-CA/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Mise à jour le %1 à %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Mettre à jour les taux</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/fr-FR/Resources.resw b/src/Calculator/Resources/fr-FR/Resources.resw
index 1cfcbfd1..f76ce0ad 100644
--- a/src/Calculator/Resources/fr-FR/Resources.resw
+++ b/src/Calculator/Resources/fr-FR/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Mise à jour le %1 à %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Mettre à jour les taux</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/gl-ES/Resources.resw b/src/Calculator/Resources/gl-ES/Resources.resw
index 5cdaabec..29b83d32 100644
--- a/src/Calculator/Resources/gl-ES/Resources.resw
+++ b/src/Calculator/Resources/gl-ES/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Actualizado o %1 ás %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Actualizar tipos</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/he-IL/Resources.resw b/src/Calculator/Resources/he-IL/Resources.resw
index 8a32b97d..f43b19a0 100644
--- a/src/Calculator/Resources/he-IL/Resources.resw
+++ b/src/Calculator/Resources/he-IL/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>עודכן ב- %1 ב- %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>עדכן שערים</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/hi-IN/Resources.resw b/src/Calculator/Resources/hi-IN/Resources.resw
index 5610c18d..371ecc4f 100644
--- a/src/Calculator/Resources/hi-IN/Resources.resw
+++ b/src/Calculator/Resources/hi-IN/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>%1 %2 को अपडेट किया गया</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>दरों को अपडेट करें</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/hr-HR/Resources.resw b/src/Calculator/Resources/hr-HR/Resources.resw
index 98ef9456..52b647d2 100644
--- a/src/Calculator/Resources/hr-HR/Resources.resw
+++ b/src/Calculator/Resources/hr-HR/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Ažurirano %1 u %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Ažuriraj stope</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/hu-HU/Resources.resw b/src/Calculator/Resources/hu-HU/Resources.resw
index 1fd88497..4659d271 100644
--- a/src/Calculator/Resources/hu-HU/Resources.resw
+++ b/src/Calculator/Resources/hu-HU/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Frissítve: %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Díjak frissítése</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/id-ID/Resources.resw b/src/Calculator/Resources/id-ID/Resources.resw
index 62581caf..02e3ca65 100644
--- a/src/Calculator/Resources/id-ID/Resources.resw
+++ b/src/Calculator/Resources/id-ID/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>%1 %2 Diperbarui</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Perbarui tarif</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/is-IS/Resources.resw b/src/Calculator/Resources/is-IS/Resources.resw
index 342d2a8d..a00a8d7e 100644
--- a/src/Calculator/Resources/is-IS/Resources.resw
+++ b/src/Calculator/Resources/is-IS/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Uppfært %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Uppfæra taxta</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/it-IT/Resources.resw b/src/Calculator/Resources/it-IT/Resources.resw
index 2e0f8403..94820ec9 100644
--- a/src/Calculator/Resources/it-IT/Resources.resw
+++ b/src/Calculator/Resources/it-IT/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Aggiornato il %1 alle %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Aggiorna tariffe</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/ja-JP/Resources.resw b/src/Calculator/Resources/ja-JP/Resources.resw
index 4714e8ef..f99097d9 100644
--- a/src/Calculator/Resources/ja-JP/Resources.resw
+++ b/src/Calculator/Resources/ja-JP/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>更新: %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>為替レートの更新</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/kk-KZ/Resources.resw b/src/Calculator/Resources/kk-KZ/Resources.resw
index 8b8d5069..f656d41d 100644
--- a/src/Calculator/Resources/kk-KZ/Resources.resw
+++ b/src/Calculator/Resources/kk-KZ/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Жаңартылған %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Бағамдарды жаңарту</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/km-KH/Resources.resw b/src/Calculator/Resources/km-KH/Resources.resw
index 3edad578..12e7359a 100644
--- a/src/Calculator/Resources/km-KH/Resources.resw
+++ b/src/Calculator/Resources/km-KH/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>ការបន្ទាន់សម័យ %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>ធ្វើឱ្យទាន់សម័យការដាក់ពិន្ទុ</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/kn-IN/Resources.resw b/src/Calculator/Resources/kn-IN/Resources.resw
index 4b14b4d7..dbf0acea 100644
--- a/src/Calculator/Resources/kn-IN/Resources.resw
+++ b/src/Calculator/Resources/kn-IN/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>ನವೀಕರಿಸಿದ ದಿನಾಂಕ %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>ದರಗಳನ್ನು ಪರಿಷ್ಕರಿಸಿ</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/ko-KR/Resources.resw b/src/Calculator/Resources/ko-KR/Resources.resw
index 5dba0cd9..609ebca0 100644
--- a/src/Calculator/Resources/ko-KR/Resources.resw
+++ b/src/Calculator/Resources/ko-KR/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>업데이트 일자: %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>환율 업데이트</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/lo-LA/Resources.resw b/src/Calculator/Resources/lo-LA/Resources.resw
index 86270b47..05bf3c60 100644
--- a/src/Calculator/Resources/lo-LA/Resources.resw
+++ b/src/Calculator/Resources/lo-LA/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>ອັບເດດແລ້ວ %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>ອັບເດດອັດຕາ</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/lt-LT/Resources.resw b/src/Calculator/Resources/lt-LT/Resources.resw
index c9dbd246..52f2592f 100644
--- a/src/Calculator/Resources/lt-LT/Resources.resw
+++ b/src/Calculator/Resources/lt-LT/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Atnaujinta %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Naujinti valiutos kursus</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/lv-LV/Resources.resw b/src/Calculator/Resources/lv-LV/Resources.resw
index 3ec8b70b..2402bb29 100644
--- a/src/Calculator/Resources/lv-LV/Resources.resw
+++ b/src/Calculator/Resources/lv-LV/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Atjaunināšana veikta šādā datumā: %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Atjaunināt kursus</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/mk-MK/Resources.resw b/src/Calculator/Resources/mk-MK/Resources.resw
index 212f545c..01f1a01c 100644
--- a/src/Calculator/Resources/mk-MK/Resources.resw
+++ b/src/Calculator/Resources/mk-MK/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Ажурирано на %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Ажурирај ги цените</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/ml-IN/Resources.resw b/src/Calculator/Resources/ml-IN/Resources.resw
index 19feb640..693087e3 100644
--- a/src/Calculator/Resources/ml-IN/Resources.resw
+++ b/src/Calculator/Resources/ml-IN/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>അപ്‌ഡേറ്റ് ചെയ്‌തത് %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>നിരക്കുകൾ അപ്‌ഡേറ്റ് ചെയ്യുക</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/ms-MY/Resources.resw b/src/Calculator/Resources/ms-MY/Resources.resw
index 58305f7a..a1cdbb11 100644
--- a/src/Calculator/Resources/ms-MY/Resources.resw
+++ b/src/Calculator/Resources/ms-MY/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>%1 %2 yang dikemas kini</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Kemas kini kadar</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/nb-NO/Resources.resw b/src/Calculator/Resources/nb-NO/Resources.resw
index 3f781f1e..0cee8494 100644
--- a/src/Calculator/Resources/nb-NO/Resources.resw
+++ b/src/Calculator/Resources/nb-NO/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Oppdatert %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Oppdater valutakurser</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/nl-NL/Resources.resw b/src/Calculator/Resources/nl-NL/Resources.resw
index 18ee8bc4..a3c0b7cc 100644
--- a/src/Calculator/Resources/nl-NL/Resources.resw
+++ b/src/Calculator/Resources/nl-NL/Resources.resw
@@ -2617,7 +2617,7 @@
     <value>Bijgewerkt %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Tarieven bijwerken</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/pl-PL/Resources.resw b/src/Calculator/Resources/pl-PL/Resources.resw
index 9957a9fd..5344082c 100644
--- a/src/Calculator/Resources/pl-PL/Resources.resw
+++ b/src/Calculator/Resources/pl-PL/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Zaktualizowano %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Aktualizuj kursy</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/pt-BR/Resources.resw b/src/Calculator/Resources/pt-BR/Resources.resw
index eb3e69ee..c98f1a85 100644
--- a/src/Calculator/Resources/pt-BR/Resources.resw
+++ b/src/Calculator/Resources/pt-BR/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Atualizado %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Atualizar taxas</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/pt-PT/Resources.resw b/src/Calculator/Resources/pt-PT/Resources.resw
index 7b059d69..fa94a032 100644
--- a/src/Calculator/Resources/pt-PT/Resources.resw
+++ b/src/Calculator/Resources/pt-PT/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Atualização a %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Atualizar taxas</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/ro-RO/Resources.resw b/src/Calculator/Resources/ro-RO/Resources.resw
index c879bb57..0e35f3f5 100644
--- a/src/Calculator/Resources/ro-RO/Resources.resw
+++ b/src/Calculator/Resources/ro-RO/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Actualizat %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Actualizare tarife</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/ru-RU/Resources.resw b/src/Calculator/Resources/ru-RU/Resources.resw
index 663ca2c8..8f0e5393 100644
--- a/src/Calculator/Resources/ru-RU/Resources.resw
+++ b/src/Calculator/Resources/ru-RU/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Обновлено %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Обновить тарифы</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/sk-SK/Resources.resw b/src/Calculator/Resources/sk-SK/Resources.resw
index 7457d595..55d31401 100644
--- a/src/Calculator/Resources/sk-SK/Resources.resw
+++ b/src/Calculator/Resources/sk-SK/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Aktualizované %1 o %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Aktualizovať kurz</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/sl-SI/Resources.resw b/src/Calculator/Resources/sl-SI/Resources.resw
index f073e185..4c9adc2b 100644
--- a/src/Calculator/Resources/sl-SI/Resources.resw
+++ b/src/Calculator/Resources/sl-SI/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Posodobljeno %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Posodobi menjalne tečaje</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/sq-AL/Resources.resw b/src/Calculator/Resources/sq-AL/Resources.resw
index ae1f7d07..4c009ac6 100644
--- a/src/Calculator/Resources/sq-AL/Resources.resw
+++ b/src/Calculator/Resources/sq-AL/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Përditësuar më %1 në %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Përditëso kurset e këmbimit</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/sr-Latn-RS/Resources.resw b/src/Calculator/Resources/sr-Latn-RS/Resources.resw
index 54c73827..bc859aab 100644
--- a/src/Calculator/Resources/sr-Latn-RS/Resources.resw
+++ b/src/Calculator/Resources/sr-Latn-RS/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Ažurirano %1 u %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Ažuriraj kurs</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/sv-SE/Resources.resw b/src/Calculator/Resources/sv-SE/Resources.resw
index 5bcae461..372e0eea 100644
--- a/src/Calculator/Resources/sv-SE/Resources.resw
+++ b/src/Calculator/Resources/sv-SE/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Uppdaterades %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Uppdatera valutakurser</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/sw-KE/Resources.resw b/src/Calculator/Resources/sw-KE/Resources.resw
index 9d3773a6..e4d37470 100644
--- a/src/Calculator/Resources/sw-KE/Resources.resw
+++ b/src/Calculator/Resources/sw-KE/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Imesasishwa %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Sasisha ada</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/ta-IN/Resources.resw b/src/Calculator/Resources/ta-IN/Resources.resw
index 9a0583bb..5ecb7851 100644
--- a/src/Calculator/Resources/ta-IN/Resources.resw
+++ b/src/Calculator/Resources/ta-IN/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>புதுப்பித்தது %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>கட்டணங்களைப் புதுப்பி</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/te-IN/Resources.resw b/src/Calculator/Resources/te-IN/Resources.resw
index 6299c0fd..6e3a6f97 100644
--- a/src/Calculator/Resources/te-IN/Resources.resw
+++ b/src/Calculator/Resources/te-IN/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>%1 %2 అప్‌డేట్ చేయబడింది</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>రేట్లను అప్‌డేట్ చేయండి</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/th-TH/Resources.resw b/src/Calculator/Resources/th-TH/Resources.resw
index fd91b7c6..29ba6e75 100644
--- a/src/Calculator/Resources/th-TH/Resources.resw
+++ b/src/Calculator/Resources/th-TH/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>อัปเดตเมื่อ %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>อัปเดตอัตรา</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/tr-TR/Resources.resw b/src/Calculator/Resources/tr-TR/Resources.resw
index 9a5b41d1..1d26970c 100644
--- a/src/Calculator/Resources/tr-TR/Resources.resw
+++ b/src/Calculator/Resources/tr-TR/Resources.resw
@@ -2616,7 +2616,7 @@
     <value>Güncelleştirilmiş %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Ücretleri güncelleştir</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/uk-UA/Resources.resw b/src/Calculator/Resources/uk-UA/Resources.resw
index 4300428b..050134b2 100644
--- a/src/Calculator/Resources/uk-UA/Resources.resw
+++ b/src/Calculator/Resources/uk-UA/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Оновлено %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Оновити тарифи</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/uz-Latn-UZ/Resources.resw b/src/Calculator/Resources/uz-Latn-UZ/Resources.resw
index b54ad5a5..579831a0 100644
--- a/src/Calculator/Resources/uz-Latn-UZ/Resources.resw
+++ b/src/Calculator/Resources/uz-Latn-UZ/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>%1 %2 da yangilandi</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Kursni yangilash</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/vi-VN/Resources.resw b/src/Calculator/Resources/vi-VN/Resources.resw
index b881373c..c27c0aee 100644
--- a/src/Calculator/Resources/vi-VN/Resources.resw
+++ b/src/Calculator/Resources/vi-VN/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>Đã cập nhật %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>Cập nhật cước</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/zh-CN/Resources.resw b/src/Calculator/Resources/zh-CN/Resources.resw
index a14420ac..2554f339 100644
--- a/src/Calculator/Resources/zh-CN/Resources.resw
+++ b/src/Calculator/Resources/zh-CN/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>已更新 %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>更新汇率</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Resources/zh-TW/Resources.resw b/src/Calculator/Resources/zh-TW/Resources.resw
index ccd8ee3a..decddf14 100644
--- a/src/Calculator/Resources/zh-TW/Resources.resw
+++ b/src/Calculator/Resources/zh-TW/Resources.resw
@@ -2615,7 +2615,7 @@
     <value>已更新 %1 %2</value>
     <comment>The timestamp of currency conversion ratios fetched from an online service. %1 is the date. %2 is the time. Example: "Updated Sep 28, 2016 5:42 PM"</comment>
   </data>
-  <data name="RefreshButtonText.Text" xml:space="preserve">
+  <data name="RefreshButtonText.Content" xml:space="preserve">
     <value>更新費率</value>
     <comment>The text displayed for a hyperlink button that refreshes currency converter ratios.</comment>
   </data>
diff --git a/src/Calculator/Views/Calculator.xaml b/src/Calculator/Views/Calculator.xaml
index d63ac26f..b7db10eb 100644
--- a/src/Calculator/Views/Calculator.xaml
+++ b/src/Calculator/Views/Calculator.xaml
@@ -13,7 +13,30 @@
              mc:Ignorable="d">
 
     <UserControl.Resources>
-        <automation:NarratorNotifier x:Name="NarratorNotifier" Announcement="{x:Bind Model.Announcement, Mode=OneWay}"/>
+        <!-- DataTemplates -->
+
+        <DataTemplate x:Key="Operand" x:DataType="common:DisplayExpressionToken">
+            <TextBlock Margin="2,0,0,0"
+                       Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
+                       IsTextScaleFactorEnabled="False"
+                       Text="{Binding Token, Mode=OneWay}"/>
+        </DataTemplate>
+
+        <DataTemplate x:Key="Operator" x:DataType="common:DisplayExpressionToken">
+            <TextBlock Margin="2,0,0,0"
+                       Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
+                       IsTextScaleFactorEnabled="False"
+                       Text="{Binding Token, Mode=OneWay}"/>
+        </DataTemplate>
+
+        <DataTemplate x:Key="Separator" x:DataType="common:DisplayExpressionToken">
+            <TextBlock x:Name="MainText"
+                       IsTextScaleFactorEnabled="False"
+                       Text="{Binding Token, Mode=OneWay}"/>
+        </DataTemplate>
+
+        <!-- TextBox Styles -->
+
         <Style x:Key="OperandTextBoxStyle" TargetType="controls:OperandTextBox">
             <Setter Property="MinWidth" Value="32"/>
             <Setter Property="MinHeight" Value="20"/>
@@ -113,135 +136,6 @@
             </Setter>
         </Style>
 
-        <!-- Used by hidden shortcut buttons -->
-        <x:Int32 x:Key="Zero">0</x:Int32>
-
-        <DataTemplate x:Key="Operand" x:DataType="common:DisplayExpressionToken">
-            <TextBlock Margin="2,0,0,0"
-                       Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
-                       IsTextScaleFactorEnabled="False"
-                       Text="{Binding Token, Mode=OneWay}"/>
-        </DataTemplate>
-        <DataTemplate x:Key="Operator" x:DataType="common:DisplayExpressionToken">
-            <TextBlock Margin="2,0,0,0"
-                       Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
-                       IsTextScaleFactorEnabled="False"
-                       Text="{Binding Token, Mode=OneWay}"/>
-        </DataTemplate>
-        <DataTemplate x:Key="Separator" x:DataType="common:DisplayExpressionToken">
-            <TextBlock x:Name="MainText"
-                       IsTextScaleFactorEnabled="False"
-                       Text="{Binding Token, Mode=OneWay}"/>
-        </DataTemplate>
-
-        <Style x:Key="ExpressionBaseContainerStyle" TargetType="ListViewItem">
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Margin" Value="0"/>
-            <Setter Property="MinWidth" Value="0"/>
-            <Setter Property="MinHeight" Value="0"/>
-            <Setter Property="HorizontalAlignment" Value="Center"/>
-            <Setter Property="VerticalAlignment" Value="Stretch"/>
-            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ListViewItem">
-                        <ListViewItemPresenter Padding="0"
-                                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                               ContentMargin="0"
-                                               DisabledOpacity="{ThemeResource ListViewItemDisabledThemeOpacity}"
-                                               DragOpacity="{ThemeResource ListViewItemDragThemeOpacity}"
-                                               PointerOverBackground="{ThemeResource SystemControlHighlightListAccentLowBrush}"
-                                               PointerOverBackgroundMargin="0"
-                                               SelectedBackground="{ThemeResource SystemControlBackgroundAccentBrush}"
-                                               SelectedBorderThickness="0"
-                                               SelectedForeground="{ThemeResource SystemControlForegroundChromeWhiteBrush}"
-                                               SelectedPointerOverBackground="{ThemeResource SystemControlHighlightListAccentLowBrush}"
-                                               SelectedPointerOverBorderBrush="Transparent"
-                                               SelectionCheckMarkVisualEnabled="False"/>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style x:Key="NonEditableOperatorContainerStyle"
-               BasedOn="{StaticResource ExpressionBaseContainerStyle}"
-               TargetType="ListViewItem">
-            <Setter Property="IsHitTestVisible" Value="False"/>
-            <Setter Property="IsTabStop" Value="False"/>
-            <Setter Property="MinWidth" Value="4"/>
-        </Style>
-        <Style x:Key="EditableOperatorContainerStyle"
-               BasedOn="{StaticResource ExpressionBaseContainerStyle}"
-               TargetType="ListViewItem">
-            <Setter Property="IsHitTestVisible" Value="True"/>
-            <Setter Property="MinWidth" Value="32"/>
-        </Style>
-
-        <converters:ExpressionItemTemplateSelector x:Key="ExpressionItemTemplateSelector"
-                                                   OperandTemplate="{StaticResource Operand}"
-                                                   OperatorTemplate="{StaticResource Operator}"
-                                                   SeparatorTemplate="{StaticResource Separator}"/>
-        <converters:ExpressionItemContainerStyle x:Key="ExpressionItemContainerStyle"
-                                                 EditableOperatorStyle="{StaticResource NonEditableOperatorContainerStyle}"
-                                                 NonEditableOperatorStyle="{StaticResource NonEditableOperatorContainerStyle}"
-                                                 OperandStyle="{StaticResource NonEditableOperatorContainerStyle}"
-                                                 SeparatorStyle="{StaticResource NonEditableOperatorContainerStyle}"/>
-
-        <Style x:Key="ResultsStyleL"
-               x:Name="ResultsStyleL"
-               BasedOn="{StaticResource CalculationResultStyleL}"
-               TargetType="controls:CalculationResult">
-            <Setter Property="HorizontalContentAlignment" Value="Right"/>
-            <Setter Property="VerticalContentAlignment" Value="Top"/>
-            <Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeL}"/>
-            <Setter Property="MinFontSize" Value="12"/>
-            <Setter Property="IsActive" Value="True"/>
-            <Setter Property="DisplayMargin" Value="0,0,0,0"/>
-            <Setter Property="MaxExpressionHistoryCharacters" Value="51"/>
-        </Style>
-
-        <Style x:Key="ResultsStyleM"
-               x:Name="ResultsStyleM"
-               BasedOn="{StaticResource CalculationResultStyleM}"
-               TargetType="controls:CalculationResult">
-            <Setter Property="HorizontalContentAlignment" Value="Right"/>
-            <Setter Property="VerticalContentAlignment" Value="Top"/>
-            <Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeM}"/>
-            <Setter Property="MinFontSize" Value="12"/>
-            <Setter Property="IsActive" Value="True"/>
-            <Setter Property="DisplayMargin" Value="0,0,0,0"/>
-            <Setter Property="MaxExpressionHistoryCharacters" Value="30"/>
-        </Style>
-
-        <Style x:Key="ResultsStyleS"
-               x:Name="ResultsStyleS"
-               BasedOn="{StaticResource CalculationResultStyleS}"
-               TargetType="controls:CalculationResult">
-            <Setter Property="HorizontalContentAlignment" Value="Right"/>
-            <Setter Property="VerticalContentAlignment" Value="Top"/>
-            <Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeS}"/>
-            <Setter Property="MinFontSize" Value="12"/>
-            <Setter Property="IsActive" Value="True"/>
-            <Setter Property="DisplayMargin" Value="0,0,0,0"/>
-            <Setter Property="MaxExpressionHistoryCharacters" Value="30"/>
-        </Style>
-
-        <Style x:Key="ScrollButtonStyle" TargetType="Button">
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="0,0,0,0"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="Width" Value="20"/>
-            <Setter Property="MinWidth" Value="20"/>
-            <Setter Property="MinHeight" Value="24"/>
-            <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundAccentBrush}"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Visibility" Value="Collapsed"/>
-        </Style>
-
         <Style TargetType="controls:OverflowTextBlock">
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="Template">
@@ -312,6 +206,113 @@
             </Setter>
         </Style>
 
+        <!-- ListViewItem Styles -->
+
+        <Style x:Key="ExpressionBaseContainerStyle" TargetType="ListViewItem">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Margin" Value="0"/>
+            <Setter Property="MinWidth" Value="0"/>
+            <Setter Property="MinHeight" Value="0"/>
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="VerticalAlignment" Value="Stretch"/>
+            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListViewItem">
+                        <ListViewItemPresenter Padding="0"
+                                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                               ContentMargin="0"
+                                               DisabledOpacity="{ThemeResource ListViewItemDisabledThemeOpacity}"
+                                               DragOpacity="{ThemeResource ListViewItemDragThemeOpacity}"
+                                               PointerOverBackground="{ThemeResource SystemControlHighlightListAccentLowBrush}"
+                                               PointerOverBackgroundMargin="0"
+                                               SelectedBackground="{ThemeResource SystemControlBackgroundAccentBrush}"
+                                               SelectedBorderThickness="0"
+                                               SelectedForeground="{ThemeResource SystemControlForegroundChromeWhiteBrush}"
+                                               SelectedPointerOverBackground="{ThemeResource SystemControlHighlightListAccentLowBrush}"
+                                               SelectedPointerOverBorderBrush="Transparent"
+                                               SelectionCheckMarkVisualEnabled="False"/>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="NonEditableOperatorContainerStyle"
+               BasedOn="{StaticResource ExpressionBaseContainerStyle}"
+               TargetType="ListViewItem">
+            <Setter Property="IsHitTestVisible" Value="False"/>
+            <Setter Property="IsTabStop" Value="False"/>
+            <Setter Property="MinWidth" Value="4"/>
+        </Style>
+
+        <Style x:Key="EditableOperatorContainerStyle"
+               BasedOn="{StaticResource ExpressionBaseContainerStyle}"
+               TargetType="ListViewItem">
+            <Setter Property="IsHitTestVisible" Value="True"/>
+            <Setter Property="MinWidth" Value="32"/>
+        </Style>
+
+        <!-- Calculation Result Styles -->
+
+        <Style x:Key="ResultsStyleL"
+               x:Name="ResultsStyleL"
+               BasedOn="{StaticResource CalculationResultStyleL}"
+               TargetType="controls:CalculationResult">
+            <Setter Property="HorizontalContentAlignment" Value="Right"/>
+            <Setter Property="VerticalContentAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeL}"/>
+            <Setter Property="MinFontSize" Value="12"/>
+            <Setter Property="IsActive" Value="True"/>
+            <Setter Property="DisplayMargin" Value="0,0,0,0"/>
+            <Setter Property="MaxExpressionHistoryCharacters" Value="51"/>
+        </Style>
+
+        <Style x:Key="ResultsStyleM"
+               x:Name="ResultsStyleM"
+               BasedOn="{StaticResource CalculationResultStyleM}"
+               TargetType="controls:CalculationResult">
+            <Setter Property="HorizontalContentAlignment" Value="Right"/>
+            <Setter Property="VerticalContentAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeM}"/>
+            <Setter Property="MinFontSize" Value="12"/>
+            <Setter Property="IsActive" Value="True"/>
+            <Setter Property="DisplayMargin" Value="0,0,0,0"/>
+            <Setter Property="MaxExpressionHistoryCharacters" Value="30"/>
+        </Style>
+
+        <Style x:Key="ResultsStyleS"
+               x:Name="ResultsStyleS"
+               BasedOn="{StaticResource CalculationResultStyleS}"
+               TargetType="controls:CalculationResult">
+            <Setter Property="HorizontalContentAlignment" Value="Right"/>
+            <Setter Property="VerticalContentAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="{StaticResource CalcResultFontSizeS}"/>
+            <Setter Property="MinFontSize" Value="12"/>
+            <Setter Property="IsActive" Value="True"/>
+            <Setter Property="DisplayMargin" Value="0,0,0,0"/>
+            <Setter Property="MaxExpressionHistoryCharacters" Value="30"/>
+        </Style>
+
+        <!-- Button Styles -->
+
+        <Style x:Key="ScrollButtonStyle" TargetType="Button">
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Padding" Value="0,0,0,0"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="Width" Value="20"/>
+            <Setter Property="MinWidth" Value="20"/>
+            <Setter Property="MinHeight" Value="24"/>
+            <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundAccentBrush}"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Visibility" Value="Collapsed"/>
+        </Style>
+
+        <!-- Flyout Styles -->
+
         <Style x:Key="MemoryFlyoutStyle" TargetType="FlyoutPresenter">
             <Setter Property="MinWidth" Value="200"/>
             <Setter Property="MaxHeight" Value="2400"/>
@@ -373,6 +374,8 @@
             </Setter>
         </Style>
 
+        <!-- Storyboards -->
+
         <Storyboard x:Name="Animate">
             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="NumpadPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)">
                 <EasingDoubleKeyFrame KeyTime="0" Value="0.92">
@@ -399,6 +402,7 @@
                 </EasingDoubleKeyFrame>
             </DoubleAnimationUsingKeyFrames>
         </Storyboard>
+
         <Storyboard x:Name="AnimateWithoutResult">
             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="NumpadPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)">
                 <EasingDoubleKeyFrame KeyTime="0" Value="0.92">
@@ -426,9 +430,32 @@
             </DoubleAnimationUsingKeyFrames>
         </Storyboard>
 
+        <!-- Value Converters -->
+
         <converters:BooleanToVisibilityNegationConverter x:Key="BooleanToVisibilityNegationConverter"/>
+
         <converters:BooleanNegationConverter x:Key="BooleanNegationConverter"/>
 
+        <!-- DataTemplate Selectors and Style Selectors -->
+
+        <converters:ExpressionItemTemplateSelector x:Key="ExpressionItemTemplateSelector"
+                                                   OperandTemplate="{StaticResource Operand}"
+                                                   OperatorTemplate="{StaticResource Operator}"
+                                                   SeparatorTemplate="{StaticResource Separator}"/>
+
+        <converters:ExpressionItemContainerStyle x:Key="ExpressionItemContainerStyle"
+                                                 EditableOperatorStyle="{StaticResource NonEditableOperatorContainerStyle}"
+                                                 NonEditableOperatorStyle="{StaticResource NonEditableOperatorContainerStyle}"
+                                                 OperandStyle="{StaticResource NonEditableOperatorContainerStyle}"
+                                                 SeparatorStyle="{StaticResource NonEditableOperatorContainerStyle}"/>
+
+        <!-- Miscellaneous Resources -->
+
+        <automation:NarratorNotifier x:Name="NarratorNotifier" Announcement="{x:Bind Model.Announcement, Mode=OneWay}"/>
+
+        <!-- Used by hidden shortcut buttons -->
+        <x:Int32 x:Key="Zero">0</x:Int32>
+
         <MenuFlyout x:Key="DisplayContextMenu">
             <MenuFlyoutItem x:Name="CopyMenuItem"
                             x:Uid="CopyMenuItem"
@@ -579,6 +606,7 @@
                 </VisualState>
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
+
         <Grid FlowDirection="LeftToRight">
             <Grid.RowDefinitions>
                 <RowDefinition x:Name="RowHamburger" Height="{StaticResource HamburgerHeightGridLength}"/>
@@ -683,6 +711,7 @@
                                       Width="1*"
                                       MaxWidth="80"/>
                 </Grid.ColumnDefinitions>
+
                 <controls:CalculatorButton x:Name="ClearMemoryButton"
                                            x:Uid="ClearMemoryButton"
                                            Style="{StaticResource CaptionButtonStyle}"
@@ -763,9 +792,8 @@
 
                 <local:OperatorsPanel x:Name="OpsPanel" IsBitFlipChecked="{x:Bind Model.IsBitFlipChecked, Mode=OneWay}"/>
             </Grid>
-
-
         </Grid>
+
         <!-- Docked Pivot panel for history/memory -->
         <Border x:Name="DockPanel"
                 x:Uid="DockPanel"
@@ -810,6 +838,7 @@
                                 <Setter Property="FontSize" Value="{ThemeResource PivotTitleFontSize}"/>
                             </Style>
                         </Grid.Resources>
+
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="*"/>
@@ -818,7 +847,6 @@
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="Orientation">
                                 <VisualState x:Name="Portrait">
-
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleContentControl" Storyboard.TargetProperty="Margin">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPortraitThemePadding}"/>
@@ -826,7 +854,6 @@
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Landscape">
-
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleContentControl" Storyboard.TargetProperty="Margin">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotLandscapeThemePadding}"/>
@@ -837,7 +864,6 @@
                             <VisualStateGroup x:Name="NavigationButtonsVisibility">
                                 <VisualState x:Name="NavigationButtonsHidden"/>
                                 <VisualState x:Name="NavigationButtonsVisible">
-
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="Opacity">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
@@ -854,7 +880,6 @@
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="PreviousButtonVisible">
-
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton" Storyboard.TargetProperty="Opacity">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
@@ -865,7 +890,6 @@
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="NextButtonVisible">
-
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="Opacity">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
@@ -879,7 +903,6 @@
                             <VisualStateGroup x:Name="HeaderStates">
                                 <VisualState x:Name="HeaderDynamic"/>
                                 <VisualState x:Name="HeaderStatic">
-
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Header" Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
@@ -892,6 +915,7 @@
                             </VisualStateGroup>
 
                         </VisualStateManager.VisualStateGroups>
+
                         <ContentControl x:Name="TitleContentControl"
                                         Margin="{StaticResource PivotPortraitThemePadding}"
                                         Style="{StaticResource TitleContentControlStyle}"
@@ -899,6 +923,7 @@
                                         ContentTemplate="{TemplateBinding TitleTemplate}"
                                         IsTabStop="False"
                                         Visibility="Collapsed"/>
+
                         <Grid Grid.Row="1">
                             <Grid.Resources>
                                 <ControlTemplate x:Key="NextTemplate" TargetType="Button">
@@ -948,6 +973,7 @@
                                                   UseLayoutRounding="False"/>
                                     </Border>
                                 </ControlTemplate>
+
                                 <ControlTemplate x:Key="PreviousTemplate" TargetType="Button">
                                     <Border x:Name="Root"
                                             Background="{ThemeResource PivotPreviousButtonBackground}"
@@ -996,6 +1022,7 @@
                                     </Border>
                                 </ControlTemplate>
                             </Grid.Resources>
+
                             <ScrollViewer x:Name="ScrollViewer"
                                           Margin="{TemplateBinding Padding}"
                                           VerticalContentAlignment="Stretch"
@@ -1104,10 +1131,10 @@
                                 </PivotPanel>
                             </ScrollViewer>
                         </Grid>
-
                     </Grid>
                 </ControlTemplate>
             </Border.Resources>
+
             <Pivot x:Name="DockPivot"
                    SelectionChanged="DockPivot_SelectionChanged"
                    TabIndex="5"
@@ -1261,4 +1288,3 @@
         </Border>
     </Grid>
 </UserControl>
-
diff --git a/src/Calculator/Views/UnitConverter.xaml b/src/Calculator/Views/UnitConverter.xaml
index 879dc063..7afc660d 100644
--- a/src/Calculator/Views/UnitConverter.xaml
+++ b/src/Calculator/Views/UnitConverter.xaml
@@ -614,17 +614,18 @@
                                 IsTabStop="False"
                                 TabIndex="5"
                                 Visibility="Collapsed">
-                    <TextBlock x:Name="CurrencyRefreshBlock"
-                               Style="{ThemeResource CaptionTextBlockStyle}"
-                               AutomationProperties.AccessibilityView="Raw">
-                        <Hyperlink Foreground="{ThemeResource SystemControlHyperlinkBaseHighBrush}" Click="CurrencyRefreshButton_Click">
-                            <Run x:Uid="RefreshButtonText"/>
-                        </Hyperlink>
-                        <Run x:Name="Spacing" Text="&#x200A;"/>
-                        <Run x:Name="CurrencySecondaryStatus"
-                             FontWeight="SemiBold"
-                             Text=""/>
-                    </TextBlock>
+                    <StackPanel Orientation="Horizontal">
+                        <HyperlinkButton x:Name="CurrencyRefreshBlock"
+                               Foreground="{ThemeResource SystemControlHyperlinkBaseHighBrush}"
+                               Click="CurrencyRefreshButton_Click"
+                               x:Uid="RefreshButtonText"/>
+                        <TextBlock Style="{ThemeResource CaptionTextBlockStyle}" Margin="0, 7, 0, 0">
+                            <Run x:Name="Spacing" Text="&#x200A;"/>
+                            <Run x:Name="CurrencySecondaryStatus"
+                                 FontWeight="SemiBold"
+                                 Text=""/>
+                        </TextBlock>
+                    </StackPanel>
                 </ContentControl>
 
                 <!-- Offline TextBlock -->
diff --git a/src/Calculator/Views/UnitConverter.xaml.cpp b/src/Calculator/Views/UnitConverter.xaml.cpp
index 38884830..add80774 100644
--- a/src/Calculator/Views/UnitConverter.xaml.cpp
+++ b/src/Calculator/Views/UnitConverter.xaml.cpp
@@ -159,7 +159,6 @@ void UnitConverter::OnOfflineNetworkAccess()
 
 void UnitConverter::SetNormalCurrencyStatus()
 {
-    AutomationProperties::SetAccessibilityView(CurrencyRefreshBlock, AccessibilityView::Raw);
     CurrencySecondaryStatus->Text = L"";
 }
 
diff --git a/src/CalculatorUnitTests/HistoryTests.cpp b/src/CalculatorUnitTests/HistoryTests.cpp
index 9f30bf6b..c85ad82c 100644
--- a/src/CalculatorUnitTests/HistoryTests.cpp
+++ b/src/CalculatorUnitTests/HistoryTests.cpp
@@ -46,17 +46,17 @@ namespace CalculatorFunctionalTests
         {
             m_standardViewModel = ref new StandardCalculatorViewModel();
             m_standardViewModel->IsStandard = true;
-            m_historyViewModel = ref new HistoryViewModel(m_standardViewModel->m_standardCalculatorManager.get());
+            m_historyViewModel = ref new HistoryViewModel(&(m_standardViewModel->m_standardCalculatorManager));
             m_historyViewModel->SetCalculatorDisplay(m_standardViewModel->m_calculatorDisplay);
         }
 
         void Cleanup(unsigned int windowId = 0)
         {
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeBasic);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeBasic);
             m_historyViewModel->OnClearCommand(nullptr);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
             m_historyViewModel->OnClearCommand(nullptr);
-            m_standardViewModel->m_standardCalculatorManager->Reset();
+            m_standardViewModel->m_standardCalculatorManager.Reset();
         }
 
         bool IsHistoryContainerEmpty(_In_ String^ historyContainerKey)
@@ -83,12 +83,12 @@ namespace CalculatorFunctionalTests
         {
             Initialize(windowId);
             int initialSize = m_historyViewModel->ItemSize;
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command8);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command8);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
             int sizeAfterItemAdd = m_historyViewModel->ItemSize;
-            auto historyItem = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(0);
+            auto historyItem = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(0);
             String^ expression = UtfUtils::LRO + L"1   +   8 =" + UtfUtils::PDF;
             String ^result = StringReference(L"9");
             VERIFY_ARE_EQUAL(initialSize + 1, sizeAfterItemAdd);
@@ -101,33 +101,33 @@ namespace CalculatorFunctionalTests
         {
             Initialize(windowId);
             int initialSize = m_historyViewModel->ItemSize;
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
-            for (int i = 1; i < m_standardViewModel->m_standardCalculatorManager->MaxHistorySize(); i++)
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
+            for (int i = 1; i < m_standardViewModel->m_standardCalculatorManager.MaxHistorySize(); i++)
             {
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command2);
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command2);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
             }
-            VERIFY_ARE_EQUAL(m_historyViewModel->ItemSize, m_standardViewModel->m_standardCalculatorManager->MaxHistorySize());
+            VERIFY_ARE_EQUAL(m_historyViewModel->ItemSize, m_standardViewModel->m_standardCalculatorManager.MaxHistorySize());
             String ^expression = UtfUtils::LRO + L"1   +   1 =" + UtfUtils::PDF;
             int output = 2;
             String ^result = output.ToString();
-            auto historyItem = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(0);
+            auto historyItem = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(0);
             VERIFY_ARE_EQUAL(expression, StringReference(historyItem->historyItemVector.expression.c_str()));
             VERIFY_ARE_EQUAL(result, StringReference(historyItem->historyItemVector.result.c_str()));
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command5);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
-            VERIFY_ARE_EQUAL(m_historyViewModel->ItemSize, m_standardViewModel->m_standardCalculatorManager->MaxHistorySize());
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command5);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
+            VERIFY_ARE_EQUAL(m_historyViewModel->ItemSize, m_standardViewModel->m_standardCalculatorManager.MaxHistorySize());
             expression = UtfUtils::LRO + L"1   +   2 =" + UtfUtils::PDF;
             output = 3;
             result = output.ToString();
-            historyItem = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(0);
+            historyItem = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(0);
             VERIFY_ARE_EQUAL(expression, StringReference(historyItem->historyItemVector.expression.c_str()));
             VERIFY_ARE_EQUAL(result, StringReference(historyItem->historyItemVector.result.c_str()));
             Cleanup(windowId);
@@ -137,30 +137,30 @@ namespace CalculatorFunctionalTests
         {
             Initialize(windowId);
 
-            m_standardViewModel->m_standardCalculatorManager->Reset();
+            m_standardViewModel->m_standardCalculatorManager.Reset();
             int scientificItems = 5;
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
             for (int i = 0; i < scientificItems; i++)
             {
                 Command nextCommand = Command(130 + i);
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(nextCommand);
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(nextCommand);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
             }
 
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeBasic);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeBasic);
             int standardItems = 2;
             for (int i = 0; i < standardItems; i++)
             {
                 Command nextCommand = Command(130 + i);
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(nextCommand);
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(nextCommand);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
             }
 
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
             m_historyViewModel->ReloadHistory(ViewMode::Scientific);
             VERIFY_ARE_EQUAL(scientificItems, m_historyViewModel->ItemSize);
             for (int i = 0; i < scientificItems; i++)
@@ -169,13 +169,13 @@ namespace CalculatorFunctionalTests
                 expr = UtfUtils::LRO + expr + UtfUtils::PDF;
                 int output = 1 + i;
                 String ^result = output.ToString();
-                auto historyItem = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(i);
+                auto historyItem = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(i);
                 VERIFY_ARE_EQUAL(expr, historyItem->historyItemVector.expression);
                 VERIFY_ARE_EQUAL(result, StringReference(historyItem->historyItemVector.result.c_str()));
             }
 
             m_historyViewModel->ReloadHistory(ViewMode::Standard);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeBasic);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeBasic);
             VERIFY_ARE_EQUAL(standardItems, m_historyViewModel->ItemSize);
             for (int i = 0; i < standardItems; i++)
             {
@@ -183,7 +183,7 @@ namespace CalculatorFunctionalTests
                 expr = UtfUtils::LRO + expr + UtfUtils::PDF;
                 int output = 1 + i;
                 String ^result = output.ToString();
-                auto historyItem = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(i);
+                auto historyItem = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(i);
                 VERIFY_ARE_EQUAL(expr, historyItem->historyItemVector.expression);
                 VERIFY_ARE_EQUAL(result, StringReference(historyItem->historyItemVector.result.c_str()));
             }
@@ -193,16 +193,16 @@ namespace CalculatorFunctionalTests
         void ClearHistory(unsigned int windowId = 0)
         {
             Initialize(windowId);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command2);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeBasic);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command2);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command2);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeBasic);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command2);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
             m_historyViewModel->OnClearCommand(nullptr);
             VERIFY_ARE_EQUAL(0, m_historyViewModel->ItemSize);
             VERIFY_IS_TRUE(IsHistoryContainerEmpty(GetHistoryContainerKeyHelper(CM_STD)));
@@ -213,15 +213,15 @@ namespace CalculatorFunctionalTests
         void SerializeDeSerializeHistoryItem(unsigned int windowId = 0)
         {
             Initialize(windowId);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command2);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
-            auto itemBeforeSerializeDeserialize = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(0);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command2);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
+            auto itemBeforeSerializeDeserialize = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(0);
             m_historyViewModel->SaveHistory();
             m_historyViewModel->ReloadHistory(ViewMode::Scientific);
-            auto itemAfterSerializeDeserialize = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(0);
+            auto itemAfterSerializeDeserialize = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(0);
             VERIFY_IS_TRUE((itemBeforeSerializeDeserialize->historyItemVector.expression == itemAfterSerializeDeserialize->historyItemVector.expression) && (itemBeforeSerializeDeserialize->historyItemVector.result == itemAfterSerializeDeserialize->historyItemVector.result) && (itemBeforeSerializeDeserialize->historyItemVector.spCommands == itemAfterSerializeDeserialize->historyItemVector.spCommands) && (itemBeforeSerializeDeserialize->historyItemVector.spTokens == itemAfterSerializeDeserialize->historyItemVector.spTokens));
             Cleanup(windowId);
         }
@@ -229,30 +229,30 @@ namespace CalculatorFunctionalTests
         void SaveAndReloadHistory(unsigned int windowid = 0)
         {
             Initialize(windowid);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command8);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command2);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeBasic);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command6);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command8);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command2);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeBasic);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command6);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
             int itemsBeforeSaveAndReload = m_historyViewModel->ItemSize;
             m_historyViewModel->SaveHistory();
             m_historyViewModel->ReloadHistory(ViewMode::Scientific);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
             wstring expr = L"1   +   8 =";
             // add double quotes around the expression
             expr = UtfUtils::LRO + expr + UtfUtils::PDF;
             String ^result = StringReference(L"9");
             int itemsAfterSaveAndReload = m_historyViewModel->ItemSize;
-            auto historyItem = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(0);
+            auto historyItem = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(0);
 
             VERIFY_ARE_EQUAL(expr, historyItem->historyItemVector.expression);
             VERIFY_ARE_EQUAL(result, StringReference(historyItem->historyItemVector.result.c_str()));
@@ -271,16 +271,16 @@ namespace CalculatorFunctionalTests
             ResourceLoader^ m_uiResourceLoader = ResourceLoader::GetForViewIndependentUse(L"CEngineStrings");
             int itemIndex = 0;
             int commandResource = 67;
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
             for (int index = 0; index < modes; index++)
             {
-                m_standardViewModel->m_standardCalculatorManager->SendCommand(mode[index]);
+                m_standardViewModel->m_standardCalculatorManager.SendCommand(mode[index]);
                 for (int command = 0; command < commandsSize; command++)
                 {
-                    m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-                    m_standardViewModel->m_standardCalculatorManager->SendCommand(commands[command]);
-                    m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
-                    auto historyItem = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(itemIndex);
+                    m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+                    m_standardViewModel->m_standardCalculatorManager.SendCommand(commands[command]);
+                    m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
+                    auto historyItem = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(itemIndex);
                     String^ expression = m_uiResourceLoader->GetString(commandResource.ToString());
                     expression += L"( 1 ) =";
                     wstring expr = wstring(expression->Data());
@@ -297,20 +297,20 @@ namespace CalculatorFunctionalTests
         {
             Initialize(windowId);
             ResourceLoader^ m_uiResourceLoader = ResourceLoader::GetForViewIndependentUse(L"CEngineStrings");
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandDEG);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandSIN);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandRAD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandSIN);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandGRAD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandSIN);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
-            auto historyItem = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(0);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandDEG);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandSIN);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandRAD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandSIN);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandGRAD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandSIN);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
+            auto historyItem = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(0);
             String^ expression = m_uiResourceLoader->GetString(L"67");
             expression += L"( 1 )   +   ";
             expression += m_uiResourceLoader->GetString(L"73");
@@ -327,14 +327,14 @@ namespace CalculatorFunctionalTests
         void HistoryItemClicked(unsigned int windowId = 0)
         {
             Initialize(windowId);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command5);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command3);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
-            auto historyItem = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(0);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command5);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command3);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
+            auto historyItem = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(0);
             String^ expression = StringReference(historyItem->historyItemVector.expression.c_str());
             String^ result = StringReference(historyItem->historyItemVector.result.c_str());
             HistoryItemViewModel ^ item = ref new HistoryItemViewModel(expression, result, historyItem->historyItemVector.spTokens, historyItem->historyItemVector.spCommands);
@@ -354,32 +354,32 @@ namespace CalculatorFunctionalTests
         void HistoryItemLoadAndContinueCalculation(unsigned int windowId = 0)
         {
             Initialize(windowId);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeBasic);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command5);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command3);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeBasic);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command5);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command3);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
 
-            auto historyItem = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(0);
+            auto historyItem = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(0);
             String^ expression = StringReference(historyItem->historyItemVector.expression.c_str());
             String^ result = StringReference(historyItem->historyItemVector.result.c_str());
             HistoryItemViewModel ^ item = ref new HistoryItemViewModel(expression, result, historyItem->historyItemVector.spTokens, historyItem->historyItemVector.spCommands);
             MockOnHistoryItemClicked(item);
 
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command5);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command5);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
             VERIFY_ARE_EQUAL(StringReference(L"14"), m_standardViewModel->DisplayValue);
-            historyItem = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(0);
+            historyItem = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(0);
             expression = StringReference(historyItem->historyItemVector.expression.c_str());
             result = StringReference(historyItem->historyItemVector.result.c_str());
             item = ref new HistoryItemViewModel(expression, result, historyItem->historyItemVector.spTokens, historyItem->historyItemVector.spCommands);
             MockOnHistoryItemClicked(item);
             VERIFY_ARE_EQUAL(StringReference(L"9"), m_standardViewModel->DisplayValue);
 
-            historyItem = m_standardViewModel->m_standardCalculatorManager->GetHistoryItem(1);
+            historyItem = m_standardViewModel->m_standardCalculatorManager.GetHistoryItem(1);
             expression = StringReference(historyItem->historyItemVector.expression.c_str());
             result = StringReference(historyItem->historyItemVector.result.c_str());
             item = ref new HistoryItemViewModel(expression, result, historyItem->historyItemVector.spTokens, historyItem->historyItemVector.spCommands);
@@ -391,26 +391,26 @@ namespace CalculatorFunctionalTests
         void DisplayValueAutomationNames(unsigned int windowId = 0)
         {
             Initialize(windowId);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command8);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command8);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
             String ^expression = StringReference(L"Display is 9");
             VERIFY_ARE_EQUAL(expression, m_standardViewModel->CalculationResultAutomationName);
 
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command5);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command5);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
             expression = StringReference(L"Display is 6");
             VERIFY_ARE_EQUAL(expression, m_standardViewModel->CalculationResultAutomationName);
 
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeProgrammer);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command2);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeProgrammer);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command2);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
             expression = StringReference(L"Display is 3");
             VERIFY_ARE_EQUAL(expression, m_standardViewModel->CalculationResultAutomationName);
 
@@ -420,12 +420,12 @@ namespace CalculatorFunctionalTests
         void RadixAutomationName(unsigned int windowId = 0)
         {
             Initialize(windowId);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeProgrammer);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeProgrammer);
             m_standardViewModel->IsProgrammer = true;
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command1);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandADD);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::Command7);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::CommandEQU);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandADD);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command7);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::CommandEQU);
             String ^expression = L"HexaDecimal" + L" 8";
             String ^result = L"HexaDecimal " + Utils::GetStringValue(m_standardViewModel->HexDisplayValue);
             VERIFY_ARE_EQUAL(expression, result);
@@ -442,7 +442,7 @@ namespace CalculatorFunctionalTests
         {
             Initialize(windowId);
             VERIFY_ARE_EQUAL(0, m_historyViewModel->ItemSize);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
             VERIFY_ARE_EQUAL(0, m_historyViewModel->ItemSize);
             Cleanup(windowId);
         }
@@ -451,7 +451,7 @@ namespace CalculatorFunctionalTests
         {
             Initialize(windowId);
             VERIFY_ARE_EQUAL(0, m_historyViewModel->ItemSize);
-            m_standardViewModel->m_standardCalculatorManager->SendCommand(Command::ModeScientific);
+            m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
             m_historyViewModel->OnClearCommand(nullptr);
             VERIFY_ARE_EQUAL(0, m_historyViewModel->ItemSize);
             Cleanup(windowId);
diff --git a/src/CalculatorUnitTests/MultiWindowUnitTests.cpp b/src/CalculatorUnitTests/MultiWindowUnitTests.cpp
index 38c1dd8d..7e14a11d 100644
--- a/src/CalculatorUnitTests/MultiWindowUnitTests.cpp
+++ b/src/CalculatorUnitTests/MultiWindowUnitTests.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
@@ -411,7 +411,7 @@ namespace CalculatorUnitTests
                 ChangeMode(viewModels[i], i);
 
                 // Validate that the history items list is initially empty
-                VERIFY_IS_TRUE(0 == viewModels[i]->m_standardCalculatorManager->GetHistoryItems().size());
+                VERIFY_IS_TRUE(0 == viewModels[i]->m_standardCalculatorManager.GetHistoryItems().size());
             }
 
             // Perform Calculations on both the instances and check that the History items work independently
@@ -440,9 +440,9 @@ namespace CalculatorUnitTests
             ValidateViewModelByCommands(viewModels[1], scientificModeTestItems, true);
 
             // Assert for the history list items of 1st instance
-            VERIFY_IS_TRUE(1 == viewModels[0]->m_standardCalculatorManager->GetHistoryItems().size());
+            VERIFY_IS_TRUE(1 == viewModels[0]->m_standardCalculatorManager.GetHistoryItems().size());
 
-            auto item1 = viewModels[0]->m_standardCalculatorManager->GetHistoryItem(0);
+            auto item1 = viewModels[0]->m_standardCalculatorManager.GetHistoryItem(0);
             String ^expression1 = UtfUtils::LRO + L"1   +   2 =" + UtfUtils::PDF;
             String^ result1 = L"3";
 
@@ -450,9 +450,9 @@ namespace CalculatorUnitTests
             VERIFY_ARE_EQUAL(result1, StringReference(item1->historyItemVector.result.c_str()));
 
             // Assert for the history list items of 2nd instance
-            VERIFY_IS_TRUE(1 == viewModels[1]->m_standardCalculatorManager->GetHistoryItems().size());
+            VERIFY_IS_TRUE(1 == viewModels[1]->m_standardCalculatorManager.GetHistoryItems().size());
 
-            auto item2 = viewModels[1]->m_standardCalculatorManager->GetHistoryItem(0);
+            auto item2 = viewModels[1]->m_standardCalculatorManager.GetHistoryItem(0);
             String^ expression2 = UtfUtils::LRO + L"1   +   2   " + UtfUtils::MUL + L"   3 =" + UtfUtils::PDF;
             String^ result2 = L"7";
 
@@ -474,7 +474,7 @@ namespace CalculatorUnitTests
                 ChangeMode(viewModels[i], 0);
 
                 // Validate that the history items list is initially empty
-                VERIFY_IS_TRUE(0 == viewModels[i]->m_standardCalculatorManager->GetHistoryItems().size());
+                VERIFY_IS_TRUE(0 == viewModels[i]->m_standardCalculatorManager.GetHistoryItems().size());
             }
 
             // Perform Calculations on both the instances and check that the History items work independently
@@ -513,9 +513,9 @@ namespace CalculatorUnitTests
             // Assert for the history list items of the instances
             for (int i = 0; i < 2; i++)
             {
-                VERIFY_IS_TRUE(1 == viewModels[i]->m_standardCalculatorManager->GetHistoryItems().size());
+                VERIFY_IS_TRUE(1 == viewModels[i]->m_standardCalculatorManager.GetHistoryItems().size());
 
-                auto item = viewModels[i]->m_standardCalculatorManager->GetHistoryItem(0);
+                auto item = viewModels[i]->m_standardCalculatorManager.GetHistoryItem(0);
 
                 VERIFY_ARE_EQUAL(expression[i], StringReference(item->historyItemVector.expression.c_str()));
                 VERIFY_ARE_EQUAL(result[i], StringReference(item->historyItemVector.result.c_str()));
@@ -536,7 +536,7 @@ namespace CalculatorUnitTests
                 ChangeMode(viewModels[i], 1);
 
                 // Validate that the history items list is initially empty
-                VERIFY_IS_TRUE(0 == viewModels[i]->m_standardCalculatorManager->GetHistoryItems().size());
+                VERIFY_IS_TRUE(0 == viewModels[i]->m_standardCalculatorManager.GetHistoryItems().size());
             }
 
             // Perform Calculations on both the instances and check that the History items work independently
@@ -575,9 +575,9 @@ namespace CalculatorUnitTests
             // Assert for the history list items of the instances
             for (int i = 0; i < 2; i++)
             {
-                VERIFY_IS_TRUE(1 == viewModels[i]->m_standardCalculatorManager->GetHistoryItems().size());
+                VERIFY_IS_TRUE(1 == viewModels[i]->m_standardCalculatorManager.GetHistoryItems().size());
 
-                auto item = viewModels[i]->m_standardCalculatorManager->GetHistoryItem(0);
+                auto item = viewModels[i]->m_standardCalculatorManager.GetHistoryItem(0);
 
                 VERIFY_ARE_EQUAL(expression[i], StringReference(item->historyItemVector.expression.c_str()));
                 VERIFY_ARE_EQUAL(result[i], StringReference(item->historyItemVector.result.c_str()));