diff --git a/.editorconfig b/.editorconfig
index e844ca00..f3416ab7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,4 @@
-## IDE-independent coding style via EditorConfig: http://editorconfig.org/
+## IDE-independent coding style via EditorConfig: https://editorconfig.org/
 
 root = true
 
@@ -8,4 +8,4 @@ indent_size = 4
 end_of_line = crlf
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = true
\ No newline at end of file
+insert_final_newline = true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e0217867..9bab5f16 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -41,7 +41,7 @@ To learn how to build the code and run tests, follow the instructions in the [RE
 ### Style guidelines
 The code in this project uses several different coding styles, depending on the age and history of
 the code. Please attempt to match the style of surrounding code as much as possible. In new
-components, prefer the patterns described in the [C++ core guidelines](http://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines)
+components, prefer the patterns described in the [C++ core guidelines](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines)
 and the [modern C++/WinRT language projections](https://docs.microsoft.com/en-us/windows/uwp/cpp-and-winrt-apis/).
 
 ### Testing
@@ -91,4 +91,4 @@ You don't need to sign a CLA until you're ready to create a pull request. When y
 created, it is classified by a bot. If the change is trivial (i.e. you just fixed a typo) then the
 bot will label the PR `cla-not-required`. Otherwise, it's classified as `cla-required`. In that
 case, the system will also tell you how you can sign the CLA. Once you have signed a CLA, the
-current and all future pull requests will be labeled as `cla-signed`.
\ No newline at end of file
+current and all future pull requests will be labeled as `cla-signed`.
diff --git a/NOTICE.txt b/NOTICE.txt
index 60d809cb..d115a691 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -2,7 +2,7 @@ THIRD PARTY SOFTWARE NOTICES AND INFORMATION
 Do Not Translate or Localize
 
 This software incorporates material from third parties. Microsoft makes certain 
-open source code available at http://3rdpartysource.microsoft.com, or you may 
+open source code available at https://3rdpartysource.microsoft.com, or you may 
 send a check or money order for US $5.00, including the product name, the open 
 source component name, and version number, to:
 
diff --git a/README.md b/README.md
index ba76c48b..23afe0de 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ For information regarding Windows Calculator plans and release schedule, please
 
 ## Data / Telemetry
 This project collects usage data and sends it to Microsoft to help improve our products and services.
-Read our [privacy statement](http://go.microsoft.com/fwlink/?LinkId=521839) to learn more.
+Read our [privacy statement](https://go.microsoft.com/fwlink/?LinkId=521839) to learn more.
 Telemetry is disabled in development builds by default, and can be enabled with the `SEND_TELEMETRY`
 build flag.
 
diff --git a/docs/ManualTests.md b/docs/ManualTests.md
index 6fbc6716..a1d9de58 100644
--- a/docs/ManualTests.md
+++ b/docs/ManualTests.md
@@ -124,7 +124,7 @@ Steps:
     m.	“( )" Parenthesis
 
 
-**All Calulators Test: Verify memory functions**
+**All Calculators Test: Verify memory functions**
 Steps:
 1.	Launch the "Calculator" app.
 2.	Navigate to "Standard" Calculator.
diff --git a/docs/NewFeatureProcess.md b/docs/NewFeatureProcess.md
index 6aa2e22a..66c9a635 100644
--- a/docs/NewFeatureProcess.md
+++ b/docs/NewFeatureProcess.md
@@ -131,9 +131,9 @@ new features, the Microsoft team considers at least these items:
     - [ ] Microsoft must plan to keep these dependencies secure and functional for the lifetime of
       the app (which might be several years).
     - [ ] The app should be fully functional if some network requests are slow or fail. Tools like
-      [Fiddler](http://docs.telerik.com/fiddler/knowledgebase/fiddlerscript/perftesting)
+      [Fiddler](https://docs.telerik.com/fiddler/knowledgebase/fiddlerscript/perftesting)
       can be used to simulate slow or failed requests.
 
 ## Step 4: Final product review and merge to master
 After the technical review is complete, the product team will review the finished product to make
-sure the final implementation is ready to [release to Windows customers](Roadmap.md#Releases).
\ No newline at end of file
+sure the final implementation is ready to [release to Windows customers](Roadmap.md#Releases).
diff --git a/internal/Calculator.UIAutomationLibrary/CalculatorAppLauncher.cs b/internal/Calculator.UIAutomationLibrary/CalculatorAppLauncher.cs
index b90c984e..df2ad9c3 100644
--- a/internal/Calculator.UIAutomationLibrary/CalculatorAppLauncher.cs
+++ b/internal/Calculator.UIAutomationLibrary/CalculatorAppLauncher.cs
@@ -20,7 +20,7 @@ namespace Calculator.UIAutomationLibrary
     {
         public const string CoreWindowClassName = "Windows.UI.Core.CoreWindow";
 
-        // This doesn't actually work right now becaue popup will disappear
+        // This doesn't actually work right now because popup will disappear
         // Bug 13713223: ContentDialog/Popup does not show up in the UIA tree when Windows.Current.Content has an AutomationName set.
         // public static readonly UICondition TopLevelWindowUICondition = UICondition.CreateFromId(Constants.TopLevelWindowAutomationId);
         public static readonly UICondition CoreWindowUICondition = UICondition.CreateFromClassName(CoreWindowClassName)
diff --git a/internal/Calculator.UIAutomationLibrary/Utilities/PerfTestConstants.cs b/internal/Calculator.UIAutomationLibrary/Utilities/PerfTestConstants.cs
index ae329b7c..02c0206d 100644
--- a/internal/Calculator.UIAutomationLibrary/Utilities/PerfTestConstants.cs
+++ b/internal/Calculator.UIAutomationLibrary/Utilities/PerfTestConstants.cs
@@ -36,6 +36,6 @@ namespace Calculator.UIAutomationLibrary
         /// <summary>
         /// These are uses with the DataSource test property to specify iteration info.
         /// </summary>
-        public const string AppLifecycleInterationsSource = "Table:" + ConfigDirectory + "AppLifecycle.Iterations.xml#PerformanceConfigurations";
+        public const string AppLifecycleIterationsSource = "Table:" + ConfigDirectory + "AppLifecycle.Iterations.xml#PerformanceConfigurations";
     }
 }
diff --git a/internal/Calculator.UITests/Config/AppLifecycle.Iterations.xml b/internal/Calculator.UITests/Config/AppLifecycle.Iterations.xml
index 91a96bc8..65cec859 100644
--- a/internal/Calculator.UITests/Config/AppLifecycle.Iterations.xml
+++ b/internal/Calculator.UITests/Config/AppLifecycle.Iterations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-This file defines a table of preformance configuration for use with
+This file defines a table of performance configuration for use with
 TAEF Table Based Data-driven Testing.
 
 This table specifies we will run the test three times (each iteration has a 
diff --git a/internal/Calculator.UITests/Config/AppLifecycle.Profile.wprp b/internal/Calculator.UITests/Config/AppLifecycle.Profile.wprp
index 651b7c65..6fe8afd6 100644
--- a/internal/Calculator.UITests/Config/AppLifecycle.Profile.wprp
+++ b/internal/Calculator.UITests/Config/AppLifecycle.Profile.wprp
@@ -64,7 +64,7 @@
             <Buffers Value="15" />
         </EventCollector>
 
-        <EventCollector Id="EC_Responsiveness.HighCost.Verbose" Name="User Session Logger Higcost Verbose">
+        <EventCollector Id="EC_Responsiveness.HighCost.Verbose" Name="User Session Logger HighCost Verbose">
             <BufferSize Value="1024" />
             <Buffers Value="3" PercentageOfTotalMemory="true" MaximumBufferSpace="60" />
         </EventCollector>
diff --git a/internal/Calculator.UITests/Tests/AppLifecycleTests.cs b/internal/Calculator.UITests/Tests/AppLifecycleTests.cs
index e2990043..2b346251 100644
--- a/internal/Calculator.UITests/Tests/AppLifecycleTests.cs
+++ b/internal/Calculator.UITests/Tests/AppLifecycleTests.cs
@@ -34,7 +34,7 @@ namespace Calculator.PerfTests
         /// The test launches the application, suspend and resumes it and then terminates the app.
         /// 
         /// A TAEF data source is used to specify the Windows Performance Recorder profile and
-        /// regions of interest file to use and defines threee different configurations to execute this test with.
+        /// regions of interest file to use and defines three different configurations to execute this test with.
         /// Cold: The initial run to get dlls loaded into memory and to execute any first-run app logic.
         /// Warm: The run that will produce consistent results and that would be used for measures.
         /// Memory: A run that is focused on collecting more info on allocations.
@@ -42,7 +42,7 @@ namespace Calculator.PerfTests
         [TestMethod]
         [TestProperty("RunAs", "User")]
         [TestProperty("Category", "Performance")]
-        [TestProperty(WinperfConstants.DataSource, PerfConstants.AppLifecycleInterationsSource)]
+        [TestProperty(WinperfConstants.DataSource, PerfConstants.AppLifecycleIterationsSource)]
         public void AppLifecycleTest()
         {
             AppLifecycle.Run(Constants.PackageAppUserModelId);
diff --git a/internal/nuget.config b/internal/nuget.config
index bd1364ee..606b6309 100644
--- a/internal/nuget.config
+++ b/internal/nuget.config
@@ -4,7 +4,7 @@
     <add key="disableSourceControlIntegration" value="true" />
   </solution>
   <packageSources>
-    <add key="NuGet official package source" value="https://nuget.org/api/v2/" />
+    <add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
     <add key="MitaLite" value="https://microsoft.pkgs.visualstudio.com/DefaultCollection/_packaging/MitaLite/nuget/v3/index.json" />
     <add key="Taef" value="https://microsoft.pkgs.visualstudio.com/DefaultCollection/_packaging/Taef/nuget/v3/index.json" />
     <add key="Test.Net" value="https://microsoft.pkgs.visualstudio.com/DefaultCollection/_packaging/Test.Net/nuget/v3/index.json" />
diff --git a/src/CalcManager/CEngine/History.cpp b/src/CalcManager/CEngine/History.cpp
index 3520b974..fe14425d 100644
--- a/src/CalcManager/CEngine/History.cpp
+++ b/src/CalcManager/CEngine/History.cpp
@@ -136,7 +136,7 @@ void CHistoryCollector::ChangeLastBinOp(int nOpCode, bool fPrecInvToHigher)
     TruncateEquationSzFromIch(m_lastBinOpStartIndex);
     if (fPrecInvToHigher)
     {
-        EnclosePrecInvertionBrackets();
+        EnclosePrecInversionBrackets();
     }
     AddBinOpToHistory(nOpCode);
 }
@@ -180,7 +180,7 @@ void CHistoryCollector::AddCloseBraceToHistory()
     m_bLastOpndBrace = true;
 }
 
-void CHistoryCollector::EnclosePrecInvertionBrackets()
+void CHistoryCollector::EnclosePrecInversionBrackets()
 {
     // Top of the Opnd starts index or 0 is nothing is in top
     int ichStart = (m_curOperandIndex > 0) ? m_operandIndices[m_curOperandIndex - 1] : 0;
@@ -401,9 +401,9 @@ int CHistoryCollector::AddCommand(_In_ const std::shared_ptr<IExpressionCommand>
         throw(CALC_E_OUTOFMEMORY);
     }
 
-    unsigned int nCommmands = 0;
-    m_spCommands->GetSize(&nCommmands);
-    return nCommmands - 1;
+    unsigned int nCommands = 0;
+    m_spCommands->GetSize(&nCommands);
+    return nCommands - 1;
 }
 
 //To Update the operands in the Expression according to the current Radix 
diff --git a/src/CalcManager/CEngine/scicomm.cpp b/src/CalcManager/CEngine/scicomm.cpp
index 71bec081..f639c707 100644
--- a/src/CalcManager/CEngine/scicomm.cpp
+++ b/src/CalcManager/CEngine/scicomm.cpp
@@ -271,7 +271,7 @@ void CCalcEngine::ProcessCommandWorker(WPARAM wParam)
                     // 1 + (2 Or 3)
                     if (ni <= nx)
                     {
-                        m_HistoryCollector.EnclosePrecInvertionBrackets();
+                        m_HistoryCollector.EnclosePrecInversionBrackets();
                     }
                     m_HistoryCollector.PopLastOpndStart();
                     goto DoPrecedenceCheckAgain;
@@ -507,7 +507,7 @@ void CCalcEngine::ProcessCommandWorker(WPARAM wParam)
             nx = NPrecedenceOfOp(m_nOpCode);
             if (ni <= nx)
             {
-                m_HistoryCollector.EnclosePrecInvertionBrackets();
+                m_HistoryCollector.EnclosePrecInversionBrackets();
             }
             m_HistoryCollector.PopLastOpndStart();
 
@@ -600,7 +600,7 @@ void CCalcEngine::ProcessCommandWorker(WPARAM wParam)
                 nx = NPrecedenceOfOp(m_nOpCode);
                 if (ni <= nx)
                 {
-                    m_HistoryCollector.EnclosePrecInvertionBrackets();
+                    m_HistoryCollector.EnclosePrecInversionBrackets();
                 }
                 m_HistoryCollector.PopLastOpndStart();
 
diff --git a/src/CalcManager/CalculatorManager.cpp b/src/CalcManager/CalculatorManager.cpp
index 1d62e010..0e03afaf 100644
--- a/src/CalcManager/CalculatorManager.cpp
+++ b/src/CalcManager/CalculatorManager.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "Header Files\CalcEngine.h"
+#include "Header Files/CalcEngine.h"
 #include "CalculatorManager.h"
 #include "CalculatorResource.h"
 
@@ -98,7 +98,7 @@ namespace CalculationManager
     }
 
     /// <summary>
-    /// Callback from the CalculatorControll
+    /// Callback from the CalculatorControl
     /// Passed in string representations of memorized numbers get passed to the client
     /// </summary>
     /// <param name="memorizedNumber">vector containing wstring values of memorized numbers</param>
@@ -429,7 +429,7 @@ namespace CalculationManager
                 *commandItr <= MEMORY_COMMAND_TO_UNSIGNED_CHAR(MemoryCommand::MemorizedNumberClearAll))
             {
                 //MemoryCommands(which have values above 255) are pushed on m_savedCommands upon casting to unsigned char.
-                //SerializeCommands uses m_savedCommands, which is then used in DeSerializeCommnds.
+                //SerializeCommands uses m_savedCommands, which is then used in DeSerializeCommands.
                 //Hence, a simple cast to MemoryCommand is not sufficient.
                 MemoryCommand memoryCommand = static_cast<MemoryCommand>(*commandItr + UCHAR_MAX + 1);
                 unsigned int indexOfMemory = 0;
@@ -505,7 +505,7 @@ namespace CalculationManager
     /// Recall the memorized number.
     /// The memorized number gets loaded to the primary display
     /// </summary>
-    /// <param name="indexOfMemeory">Index of the target memory</param>
+    /// <param name="indexOfMemory">Index of the target memory</param>
     void CalculatorManager::MemorizedNumberLoad(_In_ unsigned int indexOfMemory)
     {
         SaveMemoryCommand(MemoryCommand::MemorizedNumberLoad, indexOfMemory);
@@ -521,7 +521,7 @@ namespace CalculationManager
     /// It adds primary display value to the selected memory
     /// Notify the client with new the new memorize value vector
     /// </summary>
-    /// <param name="indexOfMemeory">Index of the target memory</param>
+    /// <param name="indexOfMemory">Index of the target memory</param>
     void CalculatorManager::MemorizedNumberAdd(_In_ unsigned int indexOfMemory)
     {
         SaveMemoryCommand(MemoryCommand::MemorizedNumberAdd, indexOfMemory);
@@ -559,7 +559,7 @@ namespace CalculationManager
     /// It adds primary display value to the selected memory
     /// Notify the client with new the new memorize value vector
     /// </summary>
-    /// <param name="indexOfMemeory">Index of the target memory</param>
+    /// <param name="indexOfMemory">Index of the target memory</param>
     void CalculatorManager::MemorizedNumberSubtract(_In_ unsigned int indexOfMemory)
     {
         SaveMemoryCommand(MemoryCommand::MemorizedNumberSubtract, indexOfMemory);
@@ -603,7 +603,7 @@ namespace CalculationManager
 /// Helper function that selects a memory from the vector and set it to CCalcEngine
 /// Saved RAT number needs to be copied and passed in, as CCalcEngine destroyed the passed in RAT
 /// </summary>
-/// <param name="indexOfMemeory">Index of the target memory</param>
+/// <param name="indexOfMemory">Index of the target memory</param>
     void CalculatorManager::MemorizedNumberSelect(_In_ unsigned int indexOfMemory)
     {
         if (!(m_currentCalculatorEngine->FInErrorState()))
@@ -617,7 +617,7 @@ namespace CalculationManager
     /// Helper function that needs to be executed when memory is modified
     /// When memory is modified, destroy the old RAT and put the new RAT in vector
     /// </summary>
-    /// <param name="indexOfMemeory">Index of the target memory</param>
+    /// <param name="indexOfMemory">Index of the target memory</param>
     void CalculatorManager::MemorizedNumberChanged(_In_ unsigned int indexOfMemory)
     {
         if (!(m_currentCalculatorEngine->FInErrorState()))
diff --git a/src/CalcManager/CalculatorResource.h b/src/CalcManager/CalculatorResource.h
index 51db56da..51bdd8b6 100644
--- a/src/CalcManager/CalculatorResource.h
+++ b/src/CalcManager/CalculatorResource.h
@@ -15,7 +15,7 @@ namespace CalculationManager
         // and the ids to define them with can be seen in EngineStrings.h
         // with SIDS prefix. Additionally it must provide values for string
         // ids "sDecimal", "sThousand" and "sGrouping". See
-        // http://technet.microsoft.com/en-us/library/cc782655(v=ws.10).aspx
+        // https://technet.microsoft.com/en-us/library/cc782655(v=ws.10).aspx
         // for what these values refer to.
         virtual std::wstring GetCEngineString(const std::wstring& id) = 0;
     };
diff --git a/src/CalcManager/CalculatorVector.h b/src/CalcManager/CalculatorVector.h
index 5ddf5300..9e8c1a72 100644
--- a/src/CalcManager/CalculatorVector.h
+++ b/src/CalcManager/CalculatorVector.h
@@ -14,7 +14,7 @@ public:
         {
             *item = m_vector.at(index);
         }
-        catch (std::out_of_range /*ex*/)
+        catch (const std::out_of_range& /*ex*/)
         {
             hr = E_BOUNDS;
         }
@@ -34,7 +34,7 @@ public:
         {
             m_vector[index] = item;
         }
-        catch (std::out_of_range /*ex*/)
+        catch (const std::out_of_range& /*ex*/)
         {
             hr = E_BOUNDS;
         }
@@ -63,7 +63,7 @@ public:
             auto iter = m_vector.begin() + index;
             m_vector.insert(iter, item);
         }
-        catch (std::bad_alloc /*ex*/)
+        catch (const std::bad_alloc& /*ex*/)
         {
             hr = E_OUTOFMEMORY;
         }
@@ -92,7 +92,7 @@ public:
         {
             m_vector.push_back(item);
         }
-        catch (std::bad_alloc /*ex*/)
+        catch (const std::bad_alloc& /*ex*/)
         {
             hr = E_OUTOFMEMORY;
         }
diff --git a/src/CalcManager/ExpressionCommand.cpp b/src/CalcManager/ExpressionCommand.cpp
index 393a4716..fcede229 100644
--- a/src/CalcManager/ExpressionCommand.cpp
+++ b/src/CalcManager/ExpressionCommand.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "Header Files\CCommand.h"
+#include "Header Files/CCommand.h"
 #include "CalculatorVector.h"
 #include "ExpressionCommand.h"
 
diff --git a/src/CalcManager/Header Files/History.h b/src/CalcManager/Header Files/History.h
index 39be04ef..c8f418cb 100644
--- a/src/CalcManager/Header Files/History.h	
+++ b/src/CalcManager/Header Files/History.h	
@@ -26,7 +26,7 @@ public:
     void AddCloseBraceToHistory();
     void PushLastOpndStart(int ichOpndStart = -1);
     void PopLastOpndStart();
-    void EnclosePrecInvertionBrackets();
+    void EnclosePrecInversionBrackets();
     bool FOpndAddedToHistory();
     void CompleteHistoryLine(std::wstring_view numStr);
     void ClearHistoryLine(std::wstring_view errStr);
diff --git a/src/CalcManager/Ratpack/rat.cpp b/src/CalcManager/Ratpack/rat.cpp
index 11668b74..20751fe4 100644
--- a/src/CalcManager/Ratpack/rat.cpp
+++ b/src/CalcManager/Ratpack/rat.cpp
@@ -183,7 +183,7 @@ void divrat( PRAT *pa, PRAT b, int32_t precision)
 //    RETURN: None, changes first pointer.
 //
 //    DESCRIPTION: Does the rational equivalent of *pa += b.
-//    Assumes base is internal througought.
+//    Assumes base is internal throughout.
 //
 //-----------------------------------------------------------------------------
 
@@ -204,7 +204,7 @@ void subrat( PRAT *pa, PRAT b, int32_t precision)
 //    RETURN: None, changes first pointer.
 //
 //    DESCRIPTION: Does the rational equivalent of *pa += b.
-//    Assumes base is internal througought.
+//    Assumes base is internal throughout.
 //
 //-----------------------------------------------------------------------------
 
diff --git a/src/CalcViewModel/ApplicationViewModel.cpp b/src/CalcViewModel/ApplicationViewModel.cpp
index 9c1aa386..4df5bac3 100644
--- a/src/CalcViewModel/ApplicationViewModel.cpp
+++ b/src/CalcViewModel/ApplicationViewModel.cpp
@@ -3,13 +3,13 @@
 
 #include "pch.h"
 #include "ApplicationViewModel.h"
-#include "Common\TraceLogger.h"
-#include "Common\AppResourceProvider.h"
+#include "Common/TraceLogger.h"
+#include "Common/AppResourceProvider.h"
 #include "StandardCalculatorViewModel.h"
 #include "DateCalculatorViewModel.h"
-#include "DataLoaders\CurrencyHttpClient.h"
-#include "DataLoaders\CurrencyDataLoader.h"
-#include "DataLoaders\UnitConverterDataLoader.h"
+#include "DataLoaders/CurrencyHttpClient.h"
+#include "DataLoaders/CurrencyDataLoader.h"
+#include "DataLoaders/UnitConverterDataLoader.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalcViewModel/CalcViewModel.vcxproj b/src/CalcViewModel/CalcViewModel.vcxproj
index 8ace7400..33715487 100644
--- a/src/CalcViewModel/CalcViewModel.vcxproj
+++ b/src/CalcViewModel/CalcViewModel.vcxproj
@@ -402,7 +402,7 @@
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Microsoft.UI.Xaml.2.0.181018003.1\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.UI.Xaml.2.0.181018003.1\build\native\Microsoft.UI.Xaml.targets'))" />
   </Target>
diff --git a/src/CalcViewModel/Common/AlwaysSelectedCollectionView.h b/src/CalcViewModel/Common/AlwaysSelectedCollectionView.h
index 2174fdf4..40dd5cf3 100644
--- a/src/CalcViewModel/Common/AlwaysSelectedCollectionView.h
+++ b/src/CalcViewModel/Common/AlwaysSelectedCollectionView.h
@@ -275,7 +275,7 @@ namespace CalculatorApp { namespace Common
             return Windows::UI::Xaml::DependencyProperty::UnsetValue;  // Can't convert
         }
 
-        virtual Platform::Object^ ConverBack(
+        virtual Platform::Object^ ConvertBack(
             Platform::Object^ /*value*/, 
             Windows::UI::Xaml::Interop::TypeName /*targetType*/, 
             Platform::Object^ /*parameter*/, 
diff --git a/src/CalcViewModel/Common/Automation/LiveRegionHost.h b/src/CalcViewModel/Common/Automation/LiveRegionHost.h
index 212b8534..c80d1477 100644
--- a/src/CalcViewModel/Common/Automation/LiveRegionHost.h
+++ b/src/CalcViewModel/Common/Automation/LiveRegionHost.h
@@ -12,7 +12,7 @@
 namespace CalculatorApp::Common::Automation
 {
     // This class exists so that the app can run on RS2 and use LiveRegions
-    // to host notifiactions on those builds.
+    // to host notifications on those builds.
     // When the app switches to min version RS3, this class can be removed
     // and the app will switch to using the Notification API.
     // TODO - MSFT 12735088
diff --git a/src/CalcViewModel/Common/CopyPasteManager.cpp b/src/CalcViewModel/Common/CopyPasteManager.cpp
index 4fc643c1..954d4d03 100644
--- a/src/CalcViewModel/Common/CopyPasteManager.cpp
+++ b/src/CalcViewModel/Common/CopyPasteManager.cpp
@@ -3,8 +3,8 @@
 
 #include "pch.h"
 #include "CopyPasteManager.h"
-#include "Common\TraceLogger.h"
-#include "Common\LocalizationSettings.h"
+#include "Common/TraceLogger.h"
+#include "Common/LocalizationSettings.h"
 
 using namespace std;
 using namespace concurrency;
diff --git a/src/CalcViewModel/Common/EngineResourceProvider.h b/src/CalcViewModel/Common/EngineResourceProvider.h
index 1bcb93f5..83b3f418 100644
--- a/src/CalcViewModel/Common/EngineResourceProvider.h
+++ b/src/CalcViewModel/Common/EngineResourceProvider.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "CalcManager\CalculatorResource.h"
+#include "CalcManager/CalculatorResource.h"
 
 namespace CalculatorApp
 {
diff --git a/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp b/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp
index 51c3eae9..38bae50f 100644
--- a/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp
+++ b/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "Common\ExpressionCommandSerializer.h"
+#include "Common/ExpressionCommandSerializer.h"
 
 using namespace CalculatorApp::Common;
 using namespace Windows::Storage::Streams;
diff --git a/src/CalcViewModel/Common/NavCategory.cpp b/src/CalcViewModel/Common/NavCategory.cpp
index 83980a1b..e5247cff 100644
--- a/src/CalcViewModel/Common/NavCategory.cpp
+++ b/src/CalcViewModel/Common/NavCategory.cpp
@@ -4,7 +4,7 @@
 #include "pch.h"
 #include "NavCategory.h"
 #include "AppResourceProvider.h"
-#include "Common\LocalizationStringUtil.h"
+#include "Common/LocalizationStringUtil.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
@@ -199,7 +199,7 @@ CategoryGroupType NavCategory::GetGroupType(ViewMode mode)
         : CategoryGroupType::None;
 }
 
-// GetIndex is 0-based, GetPostion is 1-based
+// GetIndex is 0-based, GetPosition is 1-based
 int NavCategory::GetIndex(ViewMode mode)
 {
     int position = NavCategory::GetPosition(mode);
@@ -228,7 +228,7 @@ int NavCategory::GetFlatIndex(ViewMode mode)
         : -1;
 }
 
-// GetIndex is 0-based, GetPostion is 1-based
+// GetIndex is 0-based, GetPosition is 1-based
 int NavCategory::GetIndexInGroup(ViewMode mode, CategoryGroupType type)
 {
     int index = -1;
@@ -249,7 +249,7 @@ int NavCategory::GetIndexInGroup(ViewMode mode, CategoryGroupType type)
         : -1;
 }
 
-// GetIndex is 0-based, GetPostion is 1-based
+// GetIndex is 0-based, GetPosition is 1-based
 int NavCategory::GetPosition(ViewMode mode)
 {
     int position = 0;
diff --git a/src/CalcViewModel/Common/NavCategory.h b/src/CalcViewModel/Common/NavCategory.h
index a463833c..61a8dbfc 100644
--- a/src/CalcViewModel/Common/NavCategory.h
+++ b/src/CalcViewModel/Common/NavCategory.h
@@ -170,7 +170,7 @@ namespace CalculatorApp
             static Platform::String^ GetNameResourceKey(ViewMode mode);
             static CategoryGroupType GetGroupType(ViewMode mode);
 
-            // GetIndex is 0-based, GetPostion is 1-based
+            // GetIndex is 0-based, GetPosition is 1-based
             static int GetIndex(ViewMode mode);
             static int GetFlatIndex(ViewMode mode);
             static int GetIndexInGroup(ViewMode mode, CategoryGroupType type);
diff --git a/src/CalcViewModel/Common/Utils.cpp b/src/CalcViewModel/Common/Utils.cpp
index c0ddf69a..55e78e6c 100644
--- a/src/CalcViewModel/Common/Utils.cpp
+++ b/src/CalcViewModel/Common/Utils.cpp
@@ -7,9 +7,9 @@
 
 #include "pch.h"
 #include "Utils.h"
-#include "Common\AppResourceProvider.h"
-#include "Common\ExpressionCommandSerializer.h"
-#include "Common\ExpressionCommandDeserializer.h"
+#include "Common/AppResourceProvider.h"
+#include "Common/ExpressionCommandSerializer.h"
+#include "Common/ExpressionCommandDeserializer.h"
 #include "ViewState.h"
 
 using namespace CalculatorApp;
diff --git a/src/CalcViewModel/Common/ValidatingConverters.h b/src/CalcViewModel/Common/ValidatingConverters.h
index 9da3fc1f..9b99cbcd 100644
--- a/src/CalcViewModel/Common/ValidatingConverters.h
+++ b/src/CalcViewModel/Common/ValidatingConverters.h
@@ -23,7 +23,7 @@ namespace CalculatorApp { namespace Common
             return value;
         }
 
-        virtual Platform::Object^ ConverBack(
+        virtual Platform::Object^ ConvertBack(
             Platform::Object^ value, 
             Windows::UI::Xaml::Interop::TypeName /*targetType*/, 
             Platform::Object^ /*parameter*/, 
@@ -56,7 +56,7 @@ namespace CalculatorApp { namespace Common
             return value;
         }
 
-        virtual Platform::Object^ ConverBack(
+        virtual Platform::Object^ ConvertBack(
             Platform::Object^ value, 
             Windows::UI::Xaml::Interop::TypeName /*targetType*/, 
             Platform::Object^ /*parameter*/, 
diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
index 434cc6f4..49585320 100644
--- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
+++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
@@ -3,11 +3,11 @@
 
 #include "pch.h"
 #include "CurrencyDataLoader.h"
-#include "Common\AppResourceProvider.h"
-#include "Common\LocalizationStringUtil.h"
-#include "Common\LocalizationService.h"
-#include "Common\LocalizationSettings.h"
-#include "Common\TraceLogger.h"
+#include "Common/AppResourceProvider.h"
+#include "Common/LocalizationStringUtil.h"
+#include "Common/LocalizationService.h"
+#include "Common/LocalizationSettings.h"
+#include "Common/TraceLogger.h"
 #include "UnitConverterDataConstants.h"
 
 using namespace CalculatorApp;
@@ -588,7 +588,7 @@ bool CurrencyDataLoader::TryParseAllRatiosData(_In_ String^ rawJson, _Inout_ Cur
 //
 // There are a few ways we can get the data needed for Currency Converter, including from cache or from web.
 // This function accepts the data from any source, and acts as a 'last-steps' for the converter to be ready.
-// This includes identifying which units will be selected and building the map of curreny ratios.
+// This includes identifying which units will be selected and building the map of currency ratios.
 #pragma optimize("", off) // Turn off optimizations to work around DevDiv 393321
 task<void> CurrencyDataLoader::FinalizeUnits(_In_ const vector<UCM::CurrencyStaticData>& staticData, _In_ const CurrencyRatioMap& ratioMap)
 {
diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h
index 917fa21d..cdb006bb 100644
--- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h
+++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "CalcManager\UnitConverter.h"
-#include "Common\NetworkManager.h"
+#include "CalcManager/UnitConverter.h"
+#include "Common/NetworkManager.h"
 #include "ICurrencyHttpClient.h"
 
 namespace CalculatorApp
diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
index 754b3ee8..b00cf799 100644
--- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
+++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
@@ -1,8 +1,8 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "Common\AppResourceProvider.h"
+#include "Common/AppResourceProvider.h"
 #include "UnitConverterDataLoader.h"
 #include "UnitConverterDataConstants.h"
 #include "CurrencyDataLoader.h"
@@ -156,27 +156,34 @@ void UnitConverterDataLoader::GetCategories(_In_ shared_ptr<vector<UCM::Category
 
 void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<OrderedUnit>>& unitMap)
 {
-    bool USSource, USTarget;
-    bool UKSource, UKTarget;
-    bool Source, Target;
+    // US + Federated States of Micronesia, Marshall Islands, Palau
+    bool useUSCustomaryAndFahrenheit = m_currentRegionCode == L"US" ||
+        m_currentRegionCode == L"PW" ||
+        m_currentRegionCode == L"FM" ||
+        m_currentRegionCode == L"MH" ||
+        m_currentRegionCode == L"PW";
 
-    USSource = (GetRegion() == L"US") ? true : false;
-    USTarget = USSource;
+    // useUSCustomaryAndFahrenheit + Liberia
+    // Source: https://en.wikipedia.org/wiki/Metrication
+    bool useUSCustomary = useUSCustomaryAndFahrenheit || m_currentRegionCode == L"LR";
 
-    UKSource = (GetRegion() == L"UK") ? true : false;
-    UKTarget = UKSource;
+    // Use 'Système International' (International System of Units - Metrics)
+    bool useSI = !useUSCustomary;
 
-    Source = (GetRegion() == L"Others") ? true : false;
-    Target = Source;
+    // useUSCustomaryAndFahrenheit + the Bahamas, the Cayman Islands and Liberia
+    // Source: http://en.wikipedia.org/wiki/Fahrenheit
+    bool useFahrenheit = useUSCustomaryAndFahrenheit || m_currentRegionCode == "BS" || m_currentRegionCode == "KY" || m_currentRegionCode == "LR";
+
+    bool useWattInsteadOfKilowatt = m_currentRegionCode == "GB";
 
     vector<OrderedUnit> areaUnits;
     areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Acre, GetLocalizedStringName(L"UnitName_Acre"), GetLocalizedStringName(L"UnitAbbreviation_Acre"), 9 });
     areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Hectare, GetLocalizedStringName(L"UnitName_Hectare"), GetLocalizedStringName(L"UnitAbbreviation_Hectare"), 4 });
     areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareCentimeter, GetLocalizedStringName(L"UnitName_SquareCentimeter"), GetLocalizedStringName(L"UnitAbbreviation_SquareCentimeter"), 2 });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareFoot, GetLocalizedStringName(L"UnitName_SquareFoot"), GetLocalizedStringName(L"UnitAbbreviation_SquareFoot"), 7, (UKSource || Source), USTarget, false });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareFoot, GetLocalizedStringName(L"UnitName_SquareFoot"), GetLocalizedStringName(L"UnitAbbreviation_SquareFoot"), 7, useSI, useUSCustomary, false });
     areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareInch, GetLocalizedStringName(L"UnitName_SquareInch"), GetLocalizedStringName(L"UnitAbbreviation_SquareInch"), 6 });
     areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareKilometer, GetLocalizedStringName(L"UnitName_SquareKilometer"), GetLocalizedStringName(L"UnitAbbreviation_SquareKilometer"), 5 });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMeter, GetLocalizedStringName(L"UnitName_SquareMeter"), GetLocalizedStringName(L"UnitAbbreviation_SquareMeter"), 3, USSource, (UKTarget || Target), false});
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMeter, GetLocalizedStringName(L"UnitName_SquareMeter"), GetLocalizedStringName(L"UnitAbbreviation_SquareMeter"), 3, useUSCustomary, useSI, false});
     areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMile, GetLocalizedStringName(L"UnitName_SquareMile"), GetLocalizedStringName(L"UnitAbbreviation_SquareMile"), 10 });
     areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMillimeter, GetLocalizedStringName(L"UnitName_SquareMillimeter"), GetLocalizedStringName(L"UnitAbbreviation_SquareMillimeter"), 1 });
     areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareYard, GetLocalizedStringName(L"UnitName_SquareYard"), GetLocalizedStringName(L"UnitAbbreviation_SquareYard"), 8 });
@@ -240,9 +247,9 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<Order
     unitMap.emplace(ViewMode::Energy, energyUnits);
 
     vector<OrderedUnit> lengthUnits;
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Centimeter, GetLocalizedStringName(L"UnitName_Centimeter"), GetLocalizedStringName(L"UnitAbbreviation_Centimeter"), 4 , USSource, (Target || UKTarget), false});
+    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Centimeter, GetLocalizedStringName(L"UnitName_Centimeter"), GetLocalizedStringName(L"UnitAbbreviation_Centimeter"), 4, useUSCustomary, useSI, false});
     lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Foot, GetLocalizedStringName(L"UnitName_Foot"), GetLocalizedStringName(L"UnitAbbreviation_Foot"), 8 });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Inch, GetLocalizedStringName(L"UnitName_Inch"), GetLocalizedStringName(L"UnitAbbreviation_Inch"), 7 , (Source|| UKSource), USTarget, false });
+    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Inch, GetLocalizedStringName(L"UnitName_Inch"), GetLocalizedStringName(L"UnitAbbreviation_Inch"), 7 , useSI, useUSCustomary, false });
     lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Kilometer, GetLocalizedStringName(L"UnitName_Kilometer"), GetLocalizedStringName(L"UnitAbbreviation_Kilometer"), 6 });
     lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Meter, GetLocalizedStringName(L"UnitName_Meter"), GetLocalizedStringName(L"UnitAbbreviation_Meter"), 5 });
     lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Micron, GetLocalizedStringName(L"UnitName_Micron"), GetLocalizedStringName(L"UnitAbbreviation_Micron"), 2 });
@@ -260,16 +267,16 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<Order
     powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_BritishThermalUnitPerMinute, GetLocalizedStringName(L"UnitName_BTUPerMinute"), GetLocalizedStringName(L"UnitAbbreviation_BTUPerMinute"), 5 });
     powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_FootPoundPerMinute, GetLocalizedStringName(L"UnitName_Foot-PoundPerMinute"), GetLocalizedStringName(L"UnitAbbreviation_Foot-PoundPerMinute"), 4 });
     powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Horsepower, GetLocalizedStringName(L"UnitName_Horsepower"), GetLocalizedStringName(L"UnitAbbreviation_Horsepower") , 3 , false, true, false });
-    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Kilowatt, GetLocalizedStringName(L"UnitName_Kilowatt"), GetLocalizedStringName(L"UnitAbbreviation_Kilowatt"), 2 , (Source|| USSource), false, false});
-    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Watt, GetLocalizedStringName(L"UnitName_Watt"), GetLocalizedStringName(L"UnitAbbreviation_Watt"), 1, UKSource });
+    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Kilowatt, GetLocalizedStringName(L"UnitName_Kilowatt"), GetLocalizedStringName(L"UnitAbbreviation_Kilowatt"), 2 , !useWattInsteadOfKilowatt});
+    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Watt, GetLocalizedStringName(L"UnitName_Watt"), GetLocalizedStringName(L"UnitAbbreviation_Watt"), 1, useWattInsteadOfKilowatt});
     powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_LightBulb, GetLocalizedStringName(L"UnitName_LightBulb"), GetLocalizedStringName(L"UnitAbbreviation_LightBulb"), 6 ,false, false, true});
     powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Horse, GetLocalizedStringName(L"UnitName_Horse"), GetLocalizedStringName(L"UnitAbbreviation_Horse"), 7 ,false, false, true});
     powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_TrainEngine, GetLocalizedStringName(L"UnitName_TrainEngine"), GetLocalizedStringName(L"UnitAbbreviation_TrainEngine"), 8 ,false, false, true });
     unitMap.emplace(ViewMode::Power, powerUnits);
 
     vector<OrderedUnit> tempUnits;
-    tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_DegreesCelsius, GetLocalizedStringName(L"UnitName_DegreesCelsius"), GetLocalizedStringName(L"UnitAbbreviation_DegreesCelsius"), 1, USSource, (Target || UKTarget), false });
-    tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_DegreesFahrenheit, GetLocalizedStringName(L"UnitName_DegreesFahrenheit"), GetLocalizedStringName(L"UnitAbbreviation_DegreesFahrenheit"), 2 , (Source || UKSource), USTarget, false });
+    tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_DegreesCelsius, GetLocalizedStringName(L"UnitName_DegreesCelsius"), GetLocalizedStringName(L"UnitAbbreviation_DegreesCelsius"), 1, useFahrenheit, !useFahrenheit, false });
+    tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_DegreesFahrenheit, GetLocalizedStringName(L"UnitName_DegreesFahrenheit"), GetLocalizedStringName(L"UnitAbbreviation_DegreesFahrenheit"), 2 , !useFahrenheit, useFahrenheit, false });
     tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_Kelvin, GetLocalizedStringName(L"UnitName_Kelvin"), GetLocalizedStringName(L"UnitAbbreviation_Kelvin"), 3 });
     unitMap.emplace(ViewMode::Temperature, tempUnits);
 
@@ -287,11 +294,11 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<Order
     vector<OrderedUnit> speedUnits;
     speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_CentimetersPerSecond, GetLocalizedStringName(L"UnitName_CentimetersPerSecond"), GetLocalizedStringName(L"UnitAbbreviation_CentimetersPerSecond"), 1 });
     speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_FeetPerSecond, GetLocalizedStringName(L"UnitName_FeetPerSecond"), GetLocalizedStringName(L"UnitAbbreviation_FeetPerSecond"), 4 });
-    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_KilometersPerHour, GetLocalizedStringName(L"UnitName_KilometersPerHour"), GetLocalizedStringName(L"UnitAbbreviation_KilometersPerHour"), 3 ,(USSource || UKSource), Target, false });
+    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_KilometersPerHour, GetLocalizedStringName(L"UnitName_KilometersPerHour"), GetLocalizedStringName(L"UnitAbbreviation_KilometersPerHour"), 3 , useUSCustomary, useSI, false });
     speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Knot, GetLocalizedStringName(L"UnitName_Knot"), GetLocalizedStringName(L"UnitAbbreviation_Knot"), 6 });
     speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Mach, GetLocalizedStringName(L"UnitName_Mach"), GetLocalizedStringName(L"UnitAbbreviation_Mach"), 7 });
     speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_MetersPerSecond, GetLocalizedStringName(L"UnitName_MetersPerSecond"), GetLocalizedStringName(L"UnitAbbreviation_MetersPerSecond"), 2 });
-    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_MilesPerHour, GetLocalizedStringName(L"UnitName_MilesPerHour"), GetLocalizedStringName(L"UnitAbbreviation_MilesPerHour"), 5, Source, (UKTarget || USTarget), false });
+    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_MilesPerHour, GetLocalizedStringName(L"UnitName_MilesPerHour"), GetLocalizedStringName(L"UnitAbbreviation_MilesPerHour"), 5, useSI, useUSCustomary, false });
     speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Turtle, GetLocalizedStringName(L"UnitName_Turtle"), GetLocalizedStringName(L"UnitAbbreviation_Turtle"), 8 ,false, false, true });
     speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Horse, GetLocalizedStringName(L"UnitName_Horse"), GetLocalizedStringName(L"UnitAbbreviation_Horse"),9 , false, false, true });
     speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Jet, GetLocalizedStringName(L"UnitName_Jet"), GetLocalizedStringName(L"UnitAbbreviation_Jet"), 10, false, false, true });
@@ -309,14 +316,14 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<Order
     volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_GallonUK, GetLocalizedStringName(L"UnitName_GallonUK"), GetLocalizedStringName(L"UnitAbbreviation_GallonUK"), 20 });
     volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_GallonUS, GetLocalizedStringName(L"UnitName_GallonUS"), GetLocalizedStringName(L"UnitAbbreviation_GallonUS"), 11 });
     volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_Liter, GetLocalizedStringName(L"UnitName_Liter"), GetLocalizedStringName(L"UnitAbbreviation_Liter"), 3 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_Milliliter, GetLocalizedStringName(L"UnitName_Milliliter"), GetLocalizedStringName(L"UnitAbbreviation_Milliliter"), 1 , USSource, (Target || UKTarget), false});
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_Milliliter, GetLocalizedStringName(L"UnitName_Milliliter"), GetLocalizedStringName(L"UnitAbbreviation_Milliliter"), 1, useUSCustomary, useSI});
     volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_PintUK, GetLocalizedStringName(L"UnitName_PintUK"), GetLocalizedStringName(L"UnitAbbreviation_PintUK"), 18 });
     volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_PintUS, GetLocalizedStringName(L"UnitName_PintUS"), GetLocalizedStringName(L"UnitAbbreviation_PintUS"), 9 });
     volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TablespoonUS, GetLocalizedStringName(L"UnitName_TablespoonUS"), GetLocalizedStringName(L"UnitAbbreviation_TablespoonUS"), 6 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TeaspoonUS, GetLocalizedStringName(L"UnitName_TeaspoonUS"), GetLocalizedStringName(L"UnitAbbreviation_TeaspoonUS"), 5 ,Source, USTarget, false });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TeaspoonUS, GetLocalizedStringName(L"UnitName_TeaspoonUS"), GetLocalizedStringName(L"UnitAbbreviation_TeaspoonUS"), 5, useSI, useUSCustomary && m_currentRegionCode != "GB" });
     volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_QuartUK, GetLocalizedStringName(L"UnitName_QuartUK"), GetLocalizedStringName(L"UnitAbbreviation_QuartUK"), 19 });
     volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_QuartUS, GetLocalizedStringName(L"UnitName_QuartUS"), GetLocalizedStringName(L"UnitAbbreviation_QuartUS"), 10 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TeaspoonUK, GetLocalizedStringName(L"UnitName_TeaspoonUK"), GetLocalizedStringName(L"UnitAbbreviation_TeaspoonUK"), 15, UKSource });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TeaspoonUK, GetLocalizedStringName(L"UnitName_TeaspoonUK"), GetLocalizedStringName(L"UnitAbbreviation_TeaspoonUK"), 15, false, useUSCustomary && m_currentRegionCode == "GB"});
     volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TablespoonUK, GetLocalizedStringName(L"UnitName_TablespoonUK"), GetLocalizedStringName(L"UnitAbbreviation_TablespoonUK"), 16 });
     volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CoffeeCup, GetLocalizedStringName(L"UnitName_CoffeeCup"), GetLocalizedStringName(L"UnitAbbreviation_CoffeeCup"), 22 ,false, false, true });
     volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_Bathtub, GetLocalizedStringName(L"UnitName_Bathtub"), GetLocalizedStringName(L"UnitAbbreviation_Bathtub"), 23 ,false, false, true});
@@ -330,11 +337,11 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<Order
     weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Decagram, GetLocalizedStringName(L"UnitName_Decagram"), GetLocalizedStringName(L"UnitAbbreviation_Decagram"), 6 });
     weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Gram, GetLocalizedStringName(L"UnitName_Gram"), GetLocalizedStringName(L"UnitAbbreviation_Gram"), 5 });
     weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Hectogram, GetLocalizedStringName(L"UnitName_Hectogram"), GetLocalizedStringName(L"UnitAbbreviation_Hectogram"), 7 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Kilogram, GetLocalizedStringName(L"UnitName_Kilogram"), GetLocalizedStringName(L"UnitAbbreviation_Kilogram"), 8 ,(USSource || UKSource), Target, false});
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Kilogram, GetLocalizedStringName(L"UnitName_Kilogram"), GetLocalizedStringName(L"UnitAbbreviation_Kilogram"), 8 , useUSCustomary, useSI});
     weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_LongTon, GetLocalizedStringName(L"UnitName_LongTon"), GetLocalizedStringName(L"UnitAbbreviation_LongTon"), 14 });
     weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Milligram, GetLocalizedStringName(L"UnitName_Milligram"), GetLocalizedStringName(L"UnitAbbreviation_Milligram"), 2 });
     weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Ounce, GetLocalizedStringName(L"UnitName_Ounce"), GetLocalizedStringName(L"UnitAbbreviation_Ounce"), 10 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Pound, GetLocalizedStringName(L"UnitName_Pound"), GetLocalizedStringName(L"UnitAbbreviation_Pound"), 11 , Source, (USTarget ||UKTarget), false });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Pound, GetLocalizedStringName(L"UnitName_Pound"), GetLocalizedStringName(L"UnitAbbreviation_Pound"), 11 , useSI, useUSCustomary });
     weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_ShortTon, GetLocalizedStringName(L"UnitName_ShortTon"), GetLocalizedStringName(L"UnitAbbreviation_ShortTon"), 13 });
     weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Stone, GetLocalizedStringName(L"UnitName_Stone"), GetLocalizedStringName(L"UnitAbbreviation_Stone"), 12 });
     weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Tonne, GetLocalizedStringName(L"UnitName_Tonne"), GetLocalizedStringName(L"UnitAbbreviation_Tonne"), 9 });
@@ -469,8 +476,8 @@ void UnitConverterDataLoader::GetConversionData(_In_ unordered_map<ViewMode, uno
             { ViewMode::Volume, UnitConverterUnits::Volume_GallonUS, 3785.411784 },
             { ViewMode::Volume, UnitConverterUnits::Volume_GallonUK, 4546.09 },
             { ViewMode::Volume, UnitConverterUnits::Volume_Liter, 1000 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_TeaspoonUS, 4.928922 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_TablespoonUS, 14.786765 },
+            { ViewMode::Volume, UnitConverterUnits::Volume_TeaspoonUS, 4.92892159375 },
+            { ViewMode::Volume, UnitConverterUnits::Volume_TablespoonUS, 14.78676478125 },
             { ViewMode::Volume, UnitConverterUnits::Volume_CubicCentimeter, 1 },
             { ViewMode::Volume, UnitConverterUnits::Volume_CubicYard, 764554.857984 },
             { ViewMode::Volume, UnitConverterUnits::Volume_CubicMeter, 1000000 },
@@ -548,24 +555,6 @@ void UnitConverterDataLoader::GetConversionData(_In_ unordered_map<ViewMode, uno
      return AppResourceProvider::GetInstance().GetResourceString(stringId)->Data();
  }
 
- wstring UnitConverterDataLoader::GetRegion()
- {
-     if ((m_currentRegionCode == L"US") ||
-         (m_currentRegionCode == L"LR") ||
-         (m_currentRegionCode == L"MM"))
-     {
-         return L"US";
-     }
-     else if (m_currentRegionCode == L"GB")
-     {
-         return L"UK";
-     }
-     else
-     {
-         return L"Others";
-     }
- }
-
  void UnitConverterDataLoader::GetExplicitConversionData(_In_ unordered_map<int, unordered_map<int, UCM::ConversionData>>& unitToUnitConversionList)
  {
      /* categoryId, ParentUnitId, UnitId, ratio, offset, offsetfirst*/
diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h
index b48b8e09..519ffda9 100644
--- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h
+++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "CalcManager\UnitConverter.h"
+#include "CalcManager/UnitConverter.h"
 #include "Common/NavCategory.h"
 
 namespace CalculatorApp
@@ -64,7 +64,6 @@ namespace CalculatorApp
             void GetExplicitConversionData(_In_ std::unordered_map<int, std::unordered_map<int, UnitConversionManager::ConversionData>>& unitToUnitConversionList);
 
             std::wstring GetLocalizedStringName(_In_ Platform::String^ stringId);
-            std::wstring GetRegion();
 
             std::shared_ptr<std::vector<UnitConversionManager::Category>> m_categoryList;
             std::shared_ptr<UnitConversionManager::CategoryToUnitVectorMap> m_categoryToUnits;
diff --git a/src/CalcViewModel/DateCalculatorViewModel.cpp b/src/CalcViewModel/DateCalculatorViewModel.cpp
index e905d763..dde91cc3 100644
--- a/src/CalcViewModel/DateCalculatorViewModel.cpp
+++ b/src/CalcViewModel/DateCalculatorViewModel.cpp
@@ -3,11 +3,11 @@
 
 #include "pch.h"
 #include "DateCalculatorViewModel.h"
-#include "Common\TraceLogger.h"
-#include "Common\LocalizationStringUtil.h"
-#include "Common\LocalizationService.h"
-#include "Common\LocalizationSettings.h"
-#include "Common\CopyPasteManager.h"
+#include "Common/TraceLogger.h"
+#include "Common/LocalizationStringUtil.h"
+#include "Common/LocalizationService.h"
+#include "Common/LocalizationSettings.h"
+#include "Common/CopyPasteManager.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
@@ -87,7 +87,7 @@ DateCalculatorViewModel::DateCalculatorViewModel() :
     }
 
     /* In the ClipTime function, we used to change timezone to UTC before clipping the time.
-       The comment from the previous delopers said this was done to eliminate the effects of
+       The comment from the previous developers said this was done to eliminate the effects of
        Daylight Savings Time. We can't think of a good reason why this change in timezone is
        necessary and did find bugs related to the change, therefore, we have removed the
        change. Just in case, we will see if the clipped time is ever a different day from the
diff --git a/src/CalcViewModel/DateCalculatorViewModel.h b/src/CalcViewModel/DateCalculatorViewModel.h
index 1dffe518..f2fe7ebf 100644
--- a/src/CalcViewModel/DateCalculatorViewModel.h
+++ b/src/CalcViewModel/DateCalculatorViewModel.h
@@ -98,7 +98,7 @@ namespace CalculatorApp
             void UpdateDisplayResult();
             void UpdateStrDateDiffResultAutomationName();
             void UpdateStrDateResultAutomationName();
-            void InitializeDateOutputFormats(Platform::String^ calendarIdentifer);
+            void InitializeDateOutputFormats(Platform::String^ calendarIdentifier);
             Platform::String^ GetDateDiffString() const;
             Platform::String^ GetDateDiffStringInDays() const;
             Platform::String^ GetLocalizedNumberString(int value) const;
diff --git a/src/CalcViewModel/HistoryItemViewModel.cpp b/src/CalcViewModel/HistoryItemViewModel.cpp
index f3726fc7..c5cd0784 100644
--- a/src/CalcViewModel/HistoryItemViewModel.cpp
+++ b/src/CalcViewModel/HistoryItemViewModel.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "HistoryItemViewModel.h"
-#include "Common\LocalizationService.h"
+#include "Common/LocalizationService.h"
 
 using namespace CalculatorApp::Common;
 using namespace CalculatorApp::ViewModel;
diff --git a/src/CalcViewModel/HistoryViewModel.cpp b/src/CalcViewModel/HistoryViewModel.cpp
index 822aab03..aa491f18 100644
--- a/src/CalcViewModel/HistoryViewModel.cpp
+++ b/src/CalcViewModel/HistoryViewModel.cpp
@@ -3,9 +3,9 @@
 
 #include "pch.h"
 #include "HistoryViewModel.h"
-#include "Common\TraceLogger.h"
-#include "Common\LocalizationStringUtil.h"
-#include "Common\LocalizationSettings.h"
+#include "Common/TraceLogger.h"
+#include "Common/LocalizationStringUtil.h"
+#include "Common/LocalizationSettings.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp
index c8b87071..4b8f6bcf 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.cpp
+++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp
@@ -3,11 +3,11 @@
 
 #include "pch.h"
 #include "StandardCalculatorViewModel.h"
-#include "Common\CalculatorButtonPressedEventArgs.h"
-#include "Common\LocalizationStringUtil.h"
-#include "Common\LocalizationSettings.h"
-#include "Common\CopyPasteManager.h"
-#include "Common\TraceLogger.h"
+#include "Common/CalculatorButtonPressedEventArgs.h"
+#include "Common/LocalizationStringUtil.h"
+#include "Common/LocalizationSettings.h"
+#include "Common/CopyPasteManager.h"
+#include "Common/TraceLogger.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.h b/src/CalcViewModel/StandardCalculatorViewModel.h
index 7fb311c5..91ff9da0 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.h
+++ b/src/CalcViewModel/StandardCalculatorViewModel.h
@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 #pragma once
-#include "Common\Automation\NarratorAnnouncement.h"
-#include "Common\DisplayExpressionToken.h"
-#include "Common\CalculatorDisplay.h"
-#include "Common\EngineResourceProvider.h"
-#include "Common\CalculatorButtonUser.h"
+#include "Common/Automation/NarratorAnnouncement.h"
+#include "Common/DisplayExpressionToken.h"
+#include "Common/CalculatorDisplay.h"
+#include "Common/EngineResourceProvider.h"
+#include "Common/CalculatorButtonUser.h"
 #include "HistoryViewModel.h"
 #include "MemoryItemViewModel.h"
 
diff --git a/src/CalcViewModel/UnitConverterViewModel.cpp b/src/CalcViewModel/UnitConverterViewModel.cpp
index 93605309..393165eb 100644
--- a/src/CalcViewModel/UnitConverterViewModel.cpp
+++ b/src/CalcViewModel/UnitConverterViewModel.cpp
@@ -4,15 +4,15 @@
 #include "pch.h"
 #include "UnitConverterViewModel.h"
 #include "CalcManager/Header Files/EngineStrings.h"
-#include "Common\CalculatorButtonPressedEventArgs.h"
-#include "Common\CopyPasteManager.h"
-#include "Common\LocalizationStringUtil.h"
-#include "Common\LocalizationService.h"
-#include "Common\LocalizationSettings.h"
-#include "Common\TraceLogger.h"
-#include "DataLoaders\CurrencyHttpClient.h"
-#include "DataLoaders\CurrencyDataLoader.h"
-#include "DataLoaders\UnitConverterDataLoader.h"
+#include "Common/CalculatorButtonPressedEventArgs.h"
+#include "Common/CopyPasteManager.h"
+#include "Common/LocalizationStringUtil.h"
+#include "Common/LocalizationService.h"
+#include "Common/LocalizationSettings.h"
+#include "Common/TraceLogger.h"
+#include "DataLoaders/CurrencyHttpClient.h"
+#include "DataLoaders/CurrencyDataLoader.h"
+#include "DataLoaders/UnitConverterDataLoader.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
@@ -674,7 +674,7 @@ void UnitConverterViewModel::Deserialize(Platform::String^ state)
     RaisePropertyChanged(nullptr);  // Update since all props have been updated.
 }
 
-//Saving User Prefernces of Category and Associated-Units across Sessions. 
+//Saving User Preferences of Category and Associated-Units across Sessions. 
 void UnitConverterViewModel::SaveUserPreferences()
 {
     if (UnitsAreValid())
@@ -695,7 +695,7 @@ void UnitConverterViewModel::SaveUserPreferences()
     }
 }
 
-//Restoring User Prefernces of Category and Associated-Units.
+//Restoring User Preferences of Category and Associated-Units.
 void UnitConverterViewModel::RestoreUserPreferences()
 {
     if (!IsCurrencyCurrentCategory)
diff --git a/src/CalcViewModel/UnitConverterViewModel.h b/src/CalcViewModel/UnitConverterViewModel.h
index 6aef9dc4..baabd860 100644
--- a/src/CalcViewModel/UnitConverterViewModel.h
+++ b/src/CalcViewModel/UnitConverterViewModel.h
@@ -74,7 +74,7 @@ namespace CalculatorApp
                 Platform::String^ get() { return ref new Platform::String(m_original.abbreviation.c_str()); }
             }
 
-            // This method is used to return the desired automation name for default unit in UnitConveter combo box.
+            // This method is used to return the desired automation name for default unit in UnitConverter combo box.
             Platform::String^ ToString() override
             {
                 return AccessibleName;
@@ -243,7 +243,7 @@ namespace CalculatorApp
             Platform::String^ Serialize();
             void Deserialize(Platform::String^ state);
             
-            //Saving And Restoring User Prefernces of Category and Associated-Units across Sessions.
+            //Saving And Restoring User Preferences of Category and Associated-Units across Sessions.
             void SaveUserPreferences();
             void RestoreUserPreferences();
 
@@ -333,7 +333,7 @@ namespace CalculatorApp
             std::wstring m_valueFromUnlocalized;
             std::wstring m_valueToUnlocalized;
             bool m_relocalizeStringOnSwitch;
-            // For Saving the User Preferences only if the Unit convertyer ViewModel is initialised for the first time
+            // For Saving the User Preferences only if the Unit converter ViewModel is initialised for the first time
             bool m_IsFirstTime;
 
             Platform::String^ m_localizedValueFromFormat;
diff --git a/src/CalcViewModel/pch.h b/src/CalcViewModel/pch.h
index 01a40fad..b2717d17 100644
--- a/src/CalcViewModel/pch.h
+++ b/src/CalcViewModel/pch.h
@@ -28,12 +28,12 @@
 #include <regex>
 
 // C++\WinRT Headers
-#include "winrt\base.h"
-#include "winrt\Windows.Foundation.Diagnostics.h"
-#include "winrt\Windows.Globalization.h"
-#include "winrt\Windows.Globalization.DateTimeFormatting.h"
-#include "winrt\Windows.System.UserProfile.h"
-#include "winrt\Windows.UI.Xaml.h"
+#include "winrt/base.h"
+#include "winrt/Windows.Foundation.Diagnostics.h"
+#include "winrt/Windows.Globalization.h"
+#include "winrt/Windows.Globalization.DateTimeFormatting.h"
+#include "winrt/Windows.System.UserProfile.h"
+#include "winrt/Windows.UI.Xaml.h"
 
 // The following namespaces exist as a convenience to resolve
 // ambiguity for Windows types in the Windows::UI::Xaml::Automation::Peers
diff --git a/src/Calculator/Calculator.vcxproj b/src/Calculator/Calculator.vcxproj
index 7dd449e1..60aef8f3 100644
--- a/src/Calculator/Calculator.vcxproj
+++ b/src/Calculator/Calculator.vcxproj
@@ -844,7 +844,7 @@
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.props'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets'))" />
diff --git a/src/Calculator/Common/AlwaysSelectedCollectionView.h b/src/Calculator/Common/AlwaysSelectedCollectionView.h
index 3f65fb7e..2cc85101 100644
--- a/src/Calculator/Common/AlwaysSelectedCollectionView.h
+++ b/src/Calculator/Common/AlwaysSelectedCollectionView.h
@@ -275,7 +275,7 @@ namespace CalculatorApp { namespace Common
             return Windows::UI::Xaml::DependencyProperty::UnsetValue;  // Can't convert
         }
 
-        virtual Platform::Object^ ConverBack(
+        virtual Platform::Object^ ConvertBack(
             Platform::Object^ /*value*/, 
             Windows::UI::Xaml::Interop::TypeName /*targetType*/, 
             Platform::Object^ /*parameter*/, 
diff --git a/src/Calculator/Common/AppLifecycleLogger.cpp b/src/Calculator/Common/AppLifecycleLogger.cpp
index 342cc19e..983deac6 100644
--- a/src/Calculator/Common/AppLifecycleLogger.cpp
+++ b/src/Calculator/Common/AppLifecycleLogger.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "AppLifecycleLogger.h"
-#include "CalcViewModel\Common\TraceActivity.h"
+#include "CalcViewModel/Common/TraceActivity.h"
 
 using namespace std;
 using namespace winrt;
diff --git a/src/Calculator/Common/TitleBarHelper.cpp b/src/Calculator/Common/TitleBarHelper.cpp
index 82067308..18e8be94 100644
--- a/src/Calculator/Common/TitleBarHelper.cpp
+++ b/src/Calculator/Common/TitleBarHelper.cpp
@@ -3,8 +3,8 @@
 
 #include "pch.h"
 #include "TitleBarHelper.h"
-#include "Converters\BooleanToVisibilityConverter.h"
-#include "CalcViewModel\ViewState.h"
+#include "Converters/BooleanToVisibilityConverter.h"
+#include "CalcViewModel/ViewState.h"
 
 using namespace CalculatorApp::Common;
 using namespace CalculatorApp::Converters;
diff --git a/src/Calculator/Controls/AppBar.h b/src/Calculator/Controls/AppBar.h
index 3f8053c6..b6ac3740 100644
--- a/src/Calculator/Controls/AppBar.h
+++ b/src/Calculator/Controls/AppBar.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Common\KeyboardShortcutManager.h"
+#include "Common/KeyboardShortcutManager.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Controls/CalculationResult.cpp b/src/Calculator/Controls/CalculationResult.cpp
index 22f938af..8896617f 100644
--- a/src/Calculator/Controls/CalculationResult.cpp
+++ b/src/Calculator/Controls/CalculationResult.cpp
@@ -4,7 +4,7 @@
 #include "pch.h"
 #include "CalculationResult.h"
 #include "CalculationResultAutomationPeer.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Controls;
diff --git a/src/Calculator/Controls/CalculationResultAutomationPeer.h b/src/Calculator/Controls/CalculationResultAutomationPeer.h
index 7882d7bc..afdaa8ba 100644
--- a/src/Calculator/Controls/CalculationResultAutomationPeer.h
+++ b/src/Calculator/Controls/CalculationResultAutomationPeer.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Controls\CalculationResult.h"
+#include "Controls/CalculationResult.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Controls/CalculatorButton.cpp b/src/Calculator/Controls/CalculatorButton.cpp
index 9d385efe..68efc005 100644
--- a/src/Calculator/Controls/CalculatorButton.cpp
+++ b/src/Calculator/Controls/CalculatorButton.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "CalculatorButton.h"
-#include "CalcViewModel\Common\CalculatorButtonPressedEventArgs.h"
+#include "CalcViewModel/Common/CalculatorButtonPressedEventArgs.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp
index 2e071020..ed7faaf8 100644
--- a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp
+++ b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "Controls\OverflowTextBlock.h"
+#include "Controls/OverflowTextBlock.h"
 #include "OverflowTextBlockAutomationPeer.h"
 
 using namespace Windows::UI::Xaml::Automation::Peers;
diff --git a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.h b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.h
index 842dcc4a..8cb86d0b 100644
--- a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.h
+++ b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Controls\OverflowTextBlock.h"
+#include "Controls/OverflowTextBlock.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Controls/RadixButton.cpp b/src/Calculator/Controls/RadixButton.cpp
index e0086486..63fd7a64 100644
--- a/src/Calculator/Controls/RadixButton.cpp
+++ b/src/Calculator/Controls/RadixButton.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "RadixButton.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Controls/SupplementaryItemsControl.cpp b/src/Calculator/Controls/SupplementaryItemsControl.cpp
index d0529d51..d5bc00a4 100644
--- a/src/Calculator/Controls/SupplementaryItemsControl.cpp
+++ b/src/Calculator/Controls/SupplementaryItemsControl.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "SupplementaryItemsControl.h"
-#include "CalcViewModel\UnitConverterViewModel.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Controls;
diff --git a/src/Calculator/Converters/BitFlipAutomationNameConverter.cpp b/src/Calculator/Converters/BitFlipAutomationNameConverter.cpp
index 713a7480..667e4ae2 100644
--- a/src/Calculator/Converters/BitFlipAutomationNameConverter.cpp
+++ b/src/Calculator/Converters/BitFlipAutomationNameConverter.cpp
@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
 #include "BitFlipAutomationNameConverter.h"
 
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Converters/ExpressionItemContainerStyle.cpp b/src/Calculator/Converters/ExpressionItemContainerStyle.cpp
index 0c494d36..d99332c1 100644
--- a/src/Calculator/Converters/ExpressionItemContainerStyle.cpp
+++ b/src/Calculator/Converters/ExpressionItemContainerStyle.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "ExpressionItemContainerStyle.h"
-#include "CalcViewModel\Common\DisplayExpressionToken.h"
+#include "CalcViewModel/Common/DisplayExpressionToken.h"
 
 using namespace CalculatorApp::Common;
 
diff --git a/src/Calculator/Converters/ExpressionItemTemplateSelector.cpp b/src/Calculator/Converters/ExpressionItemTemplateSelector.cpp
index aa4cb646..9bacec98 100644
--- a/src/Calculator/Converters/ExpressionItemTemplateSelector.cpp
+++ b/src/Calculator/Converters/ExpressionItemTemplateSelector.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "ExpressionItemTemplateSelector.h"
-#include "CalcViewModel\Common\DisplayExpressionToken.h"
+#include "CalcViewModel/Common/DisplayExpressionToken.h"
 
 using namespace CalculatorApp::Common;
 
diff --git a/src/Calculator/DesignData/DesignStandardCalculatorViewModel.h b/src/Calculator/DesignData/DesignStandardCalculatorViewModel.h
index 916ff1b3..ffeac25c 100644
--- a/src/Calculator/DesignData/DesignStandardCalculatorViewModel.h
+++ b/src/Calculator/DesignData/DesignStandardCalculatorViewModel.h
@@ -22,7 +22,7 @@ namespace Numbers
             OBSERVABLE_PROPERTY_RW(Platform::String^, SlotValue);
         };
 
-        // This class is to be consumbed exclusively by Blend and the VS designer
+        // This class is to be consumed exclusively by Blend and the VS designer
         // with this class Blend will be able to populate the controls, the CalculationResults control for example,
         // with the hardcoded strings so whoever is working on the UI can actually see how the app would look like 
         // with semi-realistic data.
diff --git a/src/Calculator/Resources/en-GB/Resources.resw b/src/Calculator/Resources/en-GB/Resources.resw
index e89ffae7..6c14824e 100644
--- a/src/Calculator/Resources/en-GB/Resources.resw
+++ b/src/Calculator/Resources/en-GB/Resources.resw
@@ -2601,7 +2601,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x or</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>and</value>
diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index e7383a35..ca9ee82c 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -3085,7 +3085,7 @@
   </data>
   <data name="xorButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>x or</value>
-    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronounciation.</comment>
+    <comment>Auditory feedback for Screen Reader users. Users will hear "Display is 7 x or" when the button is pressed. XOR is a mathematical operation on two binary values. Here the feedback is "x or" in order to get the correct pronunciation.</comment>
   </data>
   <data name="andButton.[using:CalculatorApp.Controls]CalculatorButton.AuditoryFeedback" xml:space="preserve">
     <value>and</value>
diff --git a/src/Calculator/Views/Calculator.xaml.h b/src/Calculator/Views/Calculator.xaml.h
index ca385e68..3ec3feac 100644
--- a/src/Calculator/Views/Calculator.xaml.h
+++ b/src/Calculator/Views/Calculator.xaml.h
@@ -3,22 +3,22 @@
 
 #pragma once
 
-#include "Views\Calculator.g.h"
-#include "Converters\BooleanNegationConverter.h"
-#include "Converters\ExpressionItemContainerStyle.h"
-#include "Converters\ExpressionItemTemplateSelector.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\Common\Automation\NarratorNotifier.h"
-#include "Controls\CalculatorButton.h"
-#include "Controls\CalculationResult.h"
-#include "Controls\OverflowTextBlock.h"
-#include "CalcViewModel\HistoryViewModel.h"
-#include "Views\CalculatorProgrammerDisplayPanel.xaml.h"
-#include "Views\CalculatorProgrammerOperators.xaml.h"
-#include "Views\CalculatorScientificAngleButtons.xaml.h"
-#include "Views\HistoryList.xaml.h"
-#include "Views\Memory.xaml.h"
-#include "Views\OperatorsPanel.xaml.h"
+#include "Views/Calculator.g.h"
+#include "Converters/BooleanNegationConverter.h"
+#include "Converters/ExpressionItemContainerStyle.h"
+#include "Converters/ExpressionItemTemplateSelector.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/Common/Automation/NarratorNotifier.h"
+#include "Controls/CalculatorButton.h"
+#include "Controls/CalculationResult.h"
+#include "Controls/OverflowTextBlock.h"
+#include "CalcViewModel/HistoryViewModel.h"
+#include "Views/CalculatorProgrammerDisplayPanel.xaml.h"
+#include "Views/CalculatorProgrammerOperators.xaml.h"
+#include "Views/CalculatorScientificAngleButtons.xaml.h"
+#include "Views/HistoryList.xaml.h"
+#include "Views/Memory.xaml.h"
+#include "Views/OperatorsPanel.xaml.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp
index a6b8bfeb..579c627e 100644
--- a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp
+++ b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp
@@ -23,7 +23,7 @@ using namespace Windows::UI::Xaml::Controls;
 using namespace Windows::UI::Xaml::Data;
 using namespace Windows::UI::Xaml::Input;
 
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
 CalculatorProgrammerBitFlipPanel::CalculatorProgrammerBitFlipPanel() :
     m_updatingCheckedStates(false)
diff --git a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.h b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.h
index 4db8ce00..bc4ac12a 100644
--- a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.h
+++ b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.h
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "Views\CalculatorProgrammerBitFlipPanel.g.h"
-#include "Controls\FlipButtons.h"
-#include "Converters\BitFlipAutomationNameConverter.h"
-#include "Converters\BooleanNegationConverter.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/CalculatorProgrammerBitFlipPanel.g.h"
+#include "Controls/FlipButtons.h"
+#include "Converters/BitFlipAutomationNameConverter.h"
+#include "Converters/BooleanNegationConverter.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.h b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.h
index 83df0073..35340636 100644
--- a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.h
+++ b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "Views\CalculatorProgrammerDisplayPanel.g.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/CalculatorProgrammerDisplayPanel.g.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.h b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.h
index 1b006df0..28308282 100644
--- a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.h
+++ b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "Views\CalculatorProgrammerOperators.g.h"
-#include "Controls\RadixButton.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/CalculatorProgrammerOperators.g.h"
+#include "Controls/RadixButton.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
index 4c599aee..60a628bf 100644
--- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
+++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
@@ -8,9 +8,9 @@
 
 #include "pch.h"
 #include "CalculatorProgrammerRadixOperators.xaml.h"
-#include "Controls\CalculatorButton.h"
-#include "Converters\BooleanToVisibilityConverter.h"
-#include "Views\NumberPad.xaml.h"
+#include "Controls/CalculatorButton.h"
+#include "Converters/BooleanToVisibilityConverter.h"
+#include "Views/NumberPad.xaml.h"
 
 using namespace CalculatorApp;
 
diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h
index ad13f2b5..7aae73f4 100644
--- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h
+++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "Views\CalculatorProgrammerRadixOperators.g.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/CalculatorProgrammerRadixOperators.g.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp
index 981b2168..16f0cc5d 100644
--- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp
+++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp
@@ -27,7 +27,7 @@ using namespace Windows::UI::Xaml::Navigation;
 using namespace Windows::UI::ViewManagement;
 using namespace Windows::UI::Core;
 
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
 CalculatorScientificAngleButtons::CalculatorScientificAngleButtons() :
     m_isErrorVisualState(false)
diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.h b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.h
index eeac9d5d..286d04ba 100644
--- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.h
+++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "Views\CalculatorScientificAngleButtons.g.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/CalculatorScientificAngleButtons.g.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp b/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
index 013d7dd7..47998496 100644
--- a/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
+++ b/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
@@ -8,9 +8,9 @@
 
 #include "pch.h"
 #include "CalculatorScientificOperators.xaml.h"
-#include "CalcViewModel\Common\KeyboardShortcutManager.h"
-#include "Controls\CalculatorButton.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "CalcViewModel/Common/KeyboardShortcutManager.h"
+#include "Controls/CalculatorButton.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml.h b/src/Calculator/Views/CalculatorScientificOperators.xaml.h
index 81172a7a..ae35e492 100644
--- a/src/Calculator/Views/CalculatorScientificOperators.xaml.h
+++ b/src/Calculator/Views/CalculatorScientificOperators.xaml.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "Views\CalculatorScientificOperators.g.h"
-#include "Views\NumberPad.xaml.h"
-#include "Converters\BooleanNegationConverter.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/CalculatorScientificOperators.g.h"
+#include "Views/NumberPad.xaml.h"
+#include "Converters/BooleanNegationConverter.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorStandardOperators.xaml.cpp b/src/Calculator/Views/CalculatorStandardOperators.xaml.cpp
index 672d1a6e..a74a91f8 100644
--- a/src/Calculator/Views/CalculatorStandardOperators.xaml.cpp
+++ b/src/Calculator/Views/CalculatorStandardOperators.xaml.cpp
@@ -22,7 +22,7 @@ using namespace Windows::UI::Xaml::Input;
 using namespace Windows::UI::Xaml::Media;
 using namespace Windows::UI::Xaml::Navigation;
 
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
 CalculatorStandardOperators::CalculatorStandardOperators() :
     m_isErrorVisualState(false)
diff --git a/src/Calculator/Views/CalculatorStandardOperators.xaml.h b/src/Calculator/Views/CalculatorStandardOperators.xaml.h
index fa6ecea1..6d3d2eea 100644
--- a/src/Calculator/Views/CalculatorStandardOperators.xaml.h
+++ b/src/Calculator/Views/CalculatorStandardOperators.xaml.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "Views\CalculatorStandardOperators.g.h"
-#include "Views\NumberPad.xaml.h"
+#include "Views/CalculatorStandardOperators.g.h"
+#include "Views/NumberPad.xaml.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/DateCalculator.xaml.cpp b/src/Calculator/Views/DateCalculator.xaml.cpp
index 386e5243..0df8cd3e 100644
--- a/src/Calculator/Views/DateCalculator.xaml.cpp
+++ b/src/Calculator/Views/DateCalculator.xaml.cpp
@@ -36,7 +36,7 @@ using namespace Windows::UI::Xaml::Input;
 using namespace Windows::UI::Xaml::Media;
 using namespace Windows::UI::Xaml::Navigation;
 
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
 DateCalculator::DateCalculator()
 {
diff --git a/src/Calculator/Views/DateCalculator.xaml.h b/src/Calculator/Views/DateCalculator.xaml.h
index 414dc6bb..92218090 100644
--- a/src/Calculator/Views/DateCalculator.xaml.h
+++ b/src/Calculator/Views/DateCalculator.xaml.h
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "Converters\BooleanNegationConverter.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "Views\DateCalculator.g.h"
+#include "Converters/BooleanNegationConverter.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "Views/DateCalculator.g.h"
 
 // We choose 2550 as the max year because CalendarDatePicker experiences clipping
 // issues just after 2558.  We would like 9999 but will need to wait for a platform
diff --git a/src/Calculator/Views/HistoryList.xaml.cpp b/src/Calculator/Views/HistoryList.xaml.cpp
index 0705884e..de4a96c4 100644
--- a/src/Calculator/Views/HistoryList.xaml.cpp
+++ b/src/Calculator/Views/HistoryList.xaml.cpp
@@ -8,7 +8,7 @@
 
 #include "pch.h"
 #include "HistoryList.xaml.h"
-#include "CalcViewModel\Common\LocalizationService.h"
+#include "CalcViewModel/Common/LocalizationService.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
@@ -29,7 +29,7 @@ using namespace Windows::UI::ViewManagement;
 
 namespace MUXC = Microsoft::UI::Xaml::Controls;
 
-// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=390556
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=390556
 
 DEPENDENCY_PROPERTY_INITIALIZATION(HistoryList, RowHeight);
 
diff --git a/src/Calculator/Views/HistoryList.xaml.h b/src/Calculator/Views/HistoryList.xaml.h
index ed43f3e9..f4e44399 100644
--- a/src/Calculator/Views/HistoryList.xaml.h
+++ b/src/Calculator/Views/HistoryList.xaml.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "Views\HistoryList.g.h"
-#include "Common\TitleBarHelper.h"
-#include "Converters\ItemSizeToVisibilityConverter.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\HistoryViewModel.h"
+#include "Views/HistoryList.g.h"
+#include "Common/TitleBarHelper.h"
+#include "Converters/ItemSizeToVisibilityConverter.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/HistoryViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/MainPage.xaml.h b/src/Calculator/Views/MainPage.xaml.h
index 4db633e6..96a5ff76 100644
--- a/src/Calculator/Views/MainPage.xaml.h
+++ b/src/Calculator/Views/MainPage.xaml.h
@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include "Views\Calculator.xaml.h"
-#include "Views\MainPage.g.h"
-#include "Views\DateCalculator.xaml.h"
-#include "Views\UnitConverter.xaml.h"
-#include "CalcViewModel\ApplicationViewModel.h"
-#include "Views\TitleBar.xaml.h"
+#include "Views/Calculator.xaml.h"
+#include "Views/MainPage.g.h"
+#include "Views/DateCalculator.xaml.h"
+#include "Views/UnitConverter.xaml.h"
+#include "CalcViewModel/ApplicationViewModel.h"
+#include "Views/TitleBar.xaml.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/Memory.xaml.cpp b/src/Calculator/Views/Memory.xaml.cpp
index ab69417b..7aa60118 100644
--- a/src/Calculator/Views/Memory.xaml.cpp
+++ b/src/Calculator/Views/Memory.xaml.cpp
@@ -8,9 +8,9 @@
 
 #include "pch.h"
 #include "Memory.xaml.h"
-#include "Controls\CalculatorButton.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\Common\LocalizationService.h"
+#include "Controls/CalculatorButton.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
+#include "CalcViewModel/Common/LocalizationService.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
@@ -31,7 +31,7 @@ using namespace Windows::UI::Xaml::Media;
 using namespace Windows::UI::Xaml::Navigation;
 using namespace Windows::UI::ViewManagement;
 
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
 DEPENDENCY_PROPERTY_INITIALIZATION(Memory, RowHeight);
 
diff --git a/src/Calculator/Views/Memory.xaml.h b/src/Calculator/Views/Memory.xaml.h
index 3abee323..7a3e2da5 100644
--- a/src/Calculator/Views/Memory.xaml.h
+++ b/src/Calculator/Views/Memory.xaml.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "Views\Memory.g.h"
-#include "Common\TitleBarHelper.h"
-#include "Converters\BooleanNegationConverter.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/Memory.g.h"
+#include "Common/TitleBarHelper.h"
+#include "Converters/BooleanNegationConverter.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/MemoryListItem.xaml.cpp b/src/Calculator/Views/MemoryListItem.xaml.cpp
index f6a79fed..313607af 100644
--- a/src/Calculator/Views/MemoryListItem.xaml.cpp
+++ b/src/Calculator/Views/MemoryListItem.xaml.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "MemoryListItem.xaml.h"
-#include "Controls\CalculatorButton.h"
+#include "Controls/CalculatorButton.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Views/MemoryListItem.xaml.h b/src/Calculator/Views/MemoryListItem.xaml.h
index 9f249446..6bfd5155 100644
--- a/src/Calculator/Views/MemoryListItem.xaml.h
+++ b/src/Calculator/Views/MemoryListItem.xaml.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "Views\MemoryListItem.g.h"
-#include "CalcViewModel\MemoryItemViewModel.h"
+#include "Views/MemoryListItem.g.h"
+#include "CalcViewModel/MemoryItemViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/NumberPad.xaml.cpp b/src/Calculator/Views/NumberPad.xaml.cpp
index 7c51f040..1e179d29 100644
--- a/src/Calculator/Views/NumberPad.xaml.cpp
+++ b/src/Calculator/Views/NumberPad.xaml.cpp
@@ -8,9 +8,9 @@
 
 #include "pch.h"
 #include "NumberPad.xaml.h"
-#include "Controls\CalculatorButton.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "Controls/CalculatorButton.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::ViewModel;
@@ -27,7 +27,7 @@ using namespace Windows::UI::Xaml::Media;
 using namespace Windows::UI::Xaml::Navigation;
 using namespace CalculatorApp::Common;
 
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
 DEPENDENCY_PROPERTY_INITIALIZATION(NumberPad, ButtonStyle);
 
diff --git a/src/Calculator/Views/NumberPad.xaml.h b/src/Calculator/Views/NumberPad.xaml.h
index af4f2196..61b978e6 100644
--- a/src/Calculator/Views/NumberPad.xaml.h
+++ b/src/Calculator/Views/NumberPad.xaml.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "Views\NumberPad.g.h"
-#include "CalcViewModel\Common\KeyboardShortcutManager.h"
+#include "Views/NumberPad.g.h"
+#include "CalcViewModel/Common/KeyboardShortcutManager.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/OperatorsPanel.xaml.h b/src/Calculator/Views/OperatorsPanel.xaml.h
index 42c53020..dce811d4 100644
--- a/src/Calculator/Views/OperatorsPanel.xaml.h
+++ b/src/Calculator/Views/OperatorsPanel.xaml.h
@@ -3,11 +3,11 @@
 
 #pragma once
 
-#include "Views\OperatorsPanel.g.h"
-#include "Views\CalculatorStandardOperators.xaml.h"
-#include "Views\CalculatorScientificOperators.xaml.h"
-#include "Views\CalculatorProgrammerBitFlipPanel.xaml.h"
-#include "Views\CalculatorProgrammerRadixOperators.xaml.h"
+#include "Views/OperatorsPanel.g.h"
+#include "Views/CalculatorStandardOperators.xaml.h"
+#include "Views/CalculatorScientificOperators.xaml.h"
+#include "Views/CalculatorProgrammerBitFlipPanel.xaml.h"
+#include "Views/CalculatorProgrammerRadixOperators.xaml.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/SupplementaryResults.xaml.cpp b/src/Calculator/Views/SupplementaryResults.xaml.cpp
index e5d10494..d598ae93 100644
--- a/src/Calculator/Views/SupplementaryResults.xaml.cpp
+++ b/src/Calculator/Views/SupplementaryResults.xaml.cpp
@@ -25,7 +25,7 @@ using namespace Windows::UI::Xaml::Interop;
 using namespace Windows::UI::Xaml::Media;
 using namespace Windows::UI::Xaml::Navigation;
 
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
 Object^ DelighterUnitToStyleConverter::Convert(Object^ value, TypeName /*targetType*/, Object^ /*parameter*/, String^ /*language*/)
 {
diff --git a/src/Calculator/Views/SupplementaryResults.xaml.h b/src/Calculator/Views/SupplementaryResults.xaml.h
index 6630fc1c..1d94b0ab 100644
--- a/src/Calculator/Views/SupplementaryResults.xaml.h
+++ b/src/Calculator/Views/SupplementaryResults.xaml.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "Views\SupplementaryResults.g.h"
-#include "Controls\SupplementaryItemsControl.h"
-#include "Controls\OperandTextBox.h"
-#include "Controls\OperatorTextBox.h"
-#include "CalcViewModel\UnitConverterViewModel.h"
+#include "Views/SupplementaryResults.g.h"
+#include "Controls/SupplementaryItemsControl.h"
+#include "Controls/OperandTextBox.h"
+#include "Controls/OperatorTextBox.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/TitleBar.xaml.cpp b/src/Calculator/Views/TitleBar.xaml.cpp
index d08739cd..e66413c6 100644
--- a/src/Calculator/Views/TitleBar.xaml.cpp
+++ b/src/Calculator/Views/TitleBar.xaml.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "TitleBar.xaml.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
 
 using namespace std;
 using namespace Platform;
diff --git a/src/Calculator/Views/TitleBar.xaml.h b/src/Calculator/Views/TitleBar.xaml.h
index 8945aa59..85a360b7 100644
--- a/src/Calculator/Views/TitleBar.xaml.h
+++ b/src/Calculator/Views/TitleBar.xaml.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Views\TitleBar.g.h"
+#include "Views/TitleBar.g.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/UnitConverter.xaml.cpp b/src/Calculator/Views/UnitConverter.xaml.cpp
index add80774..a4889a55 100644
--- a/src/Calculator/Views/UnitConverter.xaml.cpp
+++ b/src/Calculator/Views/UnitConverter.xaml.cpp
@@ -6,13 +6,13 @@
 
 #include "pch.h"
 #include "UnitConverter.xaml.h"
-#include "CalcViewModel\UnitConverterViewModel.h"
-#include "Controls\CalculationResult.h"
-#include "Controls\CalculatorButton.h"
-#include "CalcViewModel\Common\CopyPasteManager.h"
-#include "CalcViewModel\Common\KeyboardShortcutManager.h"
-#include "CalcViewModel\Common\LocalizationService.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
+#include "Controls/CalculationResult.h"
+#include "Controls/CalculatorButton.h"
+#include "CalcViewModel/Common/CopyPasteManager.h"
+#include "CalcViewModel/Common/KeyboardShortcutManager.h"
+#include "CalcViewModel/Common/LocalizationService.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
@@ -38,7 +38,7 @@ using namespace Windows::UI::Xaml::Media;
 using namespace Windows::UI::Xaml::Navigation;
 using namespace Windows::UI::ViewManagement;
 
-// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
 // Calculate number of 100-nanosecond intervals in 500 milliseconds.
 // There are 10,000 intervals in 1 ms.
diff --git a/src/Calculator/Views/UnitConverter.xaml.h b/src/Calculator/Views/UnitConverter.xaml.h
index c65c6aa0..b4b84449 100644
--- a/src/Calculator/Views/UnitConverter.xaml.h
+++ b/src/Calculator/Views/UnitConverter.xaml.h
@@ -6,13 +6,13 @@
 
 #pragma once
 
-#include "Views\UnitConverter.g.h"
-#include "Common\AlwaysSelectedCollectionView.h"
-#include "CalcViewModel\Common\ValidatingConverters.h"
-#include "Converters\BooleanToVisibilityConverter.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\UnitConverterViewModel.h"
-#include "Views\StateTriggers\AspectRatioTrigger.h"
+#include "Views/UnitConverter.g.h"
+#include "Common/AlwaysSelectedCollectionView.h"
+#include "CalcViewModel/Common/ValidatingConverters.h"
+#include "Converters/BooleanToVisibilityConverter.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
+#include "Views/StateTriggers/AspectRatioTrigger.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/pch.h b/src/Calculator/pch.h
index c393e82a..92d16671 100644
--- a/src/Calculator/pch.h
+++ b/src/Calculator/pch.h
@@ -23,15 +23,15 @@
 #include <regex>
 
 // C++\WinRT Headers
-#include "winrt\base.h"
-#include "winrt\Windows.ApplicationModel.h"
-#include "winrt\Windows.ApplicationModel.Core.h"
-#include "winrt\Windows.Foundation.Diagnostics.h"
-#include "winrt\Windows.Globalization.h"
-#include "winrt\Windows.Globalization.DateTimeFormatting.h"
-#include "winrt\Windows.System.UserProfile.h"
-#include "winrt\Windows.UI.ViewManagement.h"
-#include "winrt\Windows.UI.Xaml.h"
+#include "winrt/base.h"
+#include "winrt/Windows.ApplicationModel.h"
+#include "winrt/Windows.ApplicationModel.Core.h"
+#include "winrt/Windows.Foundation.Diagnostics.h"
+#include "winrt/Windows.Globalization.h"
+#include "winrt/Windows.Globalization.DateTimeFormatting.h"
+#include "winrt/Windows.System.UserProfile.h"
+#include "winrt/Windows.UI.ViewManagement.h"
+#include "winrt/Windows.UI.Xaml.h"
 
 // The following namespaces exist as a convenience to resolve
 // ambiguity for Windows types in the Windows::UI::Xaml::Automation::Peers
diff --git a/src/CalculatorUnitTests/AsyncHelper.h b/src/CalculatorUnitTests/AsyncHelper.h
index de3a88ea..3ad6c1d1 100644
--- a/src/CalculatorUnitTests/AsyncHelper.h
+++ b/src/CalculatorUnitTests/AsyncHelper.h
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #pragma once
-#include <wrl\wrappers\corewrappers.h>
+#include <wrl/wrappers/corewrappers.h>
 
 namespace CalculatorApp
 {
diff --git a/src/CalculatorUnitTests/CalcEngineTests.cpp b/src/CalculatorUnitTests/CalcEngineTests.cpp
index 402f5314..1b9bc576 100644
--- a/src/CalculatorUnitTests/CalcEngineTests.cpp
+++ b/src/CalculatorUnitTests/CalcEngineTests.cpp
@@ -4,7 +4,7 @@
 #include "pch.h"
 #include <CppUnitTest.h>
 
-#include "CalcViewModel\Common\EngineResourceProvider.h"
+#include "CalcViewModel/Common/EngineResourceProvider.h"
 
 using namespace std;
 using namespace CalculatorApp;
diff --git a/src/CalculatorUnitTests/CalculatorManagerTest.cpp b/src/CalculatorUnitTests/CalculatorManagerTest.cpp
index 69ff55d3..37ceb429 100644
--- a/src/CalculatorUnitTests/CalculatorManagerTest.cpp
+++ b/src/CalculatorUnitTests/CalculatorManagerTest.cpp
@@ -5,8 +5,8 @@
 
 #include <CppUnitTest.h>
 
-#include "CalcManager\CalculatorHistory.h"
-#include "CalcViewModel\Common\EngineResourceProvider.h"
+#include "CalcManager/CalculatorHistory.h"
+#include "CalcViewModel/Common/EngineResourceProvider.h"
 
 using namespace CalculatorApp;
 using namespace CalculationManager;
@@ -260,7 +260,7 @@ namespace CalculatorManagerTest
             VERIFY_IS_LESS_THAN(0, pCalculatorDisplay->GetMaxDigitsCalledCount());
         }
 
-        void SerialzieAndDeSerialize()
+        void SerializeAndDeSerialize()
         {
             auto serializedCommands = m_calculatorManager->SerializeCommands();
             auto serializedMemory = m_calculatorManager->GetSerializedMemory();
@@ -278,7 +278,7 @@ namespace CalculatorManagerTest
             auto savedPrimary = m_calculatorDisplayTester->GetPrimaryDisplay();
             auto savedExpression = m_calculatorDisplayTester->GetExpression();
             auto savedMemory = m_calculatorDisplayTester->GetMemorizedNumbers();
-            SerialzieAndDeSerialize();
+            SerializeAndDeSerialize();
             VERIFY_ARE_EQUAL(savedPrimary, m_calculatorDisplayTester->GetPrimaryDisplay());
             VERIFY_ARE_EQUAL(savedExpression, m_calculatorDisplayTester->GetExpression());
             auto loadedMemory = m_calculatorDisplayTester->GetMemorizedNumbers();
@@ -889,7 +889,7 @@ namespace CalculatorManagerTest
         VerifyPersistence();
     }
 
-    // 1 + 2 then serialize and deserialze 3 times
+    // 1 + 2 then serialize and deserialize 3 times
     // Check if the values are persisted correctly
     void CalculatorManagerTest::CalculatorManagerTestSerializeMultiple()
     {
@@ -915,7 +915,7 @@ namespace CalculatorManagerTest
         Command commands[] = { Command::Command1, Command::CommandDIV, Command::Command3, Command::CommandEQU, Command::CommandNULL };
         ExecuteCommands(commands);
 
-        SerialzieAndDeSerialize();
+        SerializeAndDeSerialize();
 
         Command commands2[] = { Command::CommandMUL, Command::Command3, Command::CommandEQU, Command::CommandNULL };
         ExecuteCommands(commands2);
@@ -944,7 +944,7 @@ namespace CalculatorManagerTest
         wstring primaryDisplay = pCalculatorDisplay->GetPrimaryDisplay();
         wstring expressionDisplay = pCalculatorDisplay->GetExpression();
 
-        SerialzieAndDeSerialize();
+        SerializeAndDeSerialize();
 
         vector<wstring> memorizedNumbersAfterDeSerialize = pCalculatorDisplay->GetMemorizedNumbers();
         wstring primaryDisplayAfterDeSerialize = pCalculatorDisplay->GetPrimaryDisplay();
@@ -975,7 +975,7 @@ namespace CalculatorManagerTest
         primaryDisplay = pCalculatorDisplay->GetPrimaryDisplay();
         expressionDisplay = pCalculatorDisplay->GetExpression();
 
-        SerialzieAndDeSerialize();
+        SerializeAndDeSerialize();
 
         memorizedNumbersAfterDeSerialize = pCalculatorDisplay->GetMemorizedNumbers();
         primaryDisplayAfterDeSerialize = pCalculatorDisplay->GetPrimaryDisplay();
@@ -1016,7 +1016,7 @@ namespace CalculatorManagerTest
         primaryDisplay = pCalculatorDisplay->GetPrimaryDisplay();
         expressionDisplay = pCalculatorDisplay->GetExpression();
 
-        SerialzieAndDeSerialize();
+        SerializeAndDeSerialize();
 
         memorizedNumbersAfterDeSerialize = pCalculatorDisplay->GetMemorizedNumbers();
         primaryDisplayAfterDeSerialize = pCalculatorDisplay->GetPrimaryDisplay();
diff --git a/src/CalculatorUnitTests/CopyPasteManagerTest.cpp b/src/CalculatorUnitTests/CopyPasteManagerTest.cpp
index f06c0a87..2e90d845 100644
--- a/src/CalculatorUnitTests/CopyPasteManagerTest.cpp
+++ b/src/CalculatorUnitTests/CopyPasteManagerTest.cpp
@@ -4,8 +4,8 @@
 #include "pch.h"
 #include <CppUnitTest.h>
 
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\Common\CopyPasteManager.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
+#include "CalcViewModel/Common/CopyPasteManager.h"
 
 using namespace CalculationManager;
 using namespace CalculatorApp;
@@ -439,7 +439,7 @@ namespace CalculatorUnitTests
     12. octal numbers
     13. very large number
     14. number with some escape characters in b/w like ",/. \n\r ", '"
-    15. expression involving sin, cos or other mathematic functions
+    15. expression involving sin, cos or other mathematical functions
     16. expression having more than one operator in b/w operands
     17. expression involving open and close parenthesis (, )
 
@@ -483,25 +483,25 @@ namespace CalculatorUnitTests
     void CopyPasteManagerTest::ValidateProgrammerHexPasteExpressionTest()
     {
         String^ qwordPositiveInput[] = { L"123", L"123+456", L"1,234", L"1 2 3", L"1'2'3'4", L"1_2_3_4", L"12345e-23"/*note: here is considered as E of hex*/, L"\n\r1,234\n", L"\f\n1+2\t\r\v\x85", L"\f\n1+2\t\r\v\x85", L"\n 1+\n2 ", L"e+234", L"1\"2", L"(123)+(456)", L"abcdef", L"ABab", L"ABCDF21abc41a"/*within boundary*/, L"0x1234", L"0xab12", L"0X1234", L"AB12h", L"BC34H", L"1234u", L"1234ul", L"1234ULL", L"2+2=", L"2+2=   " };
-        String^ qwordNegativeInput[] = { L"+123", L"1.23"/*floating number*/, L"1''2", L"'123", L"123'", L"1__2", L"_123", L"123_", L"-133", L"1.2e+023", L"1.2e23"/*unsigned exponent*/, L"xyz", L"ABCDEF21abc41abc7"/*outside boundary of 16 digitis*/, L"SIN(2)", L"123+-234", L"1234x", L"A0x1234", L"0xx1234", L"1234uu", L"1234ulll", L"2+2==", L"2=+2" };
+        String^ qwordNegativeInput[] = { L"+123", L"1.23"/*floating number*/, L"1''2", L"'123", L"123'", L"1__2", L"_123", L"123_", L"-133", L"1.2e+023", L"1.2e23"/*unsigned exponent*/, L"xyz", L"ABCDEF21abc41abc7"/*outside boundary of 16 digits*/, L"SIN(2)", L"123+-234", L"1234x", L"A0x1234", L"0xx1234", L"1234uu", L"1234ulll", L"2+2==", L"2=+2" };
 
         ASSERT_POSITIVE_TESTCASES(ValidateProgrammerHexQwordPasteExpression, qwordPositiveInput);
         ASSERT_NEGATIVE_TESTCASES(ValidateProgrammerHexQwordPasteExpression, qwordNegativeInput);
 
         String^ dwordPositiveInput[] = { L"123", L"123+456", L"1,234", L"1 2 3", L"1'2'3'4", L"1_2_3_4", L"12345e-23"/*note: here is considered as E of hex*/, L"\n\r1,234\n", L"\f\n1+2\t\r\v\x85", L"\n 1+\n2 ", L"e+234", L"1\"2", L"(123)+(456)", L"abcdef", L"ABab", L"ABCD123a"/*within boundary*/, L"0x1234", L"0xab12", L"0X1234", L"AB12h", L"BC34H", L"1234u", L"1234ul", L"1234ULL" };
-        String^ dwordNegativeInput[] = { L"+123", L"1.23"/*floating number*/, L"1''2", L"'123", L"123'", L"1__2", L"_123", L"123_", L"-133", L"1.2e+023", L"1.2e23"/*unsigned exponent*/, L"xyz", L"ABCD123ab"/*outside boundary of 8 digitis*/, L"SIN(2)", L"123+-234", L"1234x", L"A0x1234", L"0xx1234", L"1234uu", L"1234ulll" };
+        String^ dwordNegativeInput[] = { L"+123", L"1.23"/*floating number*/, L"1''2", L"'123", L"123'", L"1__2", L"_123", L"123_", L"-133", L"1.2e+023", L"1.2e23"/*unsigned exponent*/, L"xyz", L"ABCD123ab"/*outside boundary of 8 digits*/, L"SIN(2)", L"123+-234", L"1234x", L"A0x1234", L"0xx1234", L"1234uu", L"1234ulll" };
 
         ASSERT_POSITIVE_TESTCASES(ValidateProgrammerHexDwordPasteExpression, dwordPositiveInput);
         ASSERT_NEGATIVE_TESTCASES(ValidateProgrammerHexDwordPasteExpression, dwordNegativeInput);
 
         String^ wordPositiveInput[] = { L"123", L"13+456", L"1,34", L"12 3", L"1'2'3'4", L"1_2_3_4", L"15e-23"/*note: here is considered as E of hex*/, L"\r1", L"\n\r1,4", L"\n1,4\n", L"\f\n1+2\t\r\v", L"\n 1+\n2 ", L"e+24", L"1\"2", L"(23)+(4)", L"aef", L"ABab", L"A1a3"/*within boundary*/, L"0x1234", L"0xab12", L"0X1234", L"AB12h", L"BC34H", L"1234u", L"1234ul", L"1234ULL" };
-        String^ wordNegativeInput[] = { L"+123", L"1.23"/*floating number*/, L"1''2", L"'123", L"123'", L"1__2", L"_123", L"123_", L"-133", L"1.2e+023", L"1.2e23"/*unsigned exponent*/, L"xyz", L"A1a3b"/*outside boundary of 4 digitis*/, L"SIN(2)", L"123+-234", L"1234x", L"A0x1234", L"0xx1234", L"1234uu", L"1234ulll" };
+        String^ wordNegativeInput[] = { L"+123", L"1.23"/*floating number*/, L"1''2", L"'123", L"123'", L"1__2", L"_123", L"123_", L"-133", L"1.2e+023", L"1.2e23"/*unsigned exponent*/, L"xyz", L"A1a3b"/*outside boundary of 4 digits*/, L"SIN(2)", L"123+-234", L"1234x", L"A0x1234", L"0xx1234", L"1234uu", L"1234ulll" };
 
         ASSERT_POSITIVE_TESTCASES(ValidateProgrammerHexWordPasteExpression, wordPositiveInput);
         ASSERT_NEGATIVE_TESTCASES(ValidateProgrammerHexWordPasteExpression, wordNegativeInput);
 
         String^ bytePositiveInput[] = { L"13", L"13+6", L"1,4", L"2 3", L"1'2", L"1_2", L"5e-3"/*note: here is considered as E of hex*/, L"\r1", L"a", L"ab", L"A1"/*within boundary*/, L"0x12", L"0xab", L"0X12", L"A9h", L"B8H", L"12u", L"12ul", L"12ULL" };
-        String^ byteNegativeInput[] = { L"+3", L"1.2"/*floating number*/, L"1''2", L"'12", L"12'", L"1__2", L"_12", L"12_", L"-3", L"1.1e+02", L"1.2e3"/*unsigned exponent*/, L"xz", L"A3a"/*outside boundary of 2 digitis*/, L"SIN(2)", L"13+-23", L"12x", L"A0x1", L"0xx12", L"12uu", L"12ulll" };
+        String^ byteNegativeInput[] = { L"+3", L"1.2"/*floating number*/, L"1''2", L"'12", L"12'", L"1__2", L"_12", L"12_", L"-3", L"1.1e+02", L"1.2e3"/*unsigned exponent*/, L"xz", L"A3a"/*outside boundary of 2 digits*/, L"SIN(2)", L"13+-23", L"12x", L"A0x1", L"0xx12", L"12uu", L"12ulll" };
 
         ASSERT_POSITIVE_TESTCASES(ValidateProgrammerHexBytePasteExpression, bytePositiveInput);
         ASSERT_NEGATIVE_TESTCASES(ValidateProgrammerHexBytePasteExpression, byteNegativeInput);
diff --git a/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp b/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp
index abb36123..ab7fa7e6 100644
--- a/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp
+++ b/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp
@@ -4,8 +4,8 @@
 #include "pch.h"
 #include <CppUnitTest.h>
 
-#include "CalcViewModel\DataLoaders\CurrencyDataLoader.h"
-#include "CalcViewModel\Common\LocalizationService.h"
+#include "CalcViewModel/DataLoaders/CurrencyDataLoader.h"
+#include "CalcViewModel/Common/LocalizationService.h"
 
 using namespace CalculatorApp::Common;
 using namespace CalculatorApp::Common::LocalizationServiceProperties;
diff --git a/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp b/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp
index 4d909455..7371a26d 100644
--- a/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp
+++ b/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp
@@ -5,8 +5,8 @@
 #include <CppUnitTest.h>
 #include "DateUtils.h"
 
-#include "CalcViewModel\Common\DateCalculator.h"
-#include "CalcViewModel\DateCalculatorViewModel.h"
+#include "CalcViewModel/Common/DateCalculator.h"
+#include "CalcViewModel/DateCalculatorViewModel.h"
 
 using namespace Platform;
 using namespace std;
diff --git a/src/CalculatorUnitTests/Helpers.h b/src/CalculatorUnitTests/Helpers.h
index 649e1564..7fd32d40 100644
--- a/src/CalculatorUnitTests/Helpers.h
+++ b/src/CalculatorUnitTests/Helpers.h
@@ -4,7 +4,7 @@
 #include "pch.h"
 
 #pragma once
-#include "CalcViewModel\Common\CalculatorButtonUser.h"
+#include "CalcViewModel/Common/CalculatorButtonUser.h"
 
 namespace CalculatorUnitTests
 {
diff --git a/src/CalculatorUnitTests/HistoryTests.cpp b/src/CalculatorUnitTests/HistoryTests.cpp
index c85ad82c..8036ec15 100644
--- a/src/CalculatorUnitTests/HistoryTests.cpp
+++ b/src/CalculatorUnitTests/HistoryTests.cpp
@@ -4,8 +4,8 @@
 #include "pch.h"
 #include <CppUnitTest.h>
 
-#include "CalcViewModel\HistoryViewModel.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "CalcViewModel/HistoryViewModel.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 using namespace CalculationManager;
 using namespace CalculatorApp;
diff --git a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp
index 083342c3..56b6fd27 100644
--- a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp
+++ b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp
@@ -6,7 +6,7 @@
 #include "pch.h"
 #include "CurrencyHttpClient.h"
 
-#include "CalcViewModel\Common\NetworkManager.h"
+#include "CalcViewModel/Common/NetworkManager.h"
 
 using namespace CalculatorApp::DataLoaders;
 using namespace Platform;
diff --git a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h
index e9bff412..62b9e959 100644
--- a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h
+++ b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "CalcViewModel\DataLoaders\ICurrencyHttpClient.h"
+#include "CalcViewModel/DataLoaders/ICurrencyHttpClient.h"
 
 namespace CalculatorApp
 {
diff --git a/src/CalculatorUnitTests/MultiWindowUnitTests.cpp b/src/CalculatorUnitTests/MultiWindowUnitTests.cpp
index 15817303..fcb82171 100644
--- a/src/CalculatorUnitTests/MultiWindowUnitTests.cpp
+++ b/src/CalculatorUnitTests/MultiWindowUnitTests.cpp
@@ -6,10 +6,10 @@
 #include "UnitConverterViewModelUnitTests.h"
 #include "DateUtils.h"
 
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\UnitConverterViewModel.h"
-#include "CalcViewModel\DateCalculatorViewModel.h"
-#include "CalcViewModel\DataLoaders\UnitConverterDataLoader.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
+#include "CalcViewModel/DateCalculatorViewModel.h"
+#include "CalcViewModel/DataLoaders/UnitConverterDataLoader.h"
 
 using namespace Platform;
 using namespace Platform::Collections;
@@ -79,7 +79,7 @@ namespace CalculatorUnitTests
             }
         }
 
-        // Create 3 separate instances of Calulator in different modes
+        // Create 3 separate instances of Calculator in different modes
         TEST_METHOD(InitializeMultipleModeInstancesTest)
         {
             std::vector<StandardCalculatorViewModel^> viewModels(3);
@@ -584,7 +584,7 @@ namespace CalculatorUnitTests
             }
         }
 
-        // Perform calculations on 3 separate instances of Calcuator and verify that their Memory List items are maintained separately
+        // Perform calculations on 3 separate instances of Calculator and verify that their Memory List items are maintained separately
         TEST_METHOD(MultipleModesMemoryAddItemTest)
         {
             std::vector<StandardCalculatorViewModel^> viewModels(3);
diff --git a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp
index 4670ec48..e9e7817e 100644
--- a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp
+++ b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp
@@ -5,8 +5,8 @@
 #include <CppUnitTest.h>
 #include "UnitConverterViewModelUnitTests.h"
 
-#include "CalcViewModel\UnitConverterViewModel.h"
-#include "CalcViewModel\DataLoaders\UnitConverterDataLoader.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
+#include "CalcViewModel/DataLoaders/UnitConverterDataLoader.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalculatorUnitTests/UnitTestApp.rd.xml b/src/CalculatorUnitTests/UnitTestApp.rd.xml
index 4a861a6f..ec18129f 100644
--- a/src/CalculatorUnitTests/UnitTestApp.rd.xml
+++ b/src/CalculatorUnitTests/UnitTestApp.rd.xml
@@ -3,7 +3,7 @@
     developers. However, you can modify these parameters to modify the behavior of the .NET Native
     optimizer.
 
-    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
+    Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919
 
     To fully enable reflection for App1.MyClass and all of its public/private members
     <Type Name="App1.MyClass" Dynamic="Required All"/>
@@ -12,7 +12,7 @@
     <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
 
     Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
+    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
 -->
 
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
diff --git a/src/CalculatorUnitTests/UnitTestApp.xaml.cpp b/src/CalculatorUnitTests/UnitTestApp.xaml.cpp
index c9d685ad..de9d5bb1 100644
--- a/src/CalculatorUnitTests/UnitTestApp.xaml.cpp
+++ b/src/CalculatorUnitTests/UnitTestApp.xaml.cpp
@@ -25,7 +25,7 @@ using namespace Windows::UI::Xaml::Interop;
 using namespace Windows::UI::Xaml::Media;
 using namespace Windows::UI::Xaml::Navigation;
 
-// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=402347&clcid=0x409
+// The Blank Application template is documented at https://go.microsoft.com/fwlink/?LinkId=402347&clcid=0x409
 
 /// <summary>
 /// Initializes the singleton application object.  This is the first line of authored code
diff --git a/src/CalculatorUnitTests/UnitTestApp.xaml.h b/src/CalculatorUnitTests/UnitTestApp.xaml.h
index f7918dbb..9877eea4 100644
--- a/src/CalculatorUnitTests/UnitTestApp.xaml.h
+++ b/src/CalculatorUnitTests/UnitTestApp.xaml.h
@@ -9,10 +9,10 @@
 #pragma once
 
 #include "UnitTestApp.g.h"
-#include "CalcViewModel\DateCalculatorViewModel.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\UnitConverterViewModel.h"
-#include "CalcViewModel\MemoryItemViewModel.h"
+#include "CalcViewModel/DateCalculatorViewModel.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
+#include "CalcViewModel/MemoryItemViewModel.h"
 
 namespace CalculatorUnitTests
 {
diff --git a/src/CalculatorUnitTests/pch.h b/src/CalculatorUnitTests/pch.h
index ecfd700f..7f46aeac 100644
--- a/src/CalculatorUnitTests/pch.h
+++ b/src/CalculatorUnitTests/pch.h
@@ -38,11 +38,11 @@
 #include <sstream>
 
 // C++\WinRT Headers
-#include "winrt\base.h"
-#include "winrt\Windows.Foundation.Diagnostics.h"
-#include "winrt\Windows.Globalization.h"
-#include "winrt\Windows.Globalization.DateTimeFormatting.h"
-#include "winrt\Windows.System.UserProfile.h"
+#include "winrt/base.h"
+#include "winrt/Windows.Foundation.Diagnostics.h"
+#include "winrt/Windows.Globalization.h"
+#include "winrt/Windows.Globalization.DateTimeFormatting.h"
+#include "winrt/Windows.System.UserProfile.h"
 
 namespace CalculatorApp
 {
@@ -74,21 +74,21 @@ namespace CalculatorApp::Common::Automation {}
 namespace CustomPeers = CalculatorApp::Common::Automation;
 
 //CalcManager Headers
-#include "CalcManager\CalculatorVector.h"
-#include "CalcManager\ExpressionCommand.h"
-#include "CalcManager\CalculatorResource.h"
-#include "CalcManager\CalculatorManager.h"
-#include "CalcManager\UnitConverter.h"
+#include "CalcManager/CalculatorVector.h"
+#include "CalcManager/ExpressionCommand.h"
+#include "CalcManager/CalculatorResource.h"
+#include "CalcManager/CalculatorManager.h"
+#include "CalcManager/UnitConverter.h"
 
 // CalcViewModel Headers
-#include "CalcViewModel\Common\DelegateCommand.h"
-#include "CalcViewModel\Common\Utils.h"
-#include "CalcViewModel\Common\MyVirtualKey.h"
-#include "CalcViewModel\Common\NavCategory.h"
-#include "CalcViewModel\Common\CalculatorButtonUser.h"
-#include "CalcViewModel\Common\NetworkManager.h"
+#include "CalcViewModel/Common/DelegateCommand.h"
+#include "CalcViewModel/Common/Utils.h"
+#include "CalcViewModel/Common/MyVirtualKey.h"
+#include "CalcViewModel/Common/NavCategory.h"
+#include "CalcViewModel/Common/CalculatorButtonUser.h"
+#include "CalcViewModel/Common/NetworkManager.h"
 
-#include "Mocks\CurrencyHttpClient.h"
+#include "Mocks/CurrencyHttpClient.h"
 #include "Helpers.h"
 
 #include "UnitTestApp.xaml.h"
diff --git a/src/nuget.config b/src/nuget.config
index 2d76b6fe..63a9d4e6 100644
--- a/src/nuget.config
+++ b/src/nuget.config
@@ -4,7 +4,7 @@
     <add key="disableSourceControlIntegration" value="true" />
   </solution>
   <packageSources>
-    <add key="NuGet official package source" value="https://nuget.org/api/v2/" />
+    <add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
     <add key="EEApps" value="https://eeapps.blob.core.windows.net/eeapps/index.json" />
   </packageSources>
   <config>