From 0849ec4aadd206d711c8ed0c833be5ef6bc1d8a7 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 11 Jul 2019 12:31:52 +0300
Subject: Working MS on bugs and improvement.

---
 .../Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs       | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 15033e295..935cfe5ee 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -239,6 +239,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         public void DropIdsPack(IdsPack idsPack1, IdsPack idsPack2)
         {
             ActiveMachine.Configuration.IdsPacks.Swap(idsPack1, idsPack2);
+            ColorLabVM.InvalidateLiquidFactorsCalibrationData();
         }
 
         /// <summary>
@@ -333,6 +334,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         {
             idsPack.LiquidType = liquidType;
             idsPack.LiquidTypeGuid = liquidType.Guid;
+            ColorLabVM.InvalidateLiquidFactorsCalibrationData();
         }
 
         /// <summary>
@@ -358,6 +360,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         {
             ActiveMachineAdapter.Context.IdsPacks.Remove(SelectedIds);
             SelectedIds = null;
+            ColorLabVM.InvalidateLiquidFactorsCalibrationData();
         }
 
         /// <summary>
-- 
cgit v1.3.1


From 16cc209e80498a0b39c1ad57d4f36be906cbb313 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 28 Jul 2019 13:22:50 +0300
Subject: Refactored machine studio for using colors static resources.

---
 .../SQLExaminer Projects/Override Tables.sdeproj   |  64 +++++++--
 .../SQLExaminer Projects/Provision Machine.sdeproj |  37 ++---
 .../Views/DispensersView.xaml                      |   6 +-
 .../Views/CatalogsView.xaml                        |   4 +-
 .../Views/MainView.xaml                            |  16 +--
 .../Views/CalibrationDataView.xaml                 |   2 +-
 .../Views/MainView.xaml                            |  24 ++--
 .../Views/MainView.xaml                            |   6 +-
 .../Views/JobView.xaml                             | 154 ++++++++++----------
 .../Views/MachineJobSelectionView.xaml             |  12 +-
 .../Views/MainView.xaml                            |  44 +++---
 .../Views/RunningJobView.xaml                      |   8 +-
 .../Views/MainView.xaml                            |   4 +-
 .../Views/ApplicationLogDetailsView.xaml           |   4 +-
 .../Views/ApplicationLogsView.xaml                 |  12 +-
 .../Views/EmbeddedLogDetailsView.xaml              |   4 +-
 .../Views/EmbeddedLogsView.xaml                    |  12 +-
 .../Views/EventDetailsView.xaml                    |   4 +-
 .../Views/EventsView.xaml                          |   8 +-
 .../Views/HomeView.xaml                            |   2 +-
 .../Views/TimelineView.xaml                        |   2 +-
 .../Views/MachineDetailsView.xaml                  |   2 +-
 .../Views/MachineSettingsView.xaml                 |   2 +-
 .../Views/MachinesView.xaml                        |   6 +-
 .../Views/SpoolsView.xaml                          |   4 +-
 .../Views/AddLiquidFactorView.xaml                 |   2 +-
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     |   2 +-
 .../Tango.MachineStudio.RML/Views/RmlsView.xaml    |   6 +-
 .../Views/MainView.xaml                            |  62 ++++----
 .../Tango.MachineStudio.Stubs/Views/MainView.xaml  |   2 +-
 .../Editors/BlowerElementEditor.xaml               |   4 +-
 .../Editors/ControllerElementEditor.xaml           |   6 +-
 .../Editors/DispenserElementEditor.xaml            |  10 +-
 .../Editors/HeaterElementEditor.xaml               |   4 +-
 .../Editors/JobRunnerElementEditor.xaml            |   8 +-
 .../Editors/MonitorRecorderElementEditor.xaml      |   2 +-
 .../Editors/MotorElementEditor.xaml                |  12 +-
 .../Editors/MotorGroupElementEditor.xaml           |   2 +-
 .../Editors/ProcessParametersElementEditor.xaml    |   4 +-
 .../Editors/ThreadMotionElementEditor.xaml         |  10 +-
 .../Editors/ValveElementEditor.xaml                |   6 +-
 .../PropertiesTemplates/MultiGraphTemplate.xaml    |   2 +-
 .../PropertiesTemplates/SingleGraphTemplate.xaml   |   2 +-
 .../Resources/GraphEx.xaml                         |  19 +--
 .../Views/ImportProjectTabView.xaml                |   2 +-
 .../Views/MachineTechView.xaml                     |  32 ++---
 .../Views/OrganizationManagementView.xaml          |   6 +-
 .../Views/OrganizationSelectionView.xaml           |   4 +-
 .../Views/UserManagementView.xaml                  |   2 +-
 .../Controls/HiveComboControl.xaml                 |   6 +-
 .../Resources/MaterialDesign.xaml                  |  18 +--
 .../Resources/SharedResourceDictionary.cs          |  55 +++++++
 .../Tango.MachineStudio.Common.csproj              |   5 +
 .../Tango.MachineStudio.Common/Themes/Generic.xaml |   4 +-
 .../Themes/LightThemeColors.xaml                   | 158 +++++++++++++++++++++
 .../MachineStudio/Tango.MachineStudio.UI/App.xaml  |   5 +-
 .../Console/ConsoleWindow.xaml                     |  31 ++--
 .../Tango.MachineStudio.UI/MainWindow.xaml         |   3 +-
 .../Views/ConnectedMachineView.xaml                |   4 +-
 .../Views/FirmwareUpgradeView.xaml                 |   6 +-
 .../Tango.MachineStudio.UI/Views/MainView.xaml     |  19 +--
 .../Views/ReportIssueView.xaml                     |   4 +-
 .../Views/ResolvedIssuesView.xaml                  |   2 +-
 .../Tango.MachineStudio.UI/Views/UpdateView.xaml   |  10 +-
 .../Windows/ExceptionWindow.xaml                   |   4 +-
 .../Windows/ModuleWindow.xaml                      |   3 +-
 .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest    |   2 +-
 67 files changed, 623 insertions(+), 370 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner')

diff --git a/Software/DB/SQLExaminer Projects/Override Tables.sdeproj b/Software/DB/SQLExaminer Projects/Override Tables.sdeproj
index 742eeeab4..039729d9d 100644
--- a/Software/DB/SQLExaminer Projects/Override Tables.sdeproj	
+++ b/Software/DB/SQLExaminer Projects/Override Tables.sdeproj	
@@ -11,8 +11,8 @@
     <Source id="2">
       <EngineType>MsSqlServer</EngineType>
       <StorageType>LiveDb</StorageType>
-      <ServerName>localhost\sqlexpress</ServerName>
-      <Database>Test</Database>
+      <ServerName>localhost\sqlppc</ServerName>
+      <Database>Tango</Database>
       <WinAuth>True</WinAuth>
       <AzurePwd>False</AzurePwd>
     </Source>
@@ -87,7 +87,6 @@
         <Column name="V6" />
         <Column name="V7" />
         <Column name="CORRECTED" />
-        <Column name="COLOR_CATALOG_GUID" />
         <Column name="V0_DIV" />
         <Column name="V1_DIV" />
         <Column name="V2_DIV" />
@@ -96,6 +95,7 @@
         <Column name="V5_DIV" />
         <Column name="V6_DIV" />
         <Column name="V7_DIV" />
+        <Column name="COLOR_CATALOGS_ITEM_GUID" />
       </Columns>
     </Item>
     <Item name="dbo.CARTRIDGE_TYPES" type="table" extracted="True">
@@ -126,12 +126,8 @@
         <Column name="LAST_UPDATED" />
         <Column name="NAME" />
         <Column name="DESCRIPTION" />
-        <Column name="FORWARD_FILE_NAME" />
-        <Column name="INVERSE_FILE_NAME" />
-        <Column name="FORWARD_DATA" />
-        <Column name="INVERSE_DATA" />
-        <Column name="VERSION" />
-        <Column name="RML_GUID" />
+        <Column name="FILE_NAME" />
+        <Column name="DATA" />
       </Columns>
     </Item>
     <Item name="dbo.COLOR_CATALOGS" type="table" extracted="True">
@@ -139,10 +135,31 @@
         <Column name="GUID" key="true" />
         <Column name="ID" />
         <Column name="LAST_UPDATED" />
-        <Column name="COLOR_SPACE_GUID" />
-        <Column name="COLOR_CODE" />
         <Column name="NAME" />
-        <Column name="COLOR_GROUP" />
+        <Column name="COMPANY" />
+        <Column name="DESCRIPTION" />
+        <Column name="DESIGN_TYPE" />
+        <Column name="LOGO" />
+        <Column name="IMAGE" />
+      </Columns>
+    </Item>
+    <Item name="dbo.COLOR_CATALOGS_GROUPS" type="table" extracted="True">
+      <Columns>
+        <Column name="GUID" key="true" />
+        <Column name="ID" />
+        <Column name="LAST_UPDATED" />
+        <Column name="NAME" />
+        <Column name="COLOR_CATALOG_GUID" />
+      </Columns>
+    </Item>
+    <Item name="dbo.COLOR_CATALOGS_ITEMS" type="table" extracted="True">
+      <Columns>
+        <Column name="GUID" key="true" />
+        <Column name="ID" />
+        <Column name="LAST_UPDATED" />
+        <Column name="COLOR_CATALOGS_GROUP_GUID" />
+        <Column name="CODE" />
+        <Column name="NAME" />
         <Column name="CYAN" />
         <Column name="MAGENTA" />
         <Column name="YELLOW" />
@@ -154,7 +171,20 @@
         <Column name="A" />
         <Column name="B" />
         <Column name="PROCESS_PARAMETERS_TABLE_INDEX" />
+      </Columns>
+    </Item>
+    <Item name="dbo.COLOR_CATALOGS_ITEMS_RECIPES" type="table" extracted="True">
+      <Columns>
+        <Column name="GUID" key="true" />
+        <Column name="ID" />
+        <Column name="LAST_UPDATED" />
+        <Column name="COLOR_CATALOGS_ITEM_GUID" />
         <Column name="RML_GUID" />
+        <Column name="CYAN" />
+        <Column name="MAGENTA" />
+        <Column name="YELLOW" />
+        <Column name="BLACK" />
+        <Column name="PROCESS_PARAMETERS_TABLE_INDEX" />
       </Columns>
     </Item>
     <Item name="dbo.COLOR_SPACES" type="table" extracted="True">
@@ -165,7 +195,6 @@
         <Column name="CODE" />
         <Column name="NAME" />
         <Column name="DESCRIPTION" />
-        <Column name="IS_CATALOG" />
         <Column name="THUMBNAIL" />
       </Columns>
     </Item>
@@ -253,6 +282,7 @@
         <Column name="EVENT_GROUP" />
         <Column name="EVENT_NOTIFICATION_TIME" />
         <Column name="EVENT_ACTIONS" />
+        <Column name="GUIDANCE" />
       </Columns>
     </Item>
     <Item name="dbo.FIBER_SHAPES" type="table" extracted="True">
@@ -580,6 +610,8 @@
         <Column name="NAME" />
         <Column name="VERSION" />
         <Column name="COLOR" />
+        <Column name="PREFERRED_INDEX" />
+        <Column name="HAS_PIGMENT" />
       </Columns>
     </Item>
     <Item name="dbo.LIQUID_TYPES_RMLS" type="table" extracted="True">
@@ -602,6 +634,7 @@
         <Column name="COMMENTS" />
         <Column name="USER_GUID" />
         <Column name="BLOB_NAME" />
+        <Column name="INSTALLER_BLOB_NAME" />
       </Columns>
     </Item>
     <Item name="dbo.MACHINE_VERSIONS" type="table" extracted="True">
@@ -641,6 +674,9 @@
         <Column name="LOADED_RML_GUID" />
         <Column name="TARGET_COLOR_SPACE_CODES" />
         <Column name="SETUP_FPGA" />
+        <Column name="SUSPEND_VERSION_UPDATE" />
+        <Column name="PERFORM_SCHEMA_UPDATE_ON_DATA_UPDATE" />
+        <Column name="DEVICE_COM_PORT" />
       </Columns>
     </Item>
     <Item name="dbo.MACHINES_EVENTS" type="table">
@@ -782,6 +818,7 @@
         <Column name="WHITE_POINT_L" />
         <Column name="WHITE_POINT_A" />
         <Column name="WHITE_POINT_B" />
+        <Column name="CCT_GUID" />
       </Columns>
     </Item>
     <Item name="dbo.ROLES" type="table" extracted="True">
@@ -857,6 +894,7 @@
         <Column name="COMMENTS" />
         <Column name="USER_GUID" />
         <Column name="MACHINE_VERSION_GUID" />
+        <Column name="INSTALLER_BLOB_NAME" />
       </Columns>
     </Item>
     <Item name="dbo.TECH_CONTROLLERS" type="table" extracted="True">
diff --git a/Software/DB/SQLExaminer Projects/Provision Machine.sdeproj b/Software/DB/SQLExaminer Projects/Provision Machine.sdeproj
index 2d978092e..5f4b977ae 100644
--- a/Software/DB/SQLExaminer Projects/Provision Machine.sdeproj	
+++ b/Software/DB/SQLExaminer Projects/Provision Machine.sdeproj	
@@ -95,7 +95,6 @@
         <Column name="V7" />
         <Column name="V7_DIV" />
         <Column name="CORRECTED" />
-        <Column name="COLOR_CATALOG_GUID" />
       </Columns>
     </Item>
     <Item name="dbo.CARTRIDGE_TYPES" type="table">
@@ -126,12 +125,6 @@
         <Column name="LAST_UPDATED" />
         <Column name="NAME" />
         <Column name="DESCRIPTION" />
-        <Column name="FORWARD_FILE_NAME" />
-        <Column name="INVERSE_FILE_NAME" />
-        <Column name="FORWARD_DATA" />
-        <Column name="INVERSE_DATA" />
-        <Column name="VERSION" />
-        <Column name="RML_GUID" />
       </Columns>
     </Item>
     <Item name="dbo.COLOR_CATALOGS" type="table">
@@ -139,22 +132,7 @@
         <Column name="GUID" key="true" />
         <Column name="ID" />
         <Column name="LAST_UPDATED" />
-        <Column name="COLOR_SPACE_GUID" />
-        <Column name="COLOR_CODE" />
         <Column name="NAME" />
-        <Column name="COLOR_GROUP" />
-        <Column name="CYAN" />
-        <Column name="MAGENTA" />
-        <Column name="YELLOW" />
-        <Column name="BLACK" />
-        <Column name="RED" />
-        <Column name="GREEN" />
-        <Column name="BLUE" />
-        <Column name="L" />
-        <Column name="A" />
-        <Column name="B" />
-        <Column name="PROCESS_PARAMETERS_TABLE_INDEX" />
-        <Column name="RML_GUID" />
       </Columns>
     </Item>
     <Item name="dbo.COLOR_SPACES" type="table">
@@ -165,7 +143,6 @@
         <Column name="CODE" />
         <Column name="NAME" />
         <Column name="DESCRIPTION" />
-        <Column name="IS_CATALOG" />
         <Column name="THUMBNAIL" />
       </Columns>
     </Item>
@@ -253,6 +230,7 @@
         <Column name="EVENT_GROUP" />
         <Column name="EVENT_NOTIFICATION_TIME" />
         <Column name="EVENT_ACTIONS" />
+        <Column name="GUIDANCE" />
       </Columns>
     </Item>
     <Item name="dbo.FIBER_SHAPES" type="table">
@@ -580,6 +558,8 @@
         <Column name="NAME" />
         <Column name="VERSION" />
         <Column name="COLOR" />
+        <Column name="PREFERRED_INDEX" />
+        <Column name="HAS_PIGMENT" />
       </Columns>
     </Item>
     <Item name="dbo.LIQUID_TYPES_RMLS" type="table">
@@ -602,6 +582,7 @@
         <Column name="COMMENTS" />
         <Column name="USER_GUID" />
         <Column name="BLOB_NAME" />
+        <Column name="INSTALLER_BLOB_NAME" />
       </Columns>
     </Item>
     <Item name="dbo.MACHINE_VERSIONS" type="table">
@@ -641,6 +622,9 @@
         <Column name="LOADED_RML_GUID" />
         <Column name="TARGET_COLOR_SPACE_CODES" />
         <Column name="SETUP_FPGA" />
+        <Column name="SUSPEND_VERSION_UPDATE" />
+        <Column name="PERFORM_SCHEMA_UPDATE_ON_DATA_UPDATE" />
+        <Column name="DEVICE_COM_PORT" />
       </Columns>
     </Item>
     <Item name="dbo.MACHINES_EVENTS" type="table">
@@ -857,6 +841,7 @@
         <Column name="COMMENTS" />
         <Column name="USER_GUID" />
         <Column name="MACHINE_VERSION_GUID" />
+        <Column name="INSTALLER_BLOB_NAME" />
       </Columns>
     </Item>
     <Item name="dbo.TECH_CONTROLLERS" type="table">
@@ -1432,6 +1417,9 @@ WHERE MACHINES.SERIAL_NUMBER = '@'
         <Column name="SETUP_FIRMWARE" />
         <Column name="SETUP_FPGA" />
         <Column name="IS_DEMO" />
+        <Column name="SUSPEND_VERSION_UPDATE" />
+        <Column name="PERFORM_SCHEMA_UPDATE_ON_DATA_UPDATE" />
+        <Column name="DEVICE_COM_PORT" />
       </Columns>
       <Queries>
         <Query id="1">
@@ -1501,6 +1489,9 @@ WHERE MACHINES.SERIAL_NUMBER = '@'
                 <UpdateColumn name="SETUP_FIRMWARE" />
                 <UpdateColumn name="SETUP_FPGA" />
                 <UpdateColumn name="IS_DEMO" />
+                <UpdateColumn name="SUSPEND_VERSION_UPDATE" />
+                <UpdateColumn name="PERFORM_SCHEMA_UPDATE_ON_DATA_UPDATE" />
+                <UpdateColumn name="DEVICE_COM_PORT" />
               </UpdateColumns>
             </Table>
           </UpdateTables>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
index a8262667e..0943d76bf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
@@ -32,13 +32,13 @@
             </Grid>
             <Grid DockPanel.Dock="Bottom" IsEnabled="{Binding IsFree}">
                 <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveDispenserCommand}">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding RemoveDispenserCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
                             <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
                         </StackPanel>
                     </Button>
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding AddDispenserCommand}">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding AddDispenserCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
                             <TextBlock Margin="5 0 0 0" FontSize="16">NEW DISPENSER</TextBlock>
@@ -55,7 +55,7 @@
                 </StackPanel>
             </Grid>
             <Grid IsEnabled="{Binding IsFree}">
-                <controls:DoubleClickDataGrid Style="{StaticResource {x:Type DataGrid}}" DoubleClickCommand="{Binding ManageDispenserCommand}" Margin="0 0 0 10" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Dispensers}" SelectedItem="{Binding SelectedDispenser}">
+                <controls:DoubleClickDataGrid Style="{StaticResource {x:Type DataGrid}}" DoubleClickCommand="{Binding ManageDispenserCommand}" Margin="0 0 0 10" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Dispensers}" SelectedItem="{Binding SelectedDispenser}">
                     <DataGrid.CellStyle>
                         <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                             <Setter Property="BorderThickness" Value="0"/>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogsView.xaml
index dca9c0e96..74ab84e9f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogsView.xaml
@@ -24,13 +24,13 @@
             </Grid>
             <Grid DockPanel.Dock="Bottom">
                 <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding DeleteCatalogCommand}">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding DeleteCatalogCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
                             <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
                         </StackPanel>
                     </Button>
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding NewCatalogCommand}">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding NewCatalogCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
                             <TextBlock Margin="5 0 0 0" FontSize="16">NEW CATALOG</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
index 04150072c..0ff36e86a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
@@ -33,14 +33,14 @@
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
 
-            <SolidColorBrush x:Key="Foreground" Color="#BBBBBB" />
-            <SolidColorBrush x:Key="Background" Color="#202020" />
-            <SolidColorBrush x:Key="Accent" Color="#03A9F4" />
-            <SolidColorBrush x:Key="Red" Color="#FF5F5F" />
-            <SolidColorBrush x:Key="Green" Color="#68E46E" />
-            <SolidColorBrush x:Key="Blue" Color="#64B8EC" />
-            <SolidColorBrush x:Key="BorderBrush" Color="#3E3E3E" />
-            <SolidColorBrush x:Key="LightBackground" Color="#303030" />
+            <SolidColorBrush x:Key="Foreground" Color="{Binding Color, Source={StaticResource LightGrayBrush100}}" />
+            <SolidColorBrush x:Key="Background" Color="{Binding Color, Source={StaticResource DarkGrayBrush200}}" />
+            <SolidColorBrush x:Key="Accent" Color="{Binding Color, Source={StaticResource BlueBrush100}}" />
+            <SolidColorBrush x:Key="Red" Color="{Binding Color, Source={StaticResource RedBrush100}}" />
+            <SolidColorBrush x:Key="Green" Color="{Binding Color, Source={StaticResource GreenBrush100}}"/>
+            <SolidColorBrush x:Key="Blue" Color="{Binding Color, Source={StaticResource BlueBrush}}" />
+            <SolidColorBrush x:Key="BorderBrush" Color="{Binding Color, Source={StaticResource GrayBrush280}}" />
+            <SolidColorBrush x:Key="LightBackground" Color="{Binding Color, Source={StaticResource GrayBrush300}}" />
 
             <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
             <localConverters:CaptureModeToVisibilityConverter x:Key="CaptureModeToVisibilityConverter" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/CalibrationDataView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/CalibrationDataView.xaml
index 3c9723b30..172e08ff5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/CalibrationDataView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/CalibrationDataView.xaml
@@ -49,7 +49,7 @@
                         </StackPanel>
 
                         <Grid Margin="0 0 0 5">
-                            <DataGrid Background="#BBFFFFFF" AlternatingRowBackground="#CCE1E1E1" BorderThickness="1" BorderBrush="#202020" Margin="5 0" ItemsSource="{Binding CalibrationPoints}" CanUserResizeColumns="False" CanUserReorderColumns="False" AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="True" CanUserSortColumns="False">
+                            <DataGrid Background="#BBFFFFFF" AlternatingRowBackground="#CCE1E1E1" BorderThickness="1" BorderBrush="{StaticResource DarkGrayBrush}" Margin="5 0" ItemsSource="{Binding CalibrationPoints}" CanUserResizeColumns="False" CanUserReorderColumns="False" AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="True" CanUserSortColumns="False">
                                 <DataGrid.CellStyle>
                                     <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                                         <Setter Property="BorderThickness" Value="0"/>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
index 888945579..76b6de50f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
@@ -198,8 +198,8 @@
                             <StackPanel VerticalAlignment="Center">
                                 <StackPanel Height="20">
                                     <StackPanel Orientation="Horizontal" Margin="0 0 0 5" Visibility="{Binding IsOutOfGamut,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                        <materialDesign:PackIcon Kind="Alert" Foreground="#FF6D6D" />
-                                        <TextBlock Margin="5 0 0 0" Foreground="#FF6D6D">Color is out of gamut</TextBlock>
+                                        <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource RedBrush100}" />
+                                        <TextBlock Margin="5 0 0 0" Foreground="{StaticResource RedBrush100}">Color is out of gamut</TextBlock>
                                     </StackPanel>
                                 </StackPanel>
                                 <Border BorderThickness="1" BorderBrush="#545454" Margin="0" Padding="2 2 2 0">
@@ -302,7 +302,7 @@
                             </hive:HexList.ItemTemplate>
                         </hive:HexList>
 
-                        <TextBlock FontSize="40" Foreground="#FF5F5F" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="2" Grid.Row="1" Text="NO INPUT">
+                        <TextBlock FontSize="40" Foreground="{StaticResource RedBrush100}" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="2" Grid.Row="1" Text="NO INPUT">
                             <TextBlock.Style>
                                 <Style TargetType="TextBlock">
                                     <Setter Property="Visibility" Value="Collapsed"></Setter>
@@ -354,8 +354,8 @@
                         <StackPanel Grid.Column="4" Grid.Row="3">
                             <StackPanel Height="25" Margin="25 0 0 0">
                                 <StackPanel Orientation="Horizontal" Margin="0 0 0 0" Visibility="{Binding IsVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <materialDesign:PackIcon Kind="Alert" Foreground="#FF6D6D" />
-                                    <TextBlock Margin="5 0 0 0" Foreground="#FF6D6D">Liquid volumes exceeds the maximum range</TextBlock>
+                                    <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource RedBrush100}" />
+                                    <TextBlock Margin="5 0 0 0" Foreground="{StaticResource RedBrush100}">Liquid volumes exceeds the maximum range</TextBlock>
                                 </StackPanel>
                             </StackPanel>
 
@@ -393,7 +393,7 @@
                                 <DockPanel Width="80" HorizontalAlignment="Left">
                                     <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">COMPOSITE</TextBlock>
                                     <Grid>
-                                        <Ellipse Height="70"  Margin="0 5 0 0" Stroke="#202020">
+                                        <Ellipse Height="70"  Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
                                             <Ellipse.Fill>
                                                 <SolidColorBrush Color="{Binding TargetColor.Color}"></SolidColorBrush>
                                             </Ellipse.Fill>
@@ -408,7 +408,7 @@
                                             <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
 
                                             <Grid>
-                                                <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                                <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
                                                     <Rectangle.Fill>
                                                         <SolidColorBrush Color="Red" Opacity="{Binding TargetColor.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
                                                     </Rectangle.Fill>
@@ -419,7 +419,7 @@
                                         <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
                                             <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">G</TextBlock>
                                             <Grid>
-                                                <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                                <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
                                                     <Rectangle.Fill>
                                                         <SolidColorBrush Color="Green" Opacity="{Binding TargetColor.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
                                                     </Rectangle.Fill>
@@ -430,7 +430,7 @@
                                         <DockPanel Width="50" HorizontalAlignment="Left">
                                             <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
                                             <Grid>
-                                                <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                                <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
                                                     <Rectangle.Fill>
                                                         <SolidColorBrush Color="Blue" Opacity="{Binding TargetColor.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
                                                     </Rectangle.Fill>
@@ -444,7 +444,7 @@
                                             <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
 
                                             <Grid>
-                                                <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                                <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
                                                 <TextBlock Text="{Binding TargetColor.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
                                             </Grid>
                                         </DockPanel>
@@ -452,7 +452,7 @@
                                             <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
 
                                             <Grid>
-                                                <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                                <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
                                                 <TextBlock Text="{Binding TargetColor.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
                                             </Grid>
                                         </DockPanel>
@@ -460,7 +460,7 @@
                                             <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
 
                                             <Grid>
-                                                <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                                <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
                                                 <TextBlock Text="{Binding TargetColor.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
                                             </Grid>
                                         </DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Views/MainView.xaml
index 1ef3c1769..7fc9034cd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Views/MainView.xaml
@@ -48,7 +48,7 @@
                                 <DataTemplate>
                                     <Grid HorizontalAlignment="Stretch">
                                         <DockPanel>
-                                            <Button DockPanel.Dock="Right" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Width="24" Height="24" Foreground="#FF6F6F" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RemoveRecordingCommand}" CommandParameter="{Binding}">
+                                            <Button DockPanel.Dock="Right" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Width="24" Height="24" Foreground="{StaticResource RedBrush100}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RemoveRecordingCommand}" CommandParameter="{Binding}">
                                                 <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
                                             </Button>
 
@@ -212,12 +212,12 @@
                                     <Button Command="{Binding MediaSeekForwardCommand}" Margin="20 0 0 0" Style="{StaticResource MaterialDesignFloatingActionButton}" Padding="0" Width="60" Height="60" Background="Transparent">
                                         <materialDesign:PackIcon Width="40" Height="40" Kind="FastForward" Foreground="{StaticResource AccentColorBrush}" />
                                     </Button>
-                                    <Button Command="{Binding MediaRecordingCommand}" Margin="20 0 0 0" Style="{StaticResource MaterialDesignFloatingActionButton}" Foreground="#FF7A7A" BorderBrush="#FF8585" Padding="0" Width="50" Height="50" Background="Transparent" ToolTip="Start Recording">
+                                    <Button Command="{Binding MediaRecordingCommand}" Margin="20 0 0 0" Style="{StaticResource MaterialDesignFloatingActionButton}" Foreground="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush400}" Padding="0" Width="50" Height="50" Background="Transparent" ToolTip="Start Recording">
                                         <materialDesign:PackIcon Width="30" Height="30" Kind="Record" />
                                     </Button>
                                 </StackPanel>
                                 <Grid>
-                                    <Label Margin="0 0 15 0" VerticalAlignment="Center" HorizontalAlignment="Right" Foreground="#FF8585" FontSize="40" FontFamily="{StaticResource digital-7}">
+                                    <Label Margin="0 0 15 0" VerticalAlignment="Center" HorizontalAlignment="Right" Foreground="{StaticResource RedBrush400}" FontSize="40" FontFamily="{StaticResource digital-7}">
                                         <Label.Style>
                                             <Style TargetType="Label">
                                                 <Setter Property="Opacity" Value="1"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index ad1648642..b90aa62b8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -126,18 +126,12 @@
         </Style>
 
         <Style TargetType="Border" x:Key="JobFieldBorder">
-            <Setter Property="BorderBrush" Value="#A5A4A4"></Setter>
+            <Setter Property="BorderBrush" Value="{StaticResource LightGrayBrush}"></Setter>
             <Setter Property="BorderThickness" Value="0 0 1 1"></Setter>
             <Setter Property="CornerRadius" Value="100 10 100 0"></Setter>
             <Setter Property="Padding" Value="10 5 10 5"></Setter>
             <Setter Property="Margin" Value="0 0 10 0"></Setter>
-            <Setter Property="Background">
-                <Setter.Value>
-                    <LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
-                        <GradientStop Color="#00E6E6E6"/>
-                        <GradientStop Color="#DEDEDE" Offset="1"/>
-                    </LinearGradientBrush>
-                </Setter.Value>
+            <Setter Property="Background" Value="{StaticResource borderBackground}">
             </Setter>
         </Style>
 
@@ -167,7 +161,7 @@
                                 </StackPanel>
                             </ToggleButton>
                             <Popup x:Name="Popup" MouseDown="Popup_MouseDown" PopupAnimation="Fade" StaysOpen="False" PlacementTarget="{Binding ElementName=PopupButton}"  Placement="Bottom" AllowsTransparency="True">
-                                <Border Background="#E6FFFFFF" CornerRadius="5" Margin="10">
+                                <Border Background="{StaticResource WhiteBrush}" CornerRadius="5" Margin="10">
                                     <Border.Effect>
                                         <DropShadowEffect ShadowDepth="0" BlurRadius="10" />
                                     </Border.Effect>
@@ -203,7 +197,7 @@
                                                                                 </ItemsControl.ItemsPanel>
                                                                                 <ItemsControl.ItemTemplate>
                                                                                     <DataTemplate>
-                                                                                        <TextBlock TextAlignment="Center" Foreground="#202020" Margin="10 0">
+                                                                                        <TextBlock TextAlignment="Center" Foreground="{StaticResource DarkGrayBrush200}" Margin="10 0">
                                                                                             <Run Text="{Binding LiquidType}"></Run>
                                                                                             <LineBreak/>
                                                                                             <Run Text="{Binding Volume,StringFormat=0}"></Run>
@@ -294,8 +288,8 @@
                     </ItemsControl>
 
                     <StackPanel Orientation="Horizontal" Margin="30 10 0 0" Height="16" Visibility="{Binding IsLiquidVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <materialDesign:PackIcon Kind="Alert" Foreground="#FFAC3C" />
-                        <TextBlock Margin="5 0 0 0" Foreground="#FFAC3C">Liquid volumes exceeds the maximum range for color conversion!</TextBlock>
+                        <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource OrangeBrush}" />
+                        <TextBlock Margin="5 0 0 0" Foreground="{StaticResource OrangeBrush}">Liquid volumes exceeds the maximum range for color conversion!</TextBlock>
                     </StackPanel>
                 </StackPanel>
 
@@ -310,7 +304,7 @@
                                                                                                                             <Run>)</Run>
                 </TextBlock>
 
-                <Border Margin="60 0 0 0" DataContext="{Binding LiquidVolumes,Converter={StaticResource LiquidVolumesToLubricantLiquidVolume}}" BorderBrush="#E6E6E6" BorderThickness="1 0 0 0">
+                <Border Margin="60 0 0 0" DataContext="{Binding LiquidVolumes,Converter={StaticResource LiquidVolumesToLubricantLiquidVolume}}" BorderBrush="{StaticResource WhiteBrush100}" BorderThickness="1 0 0 0">
                     <Border.Style>
                         <Style TargetType="Border">
                             <Setter Property="Visibility" Value="Collapsed"></Setter>
@@ -325,7 +319,7 @@
                         <ContentControl.Foreground>
                             <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
                         </ContentControl.Foreground>
-                        <mahapps:NumericUpDown Foreground="#515151" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontSize="20" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                        <mahapps:NumericUpDown Foreground="{StaticResource GrayBrush250}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontSize="20" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                             <mahapps:NumericUpDown.Resources>
                                 <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
                             </mahapps:NumericUpDown.Resources>
@@ -338,7 +332,7 @@
         <DataTemplate x:Key="RGB_Template">
             <StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <ContentControl Style="{StaticResource numberBorder}" Foreground="#FF6F6F" Width="60" Height="60" Margin="10 0 0 0">
+                    <ContentControl Style="{StaticResource numberBorder}" Foreground="{StaticResource RedBrush200}" Width="60" Height="60" Margin="10 0 0 0">
                         <mahapps:NumericUpDown ValueChanged="OnBrushStopFieldValueChanged" FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Red, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
                             <mahapps:NumericUpDown.Resources>
                                 <Style TargetType="TextBox"/>
@@ -346,7 +340,7 @@
                         </mahapps:NumericUpDown>
                     </ContentControl>
 
-                    <ContentControl Style="{StaticResource numberBorder}" Foreground="#92FF92" Width="60" Height="60" Margin="10 0 0 0">
+                    <ContentControl Style="{StaticResource numberBorder}" Foreground="{StaticResource GreenBrush400}" Width="60" Height="60" Margin="10 0 0 0">
                         <mahapps:NumericUpDown ValueChanged="OnBrushStopFieldValueChanged" FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Green, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
                             <mahapps:NumericUpDown.Resources>
                                 <Style TargetType="TextBox"/>
@@ -354,7 +348,7 @@
                         </mahapps:NumericUpDown>
                     </ContentControl>
 
-                    <ContentControl Style="{StaticResource numberBorder}" Foreground="#3C7EF4" BorderThickness="1" Width="60" Height="60" Margin="10 0 0 0">
+                    <ContentControl Style="{StaticResource numberBorder}" Foreground="{StaticResource DarkBlueBrush}" BorderThickness="1" Width="60" Height="60" Margin="10 0 0 0">
                         <mahapps:NumericUpDown ValueChanged="OnBrushStopFieldValueChanged" FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Blue, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
                             <mahapps:NumericUpDown.Resources>
                                 <Style TargetType="TextBox"/>
@@ -366,8 +360,8 @@
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" Margin="30 10 0 0" Height="16" Visibility="{Binding IsOutOfGamut,Converter={StaticResource BooleanToVisibilityConverter}}">
-                    <materialDesign:PackIcon Kind="Alert" Foreground="#FF6D6D" />
-                    <TextBlock Margin="5 0 0 0" Foreground="#FF6D6D">Color is out of gamut!</TextBlock>
+                    <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource RedBrush200}" />
+                    <TextBlock Margin="5 0 0 0" Foreground="{StaticResource RedBrush200}">Color is out of gamut!</TextBlock>
                 </StackPanel>
             </StackPanel>
         </DataTemplate>
@@ -382,7 +376,7 @@
                     </mahapps:NumericUpDown>
                 </ContentControl>
 
-                <ContentControl Style="{StaticResource numberBorder}" Foreground="#FF8A8A" Width="60" Height="60" Margin="10 0 0 0">
+                <ContentControl Style="{StaticResource numberBorder}" Foreground="{StaticResource RedBrush400}" Width="60" Height="60" Margin="10 0 0 0">
                     <mahapps:NumericUpDown ValueChanged="OnBrushStopFieldValueChanged" FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding A, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                         <mahapps:NumericUpDown.Resources>
                             <Style TargetType="TextBox"/>
@@ -390,7 +384,7 @@
                     </mahapps:NumericUpDown>
                 </ContentControl>
 
-                <ContentControl Style="{StaticResource numberBorder}" Foreground="#92FF92" Width="60" Height="60" Margin="10 0 0 0">
+                <ContentControl Style="{StaticResource numberBorder}"  Foreground="{StaticResource GreenBrush400}" Width="60" Height="60" Margin="10 0 0 0">
                     <mahapps:NumericUpDown ValueChanged="OnBrushStopFieldValueChanged" FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding B, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                         <mahapps:NumericUpDown.Resources>
                             <Style TargetType="TextBox"/>
@@ -428,7 +422,7 @@
                     </mahapps:NumericUpDown>
                 </ContentControl>
 
-                <ContentControl Style="{StaticResource numberBorder}" Foreground="Black" Width="60" Height="60" Margin="10 0 0 0">
+                <ContentControl Style="{StaticResource numberBorder}" Foreground="{StaticResource BlackForegroundBrush}" Width="60" Height="60" Margin="10 0 0 0">
                     <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Black,Converter={StaticResource OneToPercentConverter}, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                         <mahapps:NumericUpDown.Resources>
                             <Style TargetType="TextBox"/>
@@ -456,7 +450,7 @@
                         <ColumnDefinition Width="1*" />
                     </Grid.ColumnDefinitions>
 
-                    <Grid Background="#96FFFFFF">
+                    <Grid Background="{StaticResource TransparentBackgroundBrush}">
                         <Grid.Style>
                             <Style TargetType="Grid">
                                 <Setter Property="Width" Value="304"></Setter>
@@ -488,19 +482,19 @@
                         <DockPanel>
                             <Border DockPanel.Dock="Bottom" Margin="10">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                                    <Button Command="{Binding DuplicateSegmentCommand}" Margin="0 0 4 0" Background="#FF9A6A" BorderBrush="#FF9A6A" Height="42" Padding="10" ToolTip="Duplicate Segment">
+                                    <Button Command="{Binding DuplicateSegmentCommand}" Margin="0 0 4 0" Background="{StaticResource OrangeBrush300}" BorderBrush="{StaticResource OrangeBrush300}" Height="42" Padding="10" ToolTip="Duplicate Segment">
                                         <StackPanel Orientation="Horizontal">
                                             <materialDesign:PackIcon Kind="ContentCopy" Width="24" Height="24"></materialDesign:PackIcon>
                                             <TextBlock VerticalAlignment="Center">Duplicate</TextBlock>
                                         </StackPanel>
                                     </Button>
-                                    <Button Command="{Binding RemoveSegmentCommand}" Margin="0 0 4 0" Background="#FF6A6A" BorderBrush="#FF6A6A" Height="42" Padding="10" ToolTip="Remove Segment">
+                                    <Button Command="{Binding RemoveSegmentCommand}" Margin="0 0 4 0" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Height="42" Padding="10" ToolTip="Remove Segment">
                                         <StackPanel Orientation="Horizontal">
                                             <materialDesign:PackIcon Kind="Delete" Width="24" Height="24"></materialDesign:PackIcon>
                                             <TextBlock VerticalAlignment="Center">Remove</TextBlock>
                                         </StackPanel>
                                     </Button>
-                                    <Button AutomationProperties.AutomationId="{x:Static automation:Developer.AddSegmentButton}" Command="{Binding AddSegmentCommand}" Background="#68B367" BorderBrush="#68B367" Height="42" Padding="10" ToolTip="Add Segment">
+                                    <Button AutomationProperties.AutomationId="{x:Static automation:Developer.AddSegmentButton}" Command="{Binding AddSegmentCommand}" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Height="42" Padding="10" ToolTip="Add Segment">
                                         <StackPanel Orientation="Horizontal">
                                             <materialDesign:PackIcon Kind="Plus" Width="24" Height="24"></materialDesign:PackIcon>
                                             <TextBlock VerticalAlignment="Center">New</TextBlock>
@@ -524,7 +518,7 @@
                                                 </Polygon.Effect>
                                                 <Polygon.Style>
                                                     <Style TargetType="Polygon">
-                                                        <Setter Property="Stroke" Value="Black"></Setter>
+                                                        <Setter Property="Stroke" Value="{StaticResource BlackForegroundBrush}"></Setter>
                                                         <Setter Property="Fill">
                                                             <Setter.Value>
                                                                 <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
@@ -535,7 +529,7 @@
                                                         </Setter>
                                                         <Style.Triggers>
                                                             <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,FallbackValue=False}" Value="True">
-                                                                <Setter Property="Stroke" Value="Black"></Setter>
+                                                                <Setter Property="Stroke" Value="{StaticResource BlackForegroundBrush}"></Setter>
                                                                 <Setter Property="Fill">
                                                                     <Setter.Value>
                                                                         <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
@@ -647,8 +641,8 @@
                                                 <ComboBox.ToolTip>
                                                     <TextBlock>
                                                             <Run Text="{Binding ActiveJob.SpoolType.Name}"></Run>
-                                                            <Run FontSize="9" Foreground="#D9D9D9" Text="{Binding ActiveJob.SpoolType.Length,Mode=OneWay}"></Run>
-                                                            <Run FontSize="9" Foreground="#DEDEDE" Text="m"></Run>
+                                                            <Run FontSize="9" Foreground="{StaticResource LightGrayBrush200}" Text="{Binding ActiveJob.SpoolType.Length,Mode=OneWay}"></Run>
+                                                            <Run FontSize="9" Foreground="{StaticResource LightGrayBrush200}" Text="m"></Run>
                                                     </TextBlock>
                                                 </ComboBox.ToolTip>
                                                 <ComboBox.ItemTemplate>
@@ -672,7 +666,7 @@
                                             </StackPanel>
                                             <DockPanel LastChildFill="True">
                                                 <ToggleButton Margin="10 0 25 0" DockPanel.Dock="Right" VerticalAlignment="Bottom" HorizontalAlignment="Right" IsChecked="{Binding ActiveJob.EnableInterSegment}"></ToggleButton>
-                                                <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" Width="70" HorizontalAlignment="Left" StringFormat="{}{0:N1} m" FontFamily="{StaticResource digital-7}" IsEnabled="{Binding ActiveJob.EnableInterSegment}" Margin="0 2 0 0" HideUpDownButtons="True" Minimum="1" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding ActiveJob.InterSegmentLength,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                                <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" Width="70" HorizontalAlignment="Left" StringFormat="{}{0:N1} m" FontFamily="{StaticResource digital-7}" IsEnabled="{Binding ActiveJob.EnableInterSegment}" Margin="0 2 0 0" HideUpDownButtons="True" Minimum="1" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="{StaticResource DimGrayBrush}" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding ActiveJob.InterSegmentLength,Mode=TwoWay}"></mahapps:NumericUpDown>
                                             </DockPanel>
                                         </StackPanel>
                                     </Border>
@@ -695,7 +689,7 @@
                                                 <Image Source="../Images/repeat.png" Width="32"></Image>
                                                 <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Units</TextBlock>
                                             </StackPanel>
-                                            <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" Width="70" HorizontalAlignment="Left" FontFamily="{StaticResource digital-7}" Margin="0 5 0 0" HideUpDownButtons="True" Minimum="1" Maximum="1000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding ActiveJob.NumberOfUnits,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                            <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" Width="70" HorizontalAlignment="Left" FontFamily="{StaticResource digital-7}" Margin="0 5 0 0" HideUpDownButtons="True" Minimum="1" Maximum="1000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="{StaticResource DimGrayBrush}" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding ActiveJob.NumberOfUnits,Mode=TwoWay}"></mahapps:NumericUpDown>
                                         </StackPanel>
                                     </Border>
 
@@ -718,13 +712,13 @@
 
                             <Grid HorizontalAlignment="Right" Margin="0 0 10 0">
                                 <StackPanel Orientation="Horizontal">
-                                    <Button AutomationProperties.AutomationId="{x:Static automation:Developer.ToJobsButton}" Height="70" Width="100" Margin="0 0 10 0" Style="{StaticResource MaterialDesignFlatButton}" Foreground="#202020"  VerticalAlignment="Bottom" BorderBrush="Transparent" Command="{Binding DiscardJobCommand}">
+                                    <Button AutomationProperties.AutomationId="{x:Static automation:Developer.ToJobsButton}" Height="70" Width="100" Margin="0 0 10 0" Style="{StaticResource MaterialDesignFlatButton}" Foreground="{StaticResource DarkGrayBrush}"  VerticalAlignment="Bottom" BorderBrush="Transparent" Command="{Binding DiscardJobCommand}">
                                         <StackPanel>
                                             <materialDesign:PackIcon HorizontalAlignment="Center" Width="24" Height="24" Kind="KeyboardBackspace" />
                                             <TextBlock VerticalAlignment="Center" Margin="0 10 0 0">TO JOBS</TextBlock>
                                         </StackPanel>
                                     </Button>
-                                    <Button AutomationProperties.AutomationId="{x:Static automation:Developer.SaveJobButton}" Height="70" Width="100" Margin="0 0 0 0" Style="{StaticResource MaterialDesignFlatButton}" Foreground="#202020"  VerticalAlignment="Bottom" BorderBrush="Transparent" Command="{Binding SaveJobCommand}">
+                                    <Button AutomationProperties.AutomationId="{x:Static automation:Developer.SaveJobButton}" Height="70" Width="100" Margin="0 0 0 0" Style="{StaticResource MaterialDesignFlatButton}" Foreground="{StaticResource DarkGrayBrush}"  VerticalAlignment="Bottom" BorderBrush="Transparent" Command="{Binding SaveJobCommand}">
                                         <StackPanel>
                                             <materialDesign:PackIcon HorizontalAlignment="Center" Width="24" Height="24" Kind="ContentSave" />
                                             <TextBlock VerticalAlignment="Center" Margin="0 10 0 0">SAVE JOB</TextBlock>
@@ -753,7 +747,7 @@
                                                                         <Image Source="../Images/ruler.png" Width="32"></Image>
                                                                         <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Segment Length</TextBlock>
                                                                     </StackPanel>
-                                                                    <mahapps:NumericUpDown x:Name="numSegmentLength" FontSize="{StaticResource NumbersFontSize}" HideUpDownButtons="True" Width="90" HorizontalAlignment="Left" FontFamily="{StaticResource digital-7}" StringFormat="{}{0:N1} m" Margin="0 2 0 0" Minimum="1" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding SelectedSegment.Length,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                                                    <mahapps:NumericUpDown x:Name="numSegmentLength" FontSize="{StaticResource NumbersFontSize}" HideUpDownButtons="True" Width="90" HorizontalAlignment="Left" FontFamily="{StaticResource digital-7}" StringFormat="{}{0:N1} m" Margin="0 2 0 0" Minimum="1" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="{StaticResource DimGrayBrush}" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding SelectedSegment.Length,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                                                         <mahapps:NumericUpDown.Resources>
                                                                             <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
                                                                         </mahapps:NumericUpDown.Resources>
@@ -797,7 +791,7 @@
 
                                                         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 40 180 0">
                                                             <materialDesign:PackIcon Kind="ChevronLeft" Width="24" Height="24" />
-                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>SUPPORTED MEDIA LIQUID</Run> <Run FontSize="10"  Foreground="DimGray">( Max Nanolitter/CM )</Run></TextBlock>
+                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>SUPPORTED MEDIA LIQUID</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run></TextBlock>
                                                             <materialDesign:PackIcon Kind="ChevronRight" Width="24" Height="24" />
                                                         </StackPanel>
 
@@ -813,7 +807,7 @@
                                                                         <ItemsControl.ItemTemplate>
                                                                             <DataTemplate DataType="{x:Type observables:LiquidTypesRml}">
                                                                                 <StackPanel Margin="0 0 10 0">
-                                                                                    <TextBlock HorizontalAlignment="Center" FontSize="10" Foreground="DimGray" Text="{Binding LiquidType.Name}"></TextBlock>
+                                                                                    <TextBlock HorizontalAlignment="Center" FontSize="10" Foreground="{StaticResource DimGrayBrush}" Text="{Binding LiquidType.Name}"></TextBlock>
                                                                                     <Grid Width="58" Height="48" Margin="0 5 0 0">
                                                                                         <shapes:Hexagon StrokeThickness="1" Stroke="Gray">
                                                                                             <shapes:Hexagon.Fill>
@@ -824,7 +818,7 @@
                                                                                             </shapes:Hexagon.Fill>
                                                                                         </shapes:Hexagon>
 
-                                                                                        <TextBox Style="{x:Null}" Background="Transparent" Foreground="Black" BorderThickness="0" Text="{Binding MaxNlPerCm}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontWeight="Bold" FontStyle="Italic"></TextBox>
+                                                                                        <TextBox Style="{x:Null}" Background="Transparent" Foreground="{StaticResource BlackForegroundBrush}" BorderThickness="0" Text="{Binding MaxNlPerCm}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontWeight="Bold" FontStyle="Italic"></TextBox>
                                                                                     </Grid>
                                                                                 </StackPanel>
                                                                             </DataTemplate>
@@ -853,19 +847,19 @@
 
                                                 <Border DockPanel.Dock="Bottom" Margin="10">
                                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                                                        <Button Command="{Binding DuplicateBrushStopCommand}" Margin="0 0 4 0" Background="#FF9A6A" BorderBrush="#FF9A6A" Height="42" Padding="10">
+                                                        <Button Command="{Binding DuplicateBrushStopCommand}" Margin="0 0 4 0" Background="{StaticResource OrangeBrush300}" BorderBrush="{StaticResource OrangeBrush300}" Height="42" Padding="10">
                                                             <StackPanel Orientation="Horizontal">
                                                                 <materialDesign:PackIcon Kind="ContentCopy" Width="24" Height="24"></materialDesign:PackIcon>
                                                                 <TextBlock VerticalAlignment="Center">Duplicate</TextBlock>
                                                             </StackPanel>
                                                         </Button>
-                                                        <Button Command="{Binding RemoveBrushStopCommand}" Margin="0 0 4 0" Background="#FF6A6A" BorderBrush="#FF6A6A" Height="42" Padding="10">
+                                                        <Button Command="{Binding RemoveBrushStopCommand}" Margin="0 0 4 0" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Height="42" Padding="10">
                                                             <StackPanel Orientation="Horizontal">
                                                                 <materialDesign:PackIcon Kind="Delete" Width="24" Height="24"></materialDesign:PackIcon>
                                                                 <TextBlock VerticalAlignment="Center">Remove</TextBlock>
                                                             </StackPanel>
                                                         </Button>
-                                                        <Button AutomationProperties.AutomationId="{x:Static automation:Developer.AddBrushStopButton}" Command="{Binding AddBrushStopCommand}" Background="#68B367" BorderBrush="#68B367" Height="42" Padding="10">
+                                                        <Button AutomationProperties.AutomationId="{x:Static automation:Developer.AddBrushStopButton}" Command="{Binding AddBrushStopCommand}" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Height="42" Padding="10">
                                                             <StackPanel Orientation="Horizontal">
                                                                 <materialDesign:PackIcon Kind="Plus" Width="24" Height="24"></materialDesign:PackIcon>
                                                                 <TextBlock VerticalAlignment="Center">New</TextBlock>
@@ -879,15 +873,15 @@
                                                         <Grid DockPanel.Dock="Top">
                                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                                                 <Image Source="../Images/color-palette.png" Width="42"></Image>
-                                                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" Foreground="DimGray" FontSize="16" FontWeight="SemiBold">SEGMENT BRUSH</TextBlock>
+                                                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" Foreground="{StaticResource DimGrayBrush}" FontSize="16" FontWeight="SemiBold">SEGMENT BRUSH</TextBlock>
                                                             </StackPanel>
 
                                                             <DockPanel>
                                                                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" VerticalAlignment="Center" Margin="0 0 0 0">
-                                                                    <TextBlock VerticalAlignment="Center" Foreground="DimGray">Generate Gradient</TextBlock>
+                                                                    <TextBlock VerticalAlignment="Center" Foreground="{StaticResource DimGrayBrush}">Generate Gradient</TextBlock>
                                                                     <ToggleButton Margin="10 0 0 0" IsChecked="{Binding Settings.EnableGradientGeneration,Mode=TwoWay}" />
-                                                                    <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Foreground="DimGray">Resolution:</TextBlock>
-                                                                    <mahapps:NumericUpDown HideUpDownButtons="True" Width="90" HorizontalAlignment="Left" FontSize="14" FontFamily="{StaticResource digital-7}" StringFormat="{}{0:N0} cm" Margin="5 1 0 0" Minimum="10" Maximum="1000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding Settings.GradientResolutionCM,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                                                    <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Foreground="{StaticResource DimGrayBrush}">Resolution:</TextBlock>
+                                                                    <mahapps:NumericUpDown HideUpDownButtons="True" Width="90" HorizontalAlignment="Left" FontSize="14" FontFamily="{StaticResource digital-7}" StringFormat="{}{0:N0} cm" Margin="5 1 0 0" Minimum="10" Maximum="1000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" BorderBrush="{StaticResource DimGrayBrush}" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding Settings.GradientResolutionCM,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                                                                         <mahapps:NumericUpDown.Resources>
                                                                             <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
                                                                         </mahapps:NumericUpDown.Resources>
@@ -962,7 +956,7 @@
                                                                                                     <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ColorSpaces}" SelectedItem="{Binding ColorSpace}" DisplayMemberPath="Name" Width="100" HorizontalAlignment="Left">
                                                                                                         <ComboBox.ItemContainerStyle>
                                                                                                             <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
-                                                                                                                <Setter Property="Background" Value="#ECECEC"></Setter>
+                                                                                                                <Setter Property="Background" Value="{StaticResource WhiteBrush100}"></Setter>
                                                                                                             </Style>
                                                                                                         </ComboBox.ItemContainerStyle>
                                                                                                     </ComboBox>
@@ -982,9 +976,9 @@
                                                                                                     </Style>
                                                                                                 </StackPanel.Style>
                                                                                                 <TextBlock Width="180" TextAlignment="Center" HorizontalAlignment="Center" FontSize="16">
-                                                                                                                <Run FontWeight="Bold" FontStyle="Italic" Text="OFFSET:" Foreground="#5E5E5E"></Run> 
-                                                                                                                <Run FontFamily="{StaticResource digital-7}" Text="{Binding OffsetPercent,StringFormat={}{0:F1}%}"></Run>
-                                                                                                                <Run FontSize="12" Foreground="Gray" Text="{Binding OffsetMeters,Mode=OneWay,StringFormat={}   ( {0:F1}m )}"></Run>
+                                                                                                                <Run FontWeight="Bold" FontStyle="Italic" Text="OFFSET:" Foreground="{StaticResource GrayBrush250}"></Run> 
+                                                                                                                <Run FontFamily="{StaticResource digital-7}" Text="{Binding OffsetPercent,StringFormat={}{0:F1}%}" Foreground="{StaticResource BlackForegroundBrush}"></Run>
+                                                                                                                <Run FontSize="12" Foreground="{StaticResource GrayBrush250}" Text="{Binding OffsetMeters,Mode=OneWay,StringFormat={}   ( {0:F1}m )}"></Run>
                                                                                                 </TextBlock>
                                                                                                 <Slider ValueChanged="Offset_Slider_ValueChanged" Style="{StaticResource GradientOffsetSlider}" SmallChange="0.1" IsSnapToTickEnabled="True" TickFrequency="0.1" Margin="0 20 0 0" HorizontalAlignment="Center" Width="300" Value="{Binding OffsetPercent}" IsEnabled="{Binding IsMiddle}" Minimum="0" Maximum="100">
                                                                                                     <Slider.Foreground>
@@ -1092,7 +1086,7 @@
                                                                                                                                 <DataTemplate>
                                                                                                                                     <TextBlock VerticalAlignment="Center">
                                                                                                                         <Run Text="{Binding NanoliterPerStep,Mode=OneWay,StringFormat='0.00'}"></Run>
-                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
                                                                                                                                     </TextBlock>
                                                                                                                                 </DataTemplate>
                                                                                                                             </DataGridTemplateColumn.CellTemplate>
@@ -1103,7 +1097,7 @@
                                                                                                                                     <ComboBox ItemsSource="{Binding Source={StaticResource dispenserDivisions}}" SelectedItem="{Binding DispenserStepDivision,UpdateSourceTrigger=PropertyChanged}" BorderThickness="0">
                                                                                                                                         <ComboBox.ItemContainerStyle>
                                                                                                                                             <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
-                                                                                                                                                <Setter Property="Background" Value="#ECECEC"></Setter>
+                                                                                                                                                <Setter Property="Background" Value="{StaticResource WhiteBrush100}"></Setter>
                                                                                                                                             </Style>
                                                                                                                                         </ComboBox.ItemContainerStyle>
                                                                                                                                         <ComboBox.ItemTemplate>
@@ -1120,7 +1114,7 @@
                                                                                                                                 <DataTemplate>
                                                                                                                                     <TextBlock VerticalAlignment="Center">
                                                                                                                         <Run Text="{Binding LiquidMaxNanoliterPerCentimeter,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
                                                                                                                                     </TextBlock>
                                                                                                                                 </DataTemplate>
                                                                                                                             </DataGridTemplateColumn.CellTemplate>
@@ -1130,7 +1124,7 @@
                                                                                                                                 <DataTemplate>
                                                                                                                                     <TextBlock VerticalAlignment="Center">
                                                                                                                         <Run Text="{Binding Volume}"></Run>
-                                                                                                                        <Run Text="%" Foreground="Gray"></Run>
+                                                                                                                        <Run Text="%" Foreground="{StaticResource GrayBrush250}"></Run>
                                                                                                                                     </TextBlock>
                                                                                                                                 </DataTemplate>
                                                                                                                             </DataGridTemplateColumn.CellTemplate>
@@ -1149,7 +1143,7 @@
                                                                                                                                 <DataTemplate>
                                                                                                                                     <TextBlock VerticalAlignment="Center">
                                                                                                                         <Run Text="{Binding NanoliterPerCentimeter,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
                                                                                                                                     </TextBlock>
                                                                                                                                 </DataTemplate>
                                                                                                                             </DataGridTemplateColumn.CellTemplate>
@@ -1159,7 +1153,7 @@
                                                                                                                                 <DataTemplate>
                                                                                                                                     <TextBlock VerticalAlignment="Center">
                                                                                                                         <Run Text="{Binding NanoliterPerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
                                                                                                                                     </TextBlock>
                                                                                                                                 </DataTemplate>
                                                                                                                             </DataGridTemplateColumn.CellTemplate>
@@ -1174,7 +1168,7 @@
                                                                                                                                                     <Setter.Value>
                                                                                                                                                         <TextBlock>
                                                                                                                                                  <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
                                                                                                                                                         </TextBlock>
                                                                                                                                                     </Setter.Value>
                                                                                                                                                 </Setter>
@@ -1187,7 +1181,7 @@
                                                                                                                                                             <Setter.Value>
                                                                                                                                                                 <TextBlock>
                                                                                                                                                  <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
                                                                                                                                                                 </TextBlock>
                                                                                                                                                             </Setter.Value>
                                                                                                                                                         </Setter>
@@ -1243,7 +1237,7 @@
                                     <Grid DockPanel.Dock="Left" VerticalAlignment="Center" Margin="20 15 0 0">
                                         <TextBlock FontSize="16" Margin="0 0 0 0">
                                                         <Run FontWeight="Bold">ESTIMATED DURATION:</Run>
-                                                        <Run Foreground="Black" FontSize="22" FontStyle="Italic" FontFamily="{StaticResource digital-7}" Text="{Binding EstimatedDuration,StringFormat=hh\\:mm\\:ss,TargetNullValue='00:00:00'}"></Run>
+                                                        <Run Foreground="{StaticResource BlackForegroundBrush}" FontSize="22" FontStyle="Italic" FontFamily="{StaticResource digital-7}" Text="{Binding EstimatedDuration,StringFormat=hh\\:mm\\:ss,TargetNullValue='00:00:00'}"></Run>
                                         </TextBlock>
                                     </Grid>
 
@@ -1256,7 +1250,7 @@
                                                 </StackPanel>
                                             </Button>
                                             <Button Height="60" Width="60" Margin="-60 0 0 0" Padding="0" Command="{Binding StartJobAndRecordCommand}" Click="OnJobStartClick" ToolTip="Start Job and Record">
-                                                <materialDesign:PackIcon VerticalAlignment="Center" Width="38" Height="38" Kind="Record" Foreground="#FF6D6D" />
+                                                <materialDesign:PackIcon VerticalAlignment="Center" Width="38" Height="38" Kind="Record" Foreground="{StaticResource RedBrush200}" />
                                             </Button>
                                         </StackPanel>
                                         <Button Command="{Binding ToRunningJobCommand}" Width="280" Height="60" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityConverter}}">
@@ -1298,11 +1292,11 @@
                                                                 </Rectangle>
 
                                                                 <StackPanel Margin="0 0 0 0" HorizontalAlignment="Center">
-                                                                    <TextBlock FontSize="12" HorizontalAlignment="Right" Foreground="Black">
+                                                                    <TextBlock FontSize="12" HorizontalAlignment="Right" Foreground="{StaticResource BlackForegroundBrush}">
                                                                                 <Run Text="{Binding Length,Mode=OneWay,StringFormat=N2}"></Run>
-                                                                                <Run Foreground="Gray" FontSize="10" Text="m"></Run>
+                                                                                <Run Foreground="{StaticResource GrayBrush250}" FontSize="10" Text="m"></Run>
                                                                     </TextBlock>
-                                                                    <materialDesign:PackIcon HorizontalAlignment="Center" RenderTransformOrigin="0.5,0.5" Kind="Triangle" Width="8" Height="8" Foreground="DimGray">
+                                                                    <materialDesign:PackIcon HorizontalAlignment="Center" RenderTransformOrigin="0.5,0.5" Kind="Triangle" Width="8" Height="8" Foreground="{StaticResource DimGrayBrush}">
                                                                         <materialDesign:PackIcon.RenderTransform>
                                                                             <RotateTransform Angle="180" />
                                                                         </materialDesign:PackIcon.RenderTransform>
@@ -1314,23 +1308,23 @@
                                                 </ItemsControl>
 
                                                 <StackPanel Margin="-30 -5 0 0" HorizontalAlignment="Left">
-                                                    <TextBlock FontSize="12" Foreground="Black">
+                                                    <TextBlock FontSize="12" Foreground="{StaticResource BlackForegroundBrush}">
                                                                                 <Run Text="0"></Run>
-                                                                                <Run Foreground="Gray" FontSize="10" Text="m"></Run>
+                                                                                <Run Foreground="{StaticResource GrayBrush250}" FontSize="10" Text="m"></Run>
                                                     </TextBlock>
-                                                    <materialDesign:PackIcon HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" Kind="SubdirectoryArrowRight" Width="16" Height="16" Foreground="DimGray">
+                                                    <materialDesign:PackIcon HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" Kind="SubdirectoryArrowRight" Width="16" Height="16" Foreground="{StaticResource DimGrayBrush}">
 
                                                     </materialDesign:PackIcon>
                                                 </StackPanel>
 
                                                 <StackPanel Margin="0 -5 -20 0" HorizontalAlignment="Right">
-                                                    <TextBlock FontSize="12" Foreground="Black">
+                                                    <TextBlock FontSize="12" Foreground="{StaticResource BlackForegroundBrush}">
                                                                                 <Run Text="{Binding ActiveJob.Length,Mode=OneWay,StringFormat=N2}"></Run>
                                                                                 <Run Foreground="Gray" FontSize="10" Text="m"></Run>
                                                         <Run>x</Run>
                                                         <Run Text="{Binding ActiveJob.NumberOfUnits}"></Run>
                                                     </TextBlock>
-                                                    <materialDesign:PackIcon HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" Kind="FlagCheckered" Width="16" Height="16" Foreground="DimGray">
+                                                    <materialDesign:PackIcon HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" Kind="FlagCheckered" Width="16" Height="16" Foreground="{StaticResource DimGrayBrush}">
 
                                                     </materialDesign:PackIcon>
                                                 </StackPanel>
@@ -1349,7 +1343,7 @@
             </Grid>
 
             <Grid>
-                <Grid Background="#B9FFFFFF">
+                <Grid Background="{StaticResource TransparentBackgroundBrush100}">
                     <Grid.Style>
                         <Style TargetType="Grid">
                             <Setter Property="Width" Value="520"></Setter>
@@ -1390,7 +1384,7 @@
                                                     <ComboBox Margin="0 10 0 0" ItemsSource="{Binding GroupsHistory}" SelectedItem="{Binding SelectedGroupHistory}">
                                                         <ComboBox.ItemContainerStyle>
                                                             <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
-                                                                <Setter Property="Background" Value="#E6FFFFFF"></Setter>
+                                                                <Setter Property="Background" Value="{StaticResource TransparentBackgroundBrush200}"></Setter>
                                                                 <Setter Property="Padding" Value="5"></Setter>
                                                             </Style>
                                                         </ComboBox.ItemContainerStyle>
@@ -1402,14 +1396,14 @@
                                                                             <Style TargetType="TextBlock">
                                                                                 <Style.Triggers>
                                                                                     <DataTrigger Binding="{Binding Active}" Value="True">
-                                                                                        <Setter Property="Foreground" Value="#FF5F5F"></Setter>
+                                                                                        <Setter Property="Foreground" Value="{StaticResource RedBrush100}"></Setter>
                                                                                         <Setter Property="FontStyle" Value="Italic"></Setter>
                                                                                     </DataTrigger>
                                                                                 </Style.Triggers>
                                                                             </Style>
                                                                         </TextBlock.Style>
                                                                     </TextBlock>
-                                                                    <TextBlock Text="{Binding SaveDate}" Margin="10 0 0 0" FontStyle="Italic" Foreground="Gray" VerticalAlignment="Center"></TextBlock>
+                                                                    <TextBlock Text="{Binding SaveDate}" Margin="10 0 0 0" FontStyle="Italic" Foreground="{StaticResource GrayBrush250}" VerticalAlignment="Center"></TextBlock>
                                                                 </StackPanel>
                                                             </DataTemplate>
                                                         </ComboBox.ItemTemplate>
@@ -1439,7 +1433,7 @@
                                                                     <Style.Triggers>
                                                                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,FallbackValue=False}" Value="True">
                                                                             <Setter Property="BorderBrush" Value="{StaticResource AccentColorBrush}"></Setter>
-                                                                            <Setter Property="Background" Value="#D4FFFFFF"></Setter>
+                                                                            <Setter Property="Background" Value="{StaticResource TransparentBackgroundBrush300}"></Setter>
                                                                             <Setter Property="Opacity" Value="1"></Setter>
                                                                         </DataTrigger>
                                                                     </Style.Triggers>
@@ -1453,7 +1447,7 @@
                                                                             <WrapPanel.Resources>
                                                                                 <Style TargetType="TextBlock">
                                                                                     <Setter Property="FontSize" Value="10"></Setter>
-                                                                                    <Setter Property="Foreground" Value="#7A7A7A"></Setter>
+                                                                                    <Setter Property="Foreground" Value="{StaticResource GrayBrush50}"></Setter>
                                                                                     <Setter Property="Margin" Value="0 5 0 5"></Setter>
                                                                                     <Setter Property="MinWidth" Value="80"></Setter>
                                                                                 </Style>
@@ -1514,7 +1508,7 @@
 
                                                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="5" Visibility="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,Converter={StaticResource BooleanToVisibilityConverter}}">
                                                                         <TextBlock Text="Active" FontWeight="Bold" FontStyle="Italic" FontSize="13" VerticalAlignment="Center"></TextBlock>
-                                                                        <materialDesign:PackIcon Foreground="#90E990" Kind="CheckboxBlankCircle" VerticalAlignment="Center" Margin="5 0 0 0">
+                                                                        <materialDesign:PackIcon Foreground="{StaticResource GreenBrush400}" Kind="CheckboxBlankCircle" VerticalAlignment="Center" Margin="5 0 0 0">
                                                                             <materialDesign:PackIcon.Style>
                                                                                 <Style TargetType="materialDesign:PackIcon">
                                                                                     <Setter Property="Opacity" Value="0"></Setter>
@@ -1553,7 +1547,7 @@
                                             </ListBox>
 
                                             <StackPanel Margin="10 20" VerticalAlignment="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
-                                                <Button Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="#202020" Foreground="#202020" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
+                                                <Button Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush200}" Foreground="{StaticResource DarkGrayBrush200}" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
                                                     <TextBlock TextWrapping="Wrap" TextAlignment="Center">
                                                         TEMP OFF
                                                     </TextBlock>
@@ -1589,7 +1583,7 @@
                                                 </Style.Triggers>
                                             </Style>
                                         </Grid.Style>
-                                        <TextBlock Foreground="#FA9292" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24">SELECT MACHINE &amp; MEDIA</TextBlock>
+                                        <TextBlock Foreground="{StaticResource RedBrush400}" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24">SELECT MACHINE &amp; MEDIA</TextBlock>
                                     </Grid>
                                 </Grid>
                             </Expander>
@@ -1599,14 +1593,14 @@
                         </StackPanel>
                     </ScrollViewer>
 
-                    <Rectangle HorizontalAlignment="Right" Stroke="#383838" VerticalAlignment="Top" Height="427"></Rectangle>
-                    <Rectangle HorizontalAlignment="Right" Stroke="#383838" VerticalAlignment="Bottom" Height="428"></Rectangle>
+                    <Rectangle HorizontalAlignment="Right" Stroke="{StaticResource GrayBrush280}" VerticalAlignment="Top" Height="427"></Rectangle>
+                    <Rectangle HorizontalAlignment="Right" Stroke="{StaticResource GrayBrush280}" VerticalAlignment="Bottom" Height="428"></Rectangle>
                 </Grid>
 
                 <Button Background="Transparent" Command="{Binding ToggleSideBarCommand}" Padding="0" Style="{StaticResource MaterialDesignFlatButton}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" HorizontalAlignment="Right" VerticalAlignment="Center" Height="200" Width="50" Margin="0 0 -50 0">
-                    <Border Background="#F1F1F1" CornerRadius="0 10 10 0" BorderThickness="0 1 1 1" BorderBrush="#383838">
+                    <Border Background="{StaticResource WhiteBrush100}" CornerRadius="0 10 10 0" BorderThickness="0 1 1 1" BorderBrush="{StaticResource GrayBrush280}">
                         <Grid>
-                            <TextBlock Foreground="#FF7272" Text="PROCESS PARAMETERS" FontSize="16" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Center" HorizontalAlignment="Center">
+                            <TextBlock Foreground="{StaticResource RedBrush300}" Text="PROCESS PARAMETERS" FontSize="16" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Center" HorizontalAlignment="Center">
                                 <TextBlock.LayoutTransform>
                                     <RotateTransform Angle="270"></RotateTransform>
                                 </TextBlock.LayoutTransform>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
index 0ba2e39d4..70d5b6180 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
@@ -35,12 +35,12 @@
                 <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-            <Grid Background="#B1FFFFFF">
+            <Grid Background="{StaticResource TransparentBackgroundBrush400}">
                 <StackPanel>
                     <TextBlock Margin="40 20" FontSize="30" FontWeight="SemiBold" FontStyle="Italic">TARGET MACHINE</TextBlock>
 
                     <DockPanel Margin="40 0 40 0" IsEnabled="{Binding CanWork}">
-                        <Button Command="{Binding ReloadMachinesCommand}" DockPanel.Dock="Right" ToolTip="Reload" Foreground="#404040" Margin="20 0 0 0" Padding="0" Width="40" Height="Auto" Style="{StaticResource MaterialDesignFlatButton}">
+                        <Button Command="{Binding ReloadMachinesCommand}" DockPanel.Dock="Right" ToolTip="Reload" Foreground="{StaticResource GrayBrush280}" Margin="20 0 0 0" Padding="0" Width="40" Height="Auto" Style="{StaticResource MaterialDesignFlatButton}">
                             <materialDesign:PackIcon Kind="Refresh" Width="24" Height="24" />
                         </Button>
                         <autoComplete:AutoCompleteTextBox Provider="{Binding MachinesProvider}" LoadingContent="Loading..." FontSize="20" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}" materialDesign:HintAssist.Hint="Serial Number" DisplayMember="SerialNumber">
@@ -94,19 +94,19 @@
                         <Grid DockPanel.Dock="Bottom" Margin="0 20 0 0">
 
                             <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="20 0 0 0">
-                                <Button AutomationProperties.AutomationId="{x:Static automation:Developer.DeleteJobButton}" Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveJobCommand}">
+                                <Button AutomationProperties.AutomationId="{x:Static automation:Developer.DeleteJobButton}" Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding RemoveJobCommand}">
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
                                         <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
                                     </StackPanel>
                                 </Button>
-                                <Button AutomationProperties.AutomationId="{x:Static automation:Developer.DuplicateJobButton}" Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF995A" BorderBrush="#FF995A" Command="{Binding DuplicateJobCommand}">
+                                <Button AutomationProperties.AutomationId="{x:Static automation:Developer.DuplicateJobButton}" Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource OrangeBrush300}" BorderBrush="{StaticResource OrangeBrush300}" Command="{Binding DuplicateJobCommand}">
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon Kind="ContentCopy" Width="20" Height="20" />
                                         <TextBlock Margin="5 0 0 0" FontSize="16">DUPLICATE</TextBlock>
                                     </StackPanel>
                                 </Button>
-                                <Button AutomationProperties.AutomationId="{x:Static automation:Developer.NewJobButton}" Margin="0 0 10 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding AddJobCommand}">
+                                <Button AutomationProperties.AutomationId="{x:Static automation:Developer.NewJobButton}" Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding AddJobCommand}">
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
                                         <TextBlock Margin="5 0 0 0" FontSize="16">NEW JOB</TextBlock>
@@ -260,7 +260,7 @@
                         </Grid>
                     </DockPanel>
 
-                    <Button Command="{Binding ImportEmbroideryFileCommand}" Margin="20 0 0 -100" Foreground="Black" FontSize="16" VerticalAlignment="Bottom" HorizontalAlignment="Left" Style="{StaticResource emptyButton}" Cursor="Hand">
+                    <Button Command="{Binding ImportEmbroideryFileCommand}" Margin="20 0 0 -100" Foreground="{StaticResource BlackForegroundBrush}" FontSize="16" VerticalAlignment="Bottom" HorizontalAlignment="Left" Style="{StaticResource emptyButton}" Cursor="Hand">
                         <StackPanel Orientation="Horizontal">
                             <Image Source="../Images/sewing-machine.png" Width="32"></Image>
                             <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" TextDecorations="Underline">Import Embroidery File</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index 6289f009b..2787d73ef 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -65,7 +65,7 @@
             </Grid.RowDefinitions>
 
             <StackPanel>
-                <Grid Background="#202020" TextElement.Foreground="Silver">
+                <Grid Background="{StaticResource DarkGrayBrush}" TextElement.Foreground="Silver">
                     <Grid.Style>
                         <Style TargetType="Grid">
                             <Setter Property="LayoutTransform">
@@ -93,13 +93,13 @@
                             </Style.Triggers>
                         </Style>
                     </Grid.Style>
-                    <Border BorderBrush="#404040" BorderThickness="0 0 0 1" Padding="20">
+                    <Border BorderBrush="{StaticResource GrayBrush280}" BorderThickness="0 0 0 1" Padding="20">
                         <Grid>
                             <DockPanel>
                                 <Grid DockPanel.Dock="Left" MinWidth="190" VerticalAlignment="Center" Margin="0 0 0 0">
                                     <StackPanel Orientation="Vertical"  Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                        <ProgressBar  Foreground="#FF6464" Width="50" Height="50" HorizontalAlignment="Center" VerticalAlignment="Center" IsIndeterminate="True" Style="{StaticResource MaterialDesignCircularProgressBar}" Value="0" />
-                                        <TextBlock Margin="0 10 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" FontStyle="Italic" FontWeight="DemiBold" Foreground="#FF6464" TextWrapping="Wrap">
+                                        <ProgressBar  Foreground="{StaticResource RedBrush300}" Width="50" Height="50" HorizontalAlignment="Center" VerticalAlignment="Center" IsIndeterminate="True" Style="{StaticResource MaterialDesignCircularProgressBar}" Value="0" />
+                                        <TextBlock Margin="0 10 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" FontStyle="Italic" FontWeight="DemiBold" Foreground="{StaticResource RedBrush300}" TextWrapping="Wrap">
                                 <Run Text="Running '"></Run>
                                 <Run Text="{Binding RunningJob.Name}"></Run>
                                 <Run Text="'..."></Run>
@@ -108,9 +108,9 @@
                                 </Grid>
                                 <StackPanel DockPanel.Dock="Right" VerticalAlignment="Center" Margin="0 20 0 0">
                                     <StackPanel Orientation="Horizontal">
-                                        <TextBlock VerticalAlignment="Center" FontSize="30" FontFamily="{StaticResource digital-7}" Margin="0 0 40 0" Foreground="#FF6464" Width="100" Text="{Binding RunningJobStatus.RemainingTime,StringFormat=hh\\:mm\\:ss}"></TextBlock>
+                                        <TextBlock VerticalAlignment="Center" FontSize="30" FontFamily="{StaticResource digital-7}" Margin="0 0 40 0" Foreground="{StaticResource RedBrush300}" Width="100" Text="{Binding RunningJobStatus.RemainingTime,StringFormat=hh\\:mm\\:ss}"></TextBlock>
 
-                                        <Button Height="40" Width="170" Command="{Binding StopJobCommand}" Background="#FF6464" BorderBrush="#FF6464">
+                                        <Button Height="40" Width="170" Command="{Binding StopJobCommand}" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}">
                                             <StackPanel Orientation="Horizontal">
                                                 <materialDesign:PackIcon VerticalAlignment="Center" Width="24" Height="24" Kind="Stop" />
                                                 <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">STOP</TextBlock>
@@ -120,7 +120,7 @@
                                 </StackPanel>
                                 <Grid>
                                     <Grid>
-                                        <Border Margin="0 10 0 0" VerticalAlignment="Bottom" Width="1200" BorderBrush="#404040" BorderThickness="0" ClipToBounds="False">
+                                        <Border Margin="0 10 0 0" VerticalAlignment="Bottom" Width="1200" BorderBrush="{StaticResource GrayBrush280}" BorderThickness="0" ClipToBounds="False">
                                             <Grid ClipToBounds="False" >
 
                                                 <ItemsControl ClipToBounds="False" x:Name="runningJobBrushList" ItemsSource="{Binding RunningJobStatus.CurrentUnitSegments}" Margin="0 0 60 0">
@@ -135,7 +135,7 @@
 
                                                                 <Grid.ToolTip>
                                                                     <ToolTip Background="White" Padding="0" Visibility="{Binding IsInterSegment,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                                                        <Border BorderThickness="1" BorderBrush="#202020" CornerRadius="3" Padding="5">
+                                                                        <Border BorderThickness="1" BorderBrush="{StaticResource DarkGrayBrush}" CornerRadius="3" Padding="5">
                                                                             <StackPanel Background="White">
                                                                                 <ItemsControl ItemsSource="{Binding BrushStops[0].LiquidVolumes}" VerticalAlignment="Center">
                                                                                     <ItemsControl.ItemsPanel>
@@ -149,7 +149,7 @@
                                                                                                 <ContentControl.Foreground>
                                                                                                     <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
                                                                                                 </ContentControl.Foreground>
-                                                                                                <TextBlock Foreground="#202020" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Volume,StringFormat=0.00}"></TextBlock>
+                                                                                                <TextBlock Foreground="{StaticResource DarkGrayBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Volume,StringFormat=0.00}"></TextBlock>
                                                                                             </ContentControl>
                                                                                         </DataTemplate>
                                                                                     </ItemsControl.ItemTemplate>
@@ -200,7 +200,7 @@
                                                                                                     <ComboBox ItemsSource="{Binding Source={StaticResource dispenserDivisions}}" SelectedItem="{Binding DispenserStepDivision,UpdateSourceTrigger=PropertyChanged}" BorderThickness="0">
                                                                                                         <ComboBox.ItemContainerStyle>
                                                                                                             <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
-                                                                                                                <Setter Property="Background" Value="#ECECEC"></Setter>
+                                                                                                                <Setter Property="Background" Value="{StaticResource WhiteBrush100}"></Setter>
                                                                                                             </Style>
                                                                                                         </ComboBox.ItemContainerStyle>
                                                                                                         <ComboBox.ItemTemplate>
@@ -339,7 +339,7 @@
                                                                                         <DataTrigger Binding="{Binding Started}" Value="True">
                                                                                             <Setter Property="Content">
                                                                                                 <Setter.Value>
-                                                                                                    <TextBlock Text="{Binding RemainingTime,StringFormat=hh\\:mm\\:ss}" Foreground="#FF6464" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Margin="10" FontSize="20"></TextBlock>
+                                                                                                    <TextBlock Text="{Binding RemainingTime,StringFormat=hh\\:mm\\:ss}" Foreground="{StaticResource RedBrush300}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Margin="10" FontSize="20"></TextBlock>
                                                                                                 </Setter.Value>
                                                                                             </Setter>
                                                                                         </DataTrigger>
@@ -378,14 +378,14 @@
                                                                                 <Run Text="{Binding RunningJobStatus.CurrentUnitTotalProgress,Mode=OneWay,StringFormat=N2}"></Run>
                                                                                 <Run FontSize="13" Text="m"></Run>
                                                                                 <Run></Run>
-                                                                                <Run Foreground="#FF6464">x</Run><Run Foreground="#FF6464" FontSize="16" FontWeight="SemiBold" Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
+                                                                                <Run Foreground="{StaticResource RedBrush300}">x</Run><Run Foreground="{StaticResource RedBrush300}" FontSize="16" FontWeight="SemiBold" Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
                                                     </TextBlock>
                                                     <materialDesign:PackIcon HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" Kind="FlagCheckered" Width="20" Height="20">
 
                                                     </materialDesign:PackIcon>
                                                 </StackPanel>
 
-                                                <Border BorderBrush="#404040" BorderThickness="1" VerticalAlignment="Center" Height="30" Margin="0 11 60 0">
+                                                <Border BorderBrush="{StaticResource GrayBrush280}" BorderThickness="1" VerticalAlignment="Center" Height="30" Margin="0 11 60 0">
 
                                                 </Border>
 
@@ -398,8 +398,8 @@
                                                                 <Binding ElementName="jobProgressCanvas" Path="ActualWidth" />
                                                             </MultiBinding>
                                                         </Canvas.Left>
-                                                        <materialDesign:PackIcon Kind="MapMarker" Foreground="#FF6464" Width="35" Height="35" Margin="-17 0 0 0" />
-                                                        <TextBlock Margin="-11 -23 0 0" FontSize="16" Foreground="#FF6464" VerticalAlignment="Top" Height="18" Text="{Binding RunningJobStatus.Progress,StringFormat=0.0}"></TextBlock>
+                                                        <materialDesign:PackIcon Kind="MapMarker" Foreground="{StaticResource RedBrush300}" Width="35" Height="35" Margin="-17 0 0 0" />
+                                                        <TextBlock Margin="-11 -23 0 0" FontSize="16" Foreground="{StaticResource RedBrush300}" VerticalAlignment="Top" Height="18" Text="{Binding RunningJobStatus.Progress,StringFormat=0.0}"></TextBlock>
                                                     </Grid>
                                                 </Canvas>
                                             </Grid>
@@ -408,7 +408,7 @@
                                 </Grid>
                             </DockPanel>
 
-                            <TextBlock Visibility="{Binding RunningJobStatus.IsFinalizing,Converter={StaticResource BooleanToVisibilityConverter}}" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="-170 0 0 0" Background="#202020" FontSize="14" Height="30" Foreground="#FF6D6D">Finalizing...</TextBlock>
+                            <TextBlock Visibility="{Binding RunningJobStatus.IsFinalizing,Converter={StaticResource BooleanToVisibilityConverter}}" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="-170 0 0 0" Background="{StaticResource DarkGrayBrush}" FontSize="14" Height="30" Foreground="{StaticResource RedBrush100}">Finalizing...</TextBlock>
                         </Grid>
                     </Border>
 
@@ -444,7 +444,7 @@
                         </Style>
                     </Grid.Style>
 
-                    <Border BorderBrush="#404040" BorderThickness="0 1 0 1" Padding="5">
+                    <Border BorderBrush="{StaticResource GrayBrush280}" BorderThickness="0 1 0 1" Padding="5">
                         <DockPanel>
                             <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
                                 <materialDesign:PackIcon Kind="Check" Width="32" Height="32" VerticalAlignment="Center" />
@@ -454,7 +454,7 @@
                             <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" Margin="0 0 10 0">
                                 <Button Height="20" Padding="0" Command="{Binding CloseJobCompletionStatusCommand}" Style="{StaticResource MaterialDesignFlatButton}">
                                     <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Foreground="#202020" VerticalAlignment="Center" Width="20" Height="20" Kind="Close" />
+                                        <materialDesign:PackIcon Foreground="{StaticResource DarkGrayBrush}" VerticalAlignment="Center" Width="20" Height="20" Kind="Close" />
                                     </StackPanel>
                                 </Button>
                             </StackPanel>
@@ -495,7 +495,7 @@
                         </Style>
                     </Grid.Style>
 
-                    <Border BorderBrush="#404040" BorderThickness="0 1 0 1" Padding="5">
+                    <Border BorderBrush="{StaticResource GrayBrush280}" BorderThickness="0 1 0 1" Padding="5">
                         <DockPanel>
                             <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
                                 <materialDesign:PackIcon Kind="Alert" Width="32" Height="32" VerticalAlignment="Center" />
@@ -512,7 +512,7 @@
 
                                 <Button Padding="0" Height="20" Command="{Binding CloseJobCompletionStatusCommand}" Style="{StaticResource MaterialDesignFlatButton}">
                                     <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Foreground="#202020" VerticalAlignment="Center" Width="20" Height="20" Kind="Close" />
+                                        <materialDesign:PackIcon Foreground="{StaticResource DarkGrayBrush}" VerticalAlignment="Center" Width="20" Height="20" Kind="Close" />
                                     </StackPanel>
                                 </Button>
                             </StackPanel>
@@ -553,7 +553,7 @@
                         </Style>
                     </Grid.Style>
 
-                    <Border BorderBrush="#404040" BorderThickness="0 1 0 1" Padding="5">
+                    <Border BorderBrush="{StaticResource GrayBrush280}" BorderThickness="0 1 0 1" Padding="5">
                         <DockPanel>
                             <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
                                 <materialDesign:PackIcon Kind="Alert" Width="32" Height="32" VerticalAlignment="Center" />
@@ -563,7 +563,7 @@
                             <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" Margin="0 0 10 0">
                                 <Button Padding="0" Height="20" Command="{Binding CloseJobCompletionStatusCommand}" Style="{StaticResource MaterialDesignFlatButton}">
                                     <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Foreground="#202020" VerticalAlignment="Center" Width="20" Height="20" Kind="Close" />
+                                        <materialDesign:PackIcon Foreground="{StaticResource DarkGrayBrush}" VerticalAlignment="Center" Width="20" Height="20" Kind="Close" />
                                     </StackPanel>
                                 </Button>
                             </StackPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
index d0f0c2af6..3073d0b62 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
@@ -84,7 +84,7 @@
                                                         </DataTrigger>
                                                         <DataTrigger Binding="{Binding Completed}" Value="True">
                                                             <Setter Property="Kind" Value="CheckCircle"></Setter>
-                                                            <Setter Property="Foreground" Value="#29B31D"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource GreenBrush100}"></Setter>
                                                         </DataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
@@ -110,7 +110,7 @@
                 </DockPanel>
             </Grid>
 
-            <GridSplitter Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Stretch" Height="5" Background="Black" />
+            <GridSplitter Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Stretch" Height="5" Background="{StaticResource BlackForegroundBrush}" />
             <Grid Grid.Row="2" Margin="0 40 0 0">
                 <DockPanel>
                     <StackPanel Margin="0 0 0 0" Orientation="Horizontal" DockPanel.Dock="Top">
@@ -174,11 +174,11 @@
                                                             </DataTrigger>
                                                             <DataTrigger Binding="{Binding Category}" Value="Warning">
                                                                 <Setter Property="Kind" Value="Alert"></Setter>
-                                                                <Setter Property="Foreground" Value="#FFA300"></Setter>
+                                                                <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
                                                             </DataTrigger>
                                                             <DataTrigger Binding="{Binding Category}" Value="Error">
                                                                 <Setter Property="Kind" Value="AlertOctagon"></Setter>
-                                                                <Setter Property="Foreground" Value="#FF5C5C"></Setter>
+                                                                <Setter Property="Foreground" Value="{StaticResource RedBrush100}"></Setter>
                                                             </DataTrigger>
                                                             <DataTrigger Binding="{Binding Category}" Value="Critical">
                                                                 <Setter Property="Kind" Value="BellPlus"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
index 121e6e45c..71ce6f173 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
@@ -420,7 +420,7 @@
 
                     <Grid Grid.Row="1" Margin="10 0 10 10">
                         <UniformGrid Rows="1">
-                            <Button Height="Auto" Grid.Column="1" Command="{Binding DeleteCommand}" Margin="2" Background="#FF8A8A" BorderBrush="#FF8A8A">
+                            <Button Height="Auto" Grid.Column="1" Command="{Binding DeleteCommand}" Margin="2" Background="{StaticResource RedBrush400}" BorderBrush="{StaticResource RedBrush400}">
                                 <StackPanel Orientation="Horizontal">
                                     <materialDesign:PackIcon Width="20" Height="20" VerticalAlignment="Center" Kind="Delete"></materialDesign:PackIcon>
                                     <TextBlock FontSize="14" Margin="10 0 0 0" VerticalAlignment="Center">DEL</TextBlock>
@@ -432,7 +432,7 @@
                                     <TextBlock FontSize="14" Margin="10 0 0 0" VerticalAlignment="Center">NEW</TextBlock>
                                 </StackPanel>
                             </Button>
-                            <Button Height="Auto" Grid.Column="1" Command="{Binding CloneCommand}" Margin="2" Background="#FF9A6A" BorderBrush="#FF9A6A">
+                            <Button Height="Auto" Grid.Column="1" Command="{Binding CloneCommand}" Margin="2" Background="{StaticResource OrangeBrush300}" BorderBrush="{StaticResource OrangeBrush300}">
                                 <StackPanel Orientation="Horizontal">
                                     <materialDesign:PackIcon Width="20" Height="20" VerticalAlignment="Center" Kind="ContentCopy"></materialDesign:PackIcon>
                                     <TextBlock FontSize="14" Margin="10 0 0 0" VerticalAlignment="Center">CLONE</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogDetailsView.xaml
index c7ebcaf02..d124ac3a1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogDetailsView.xaml
@@ -38,11 +38,11 @@
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Log.Category}" Value="Warning">
                                     <Setter Property="Kind" Value="Alert"></Setter>
-                                    <Setter Property="Foreground" Value="#FFA300"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Log.Category}" Value="Error">
                                     <Setter Property="Kind" Value="AlertOctagon"></Setter>
-                                    <Setter Property="Foreground" Value="#FF5C5C"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource RedBrush100}"></Setter>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Log.Category}" Value="Critical">
                                     <Setter Property="Kind" Value="BellPlus"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
index e61dc99ba..28864e93a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
@@ -50,13 +50,13 @@
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <Border Background="#F1F1F1">
+            <Border Background="{StaticResource WhiteBrush100}">
                 <Border.Effect>
                     <DropShadowEffect />
                 </Border.Effect>
                 <Grid>
                     <StackPanel Orientation="Horizontal">
-                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="#202020" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
+                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="{StaticResource DarkGrayBrush}" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
                             <StackPanel Orientation="Horizontal" >
                                 <materialDesign:PackIcon Kind="ArrowLeftBold" Width="20" Height="20" />
                                 <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
@@ -78,7 +78,7 @@
                             </StackPanel>
                         </Border>
 
-                        <Button Style="{StaticResource MaterialDesignFlatButton}" IsEnabled="{Binding IsRealTime}" Command="{Binding ToggleRealTimePaused}" Padding="0" Height="50" Width="50" Foreground="#202020" ToolTip="Pause/Resume Real-Time">
+                        <Button Style="{StaticResource MaterialDesignFlatButton}" IsEnabled="{Binding IsRealTime}" Command="{Binding ToggleRealTimePaused}" Padding="0" Height="50" Width="50" Foreground="{StaticResource DarkGrayBrush}" ToolTip="Pause/Resume Real-Time">
                             <materialDesign:PackIcon Width="50" Height="50">
                                 <materialDesign:PackIcon.Style>
                                     <Style TargetType="materialDesign:PackIcon">
@@ -200,11 +200,11 @@
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Warning">
                                                                         <Setter Property="Kind" Value="Alert"></Setter>
-                                                                        <Setter Property="Foreground" Value="#FFA300"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Error">
                                                                         <Setter Property="Kind" Value="AlertOctagon"></Setter>
-                                                                        <Setter Property="Foreground" Value="#FF5C5C"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource RedBrush100}"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Critical">
                                                                         <Setter Property="Kind" Value="BellPlus"></Setter>
@@ -212,7 +212,7 @@
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Debug">
                                                                         <Setter Property="Kind" Value="Bug"></Setter>
-                                                                        <Setter Property="Foreground" Value="#303030"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource GrayBrush300}"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding CallerMethodName}" Value="OnStartup">
                                                                         <Setter Property="Kind" Value="ClockFast"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogDetailsView.xaml
index 6511f035f..4864a55a7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogDetailsView.xaml
@@ -36,11 +36,11 @@
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Log.Category}" Value="Warning">
                                     <Setter Property="Kind" Value="Alert"></Setter>
-                                    <Setter Property="Foreground" Value="#FFA300"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Log.Category}" Value="Error">
                                     <Setter Property="Kind" Value="AlertOctagon"></Setter>
-                                    <Setter Property="Foreground" Value="#FF5C5C"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource RedBrush100}"></Setter>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Log.Category}" Value="Critical">
                                     <Setter Property="Kind" Value="BellPlus"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml
index 4573c8451..4e5ba43d3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml
@@ -50,13 +50,13 @@
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <Border Background="#F1F1F1">
+            <Border Background="{StaticResource WhiteBrush100}">
                 <Border.Effect>
                     <DropShadowEffect />
                 </Border.Effect>
                 <Grid>
                     <StackPanel Orientation="Horizontal">
-                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="#202020" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
+                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="{StaticResource DarkGrayBrush}" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
                             <StackPanel Orientation="Horizontal" >
                                 <materialDesign:PackIcon Kind="ArrowLeftBold" Width="20" Height="20" />
                                 <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
@@ -78,7 +78,7 @@
                             </StackPanel>
                         </Border>
 
-                        <Button Style="{StaticResource MaterialDesignFlatButton}" Command="{Binding ToggleRealTimePaused}" Padding="0" Height="50" Width="50" Foreground="#202020" ToolTip="Pause/Resume Real-Time">
+                        <Button Style="{StaticResource MaterialDesignFlatButton}" Command="{Binding ToggleRealTimePaused}" Padding="0" Height="50" Width="50" Foreground="{StaticResource DarkGrayBrush}" ToolTip="Pause/Resume Real-Time">
                             <materialDesign:PackIcon Width="50" Height="50">
                                 <materialDesign:PackIcon.Style>
                                     <Style TargetType="materialDesign:PackIcon">
@@ -170,11 +170,11 @@
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Warning">
                                                                         <Setter Property="Kind" Value="Alert"></Setter>
-                                                                        <Setter Property="Foreground" Value="#FFA300"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Error">
                                                                         <Setter Property="Kind" Value="AlertOctagon"></Setter>
-                                                                        <Setter Property="Foreground" Value="#FF5C5C"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource RedBrush100}"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Critical">
                                                                         <Setter Property="Kind" Value="BellPlus"></Setter>
@@ -182,7 +182,7 @@
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Debug">
                                                                         <Setter Property="Kind" Value="Bug"></Setter>
-                                                                        <Setter Property="Foreground" Value="#303030"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource GrayBrush300}"></Setter>
                                                                     </DataTrigger>
                                                                     <!--<DataTrigger Binding="{Binding CallerMethodName}" Value="OnStartup">
                                                                         <Setter Property="Kind" Value="ClockFast"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml
index 389b18776..8e0dc5fd1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml
@@ -36,11 +36,11 @@
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Event.Category}" Value="Warning">
                                     <Setter Property="Kind" Value="Alert"></Setter>
-                                    <Setter Property="Foreground" Value="#FFA300"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Event.Category}" Value="Error">
                                     <Setter Property="Kind" Value="AlertOctagon"></Setter>
-                                    <Setter Property="Foreground" Value="#FF5C5C"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource RedBrush100}"></Setter>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Event.Category}" Value="Critical">
                                     <Setter Property="Kind" Value="BellPlus"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
index 632495103..5e16461a6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
@@ -50,13 +50,13 @@
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <Border Background="#F1F1F1">
+            <Border Background="{StaticResource WhiteBrush100}">
                 <Border.Effect>
                     <DropShadowEffect />
                 </Border.Effect>
                 <Grid>
                     <StackPanel Orientation="Horizontal">
-                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="#202020" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
+                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="{StaticResource DarkGrayBrush}" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
                             <StackPanel Orientation="Horizontal" >
                                 <materialDesign:PackIcon Kind="ArrowLeftBold" Width="20" Height="20" />
                                 <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
@@ -178,11 +178,11 @@
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Warning">
                                                                         <Setter Property="Kind" Value="Alert"></Setter>
-                                                                        <Setter Property="Foreground" Value="#FFA300"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Error">
                                                                         <Setter Property="Kind" Value="AlertOctagon"></Setter>
-                                                                        <Setter Property="Foreground" Value="#FF5C5C"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource RedBrush100}"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Critical">
                                                                         <Setter Property="Kind" Value="BellPlus"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/HomeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/HomeView.xaml
index b41351064..041650d7f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/HomeView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/HomeView.xaml
@@ -25,7 +25,7 @@
             <Setter Property="CornerRadius" Value="20"></Setter>
             <Setter Property="Width" Value="450"></Setter>
             <Setter Property="Height" Value="400"></Setter>
-            <Setter Property="TextElement.Foreground" Value="#202020"></Setter>
+            <Setter Property="TextElement.Foreground" Value="{StaticResource DarkGrayBrush}"></Setter>
             <Setter Property="TextElement.FontSize" Value="25"></Setter>
             <Setter Property="BorderThickness" Value="1"></Setter>
             <Setter Property="BorderBrush" Value="#D6D6D6"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml
index 664f2489c..fceed1ce8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml
@@ -33,7 +33,7 @@
         </LinearGradientBrush>
 
         <LinearGradientBrush x:Key="errorBrush" StartPoint="0.5,0" EndPoint="0.5,1">
-            <GradientStop Color="#FFFF6A6A"/>
+            <GradientStop Color="{StaticResource RedBrush100}"/>
             <GradientStop Color="#FFD9D9" Offset="1"/>
         </LinearGradientBrush>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
index ce60ebf02..7acb4c806 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
@@ -15,7 +15,7 @@
             <Grid DockPanel.Dock="Top">
                 <StackPanel Orientation="Horizontal">
                     <Button Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Command="{Binding BackToMachinesCommand}">
-                        <materialDesign:PackIcon Kind="ArrowLeft" Width="50" Height="50" Foreground="#202020" ToolTip="Back to RML list" />
+                        <materialDesign:PackIcon Kind="ArrowLeft" Width="50" Height="50" Foreground="{StaticResource DarkGrayBrush}" ToolTip="Back to RML list" />
                     </Button>
                     <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="34" Text="{Binding ActiveMachine.Name}">
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
index ba2a022a1..8c9fe7179 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
@@ -28,7 +28,7 @@
                 <local:MachineView DataContext="{Binding ActiveMachine}" IsHitTestVisible="False" />
 
                 <Border Grid.Column="1" Margin="100 70" CornerRadius="5" Background="#68F6F6F6" Padding="10" BorderBrush="Silver" BorderThickness="1">
-                    <Grid TextElement.Foreground="#3E3E3E">
+                    <Grid TextElement.Foreground="{StaticResource GrayBrush280}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
                             <ColumnDefinition Width="Auto" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
index faa6b1086..41dc0554c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
@@ -31,19 +31,19 @@
             </Grid>
             <Grid DockPanel.Dock="Bottom" IsEnabled="{Binding IsFree}">
                 <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveMachineCommand}">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding RemoveMachineCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
                             <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
                         </StackPanel>
                     </Button>
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FFA65F" BorderBrush="#FFA65F" Command="{Binding CloneMachineCommand}">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource OrangeBrush300}" BorderBrush="{StaticResource OrangeBrush200}" Command="{Binding CloneMachineCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="ContentCopy" Width="20" Height="20" />
                             <TextBlock Margin="5 0 0 0" FontSize="16">CLONE</TextBlock>
                         </StackPanel>
                     </Button>
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding AddMachineCommand}">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding AddMachineCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
                             <TextBlock Margin="5 0 0 0" FontSize="16">NEW MACHINE</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml
index d04389ae7..3641492df 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml
@@ -28,13 +28,13 @@
                 <DockPanel Grid.Column="1" Margin="50 100">
                     <Grid DockPanel.Dock="Bottom">
                         <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 0 0">
-                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveSpoolCommand}">
+                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding RemoveSpoolCommand}">
                                 <StackPanel Orientation="Horizontal">
                                     <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
                                     <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
                                 </StackPanel>
                             </Button>
-                            <Button Margin="0 0 0 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding AddSpoolCommand}">
+                            <Button Margin="0 0 0 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding AddSpoolCommand}">
                                 <StackPanel Orientation="Horizontal">
                                     <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
                                     <TextBlock Margin="5 0 0 0" FontSize="16">NEW SPOOL</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/AddLiquidFactorView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/AddLiquidFactorView.xaml
index 6d9b68edb..426a56f51 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/AddLiquidFactorView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/AddLiquidFactorView.xaml
@@ -27,7 +27,7 @@
             <Grid>
                 <StackPanel VerticalAlignment="Top" Margin="0 30 0 0">
                     <StackPanel Orientation="Horizontal">
-                        <materialDesign:PackIcon Kind="Plus" VerticalAlignment="Top" Width="50" Height="50" Foreground="#08B008" />
+                        <materialDesign:PackIcon Kind="Plus" VerticalAlignment="Top" Width="50" Height="50" Foreground="{StaticResource GreenBrush100}" />
                         <TextBlock Padding="0 10 0 0" TextWrapping="Wrap" Margin="10 0 0 0" VerticalAlignment="Top" FontSize="14" Text="ADD LIQUID FACTOR" Width="400"></TextBlock>
                     </StackPanel>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index 962e59291..1a13358c1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -196,7 +196,7 @@
                                                     </Button>
 
                                                     <Grid Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessTableDropped">
-                                                        <Border Padding="5" BorderThickness="1" Margin="20 5 0 5" BorderBrush="#101010" Background="#B9FFFFFF">
+                                                        <Border Padding="5" BorderThickness="1" Margin="20 5 0 5" BorderBrush="{StaticResource DarkGrayBrush}" Background="#B9FFFFFF">
                                                             <Grid>
                                                                 <DockPanel Width="300">
                                                                     <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
index 06a28c1e4..64fbc357d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
@@ -25,13 +25,13 @@
             </Grid>
             <Grid DockPanel.Dock="Bottom">
                 <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveRmlCommand}">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding RemoveRmlCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
                             <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
                         </StackPanel>
                     </Button>
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding AddRmlCommand}">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding AddRmlCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
                             <TextBlock Margin="5 0 0 0" FontSize="16">NEW RML</TextBlock>
@@ -48,7 +48,7 @@
                 </StackPanel>
             </Grid>
             <Grid>
-                <DataGrid Margin="0 0 0 10" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}">
+                <DataGrid Margin="0 0 0 10" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}">
                     <DataGrid.CellStyle>
                         <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                             <Setter Property="BorderThickness" Value="0"/>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Views/MainView.xaml
index 840e18523..fd34c0c6f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Views/MainView.xaml
@@ -22,72 +22,72 @@
         <Grid>
             <DockPanel>
 
-                <Border Background="#ECECEC" Margin="20" Width="350" CornerRadius="5" IsEnabled="{Binding IsFree}">
+                <Border Background="{StaticResource WhiteBrush100}" Margin="20" Width="350" CornerRadius="5" IsEnabled="{Binding IsFree}">
                     <Border.Effect>
                         <DropShadowEffect ShadowDepth="0" BlurRadius="10" Color="Gray" />
                     </Border.Effect>
                     <DockPanel>
                         <TextBlock HorizontalAlignment="Left" DockPanel.Dock="Top" Margin="30 55 20 20" FontSize="30" FontStyle="Italic" Foreground="{StaticResource AccentColorBrush}" FontWeight="Bold">ACTIONS</TextBlock>
                         <StackPanel Margin="0 40 0 0">
-                            <Button Command="{Binding CreateFolderCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="#363636" HorizontalContentAlignment="Left">
+                            <Button Command="{Binding CreateFolderCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="{StaticResource GrayBrush310}" HorizontalContentAlignment="Left">
                                 <DockPanel>
-                                    <materialDesign:PackIcon Kind="FolderPlus" Foreground="#E79F20" Width="32" Height="32" />
+                                    <materialDesign:PackIcon Kind="FolderPlus" Foreground="{StaticResource OrangeBrush250}" Width="32" Height="32" />
                                     <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" FontSize="18">CREATE FOLDER</TextBlock>
                                 </DockPanel>
                             </Button>
-                            <Button Command="{Binding DeleteFolderCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="#363636" HorizontalContentAlignment="Left">
+                            <Button Command="{Binding DeleteFolderCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="{StaticResource GrayBrush310}" HorizontalContentAlignment="Left">
                                 <DockPanel>
-                                    <materialDesign:PackIcon Kind="FolderRemove" Foreground="#E14141" Width="32" Height="32" />
+                                    <materialDesign:PackIcon Kind="FolderRemove" Foreground="{StaticResource RedBrush500}" Width="32" Height="32" />
                                     <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" FontSize="18">DELETE FOLDER</TextBlock>
                                 </DockPanel>
                             </Button>
                             <Separator/>
-                            <Button Command="{Binding UploadFileCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="#363636" HorizontalContentAlignment="Left">
+                            <Button Command="{Binding UploadFileCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="{StaticResource GrayBrush310}" HorizontalContentAlignment="Left">
                                 <DockPanel>
-                                    <materialDesign:PackIcon Kind="Upload" Foreground="#E97E28" Width="32" Height="32" />
+                                    <materialDesign:PackIcon Kind="Upload" Foreground="{StaticResource OrangeBrush250}" Width="32" Height="32" />
                                     <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" FontSize="18">UPLOAD FILE</TextBlock>
                                 </DockPanel>
                             </Button>
-                            <Button Command="{Binding DownloadFileCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="#363636" HorizontalContentAlignment="Left">
+                            <Button Command="{Binding DownloadFileCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="{StaticResource GrayBrush310}" HorizontalContentAlignment="Left">
                                 <DockPanel>
-                                    <materialDesign:PackIcon Kind="Download" Foreground="#2DD42D" Width="32" Height="32" />
+                                    <materialDesign:PackIcon Kind="Download" Foreground="{StaticResource GreenDownloadFileBrush}" Width="32" Height="32" />
                                     <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" FontSize="18">DOWNLOAD FILE</TextBlock>
                                 </DockPanel>
                             </Button>
                             <Separator/>
-                            <Button Command="{Binding DeleteFileCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="#363636" HorizontalContentAlignment="Left">
+                            <Button Command="{Binding DeleteFileCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="{StaticResource GrayBrush310}" HorizontalContentAlignment="Left">
                                 <DockPanel>
-                                    <materialDesign:PackIcon Kind="Delete" Foreground="#E14141" Width="32" Height="32" />
+                                    <materialDesign:PackIcon Kind="Delete" Foreground="{StaticResource RedBrush500}" Width="32" Height="32" />
                                     <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" FontSize="18">DELETE FILE</TextBlock>
                                 </DockPanel>
                             </Button>
                             <Separator/>
-                            <Button Command="{Binding UploadVersionCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="#363636" HorizontalContentAlignment="Left">
+                            <Button Command="{Binding UploadVersionCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="{StaticResource GrayBrush310}" HorizontalContentAlignment="Left">
                                 <DockPanel>
-                                    <materialDesign:PackIcon Kind="BriefcaseUpload" Foreground="#833CEC" Width="32" Height="32" />
+                                    <materialDesign:PackIcon Kind="BriefcaseUpload" Foreground="{StaticResource LilacBrush}" Width="32" Height="32" />
                                     <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" FontSize="18">UPGRADE VERSION</TextBlock>
                                 </DockPanel>
                             </Button>
-                            <Button Command="{Binding ValidateVersionCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="#363636" HorizontalContentAlignment="Left">
+                            <Button Command="{Binding ValidateVersionCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="{StaticResource GrayBrush310}" HorizontalContentAlignment="Left">
                                 <DockPanel>
-                                    <materialDesign:PackIcon Kind="CheckAll" Foreground="#682EBE" Width="32" Height="32" />
+                                    <materialDesign:PackIcon Kind="CheckAll" Foreground="{StaticResource LilacBrush100}" Width="32" Height="32" />
                                     <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" FontSize="18">VALIDATE VERSION</TextBlock>
                                 </DockPanel>
                             </Button>
-                            <Button Command="{Binding ActivateVersionCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="#363636" HorizontalContentAlignment="Left">
+                            <Button Command="{Binding ActivateVersionCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="{StaticResource GrayBrush310}" HorizontalContentAlignment="Left">
                                 <DockPanel>
-                                    <materialDesign:PackIcon Kind="Flash" Foreground="#532990" Width="32" Height="32" />
+                                    <materialDesign:PackIcon Kind="Flash" Foreground="{StaticResource LilacBrush200}" Width="32" Height="32" />
                                     <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" FontSize="18">ACTIVATE VERSION</TextBlock>
                                 </DockPanel>
                             </Button>
-                            <Button Command="{Binding GenerateTfpCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="#363636" HorizontalContentAlignment="Left">
+                            <Button Command="{Binding GenerateTfpCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="{StaticResource GrayBrush310}" HorizontalContentAlignment="Left">
                                 <DockPanel>
-                                    <materialDesign:PackIcon Kind="Chip" Foreground="#532990" Width="32" Height="32" />
+                                    <materialDesign:PackIcon Kind="Chip" Foreground="{StaticResource LilacBrush200}" Width="32" Height="32" />
                                     <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" FontSize="18">GENERATE TFP FILE</TextBlock>
                                 </DockPanel>
                             </Button>
                             <Separator/>
-                            <Button Command="{Binding RefreshCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="#363636" HorizontalContentAlignment="Left">
+                            <Button Command="{Binding RefreshCommand}" Margin="0 5 0 0" Style="{StaticResource MaterialDesignFlatButton}" Padding="20 10" Height="Auto" Foreground="{StaticResource GrayBrush310}" HorizontalContentAlignment="Left">
                                 <DockPanel>
                                     <materialDesign:PackIcon Kind="Refresh" Foreground="{StaticResource AccentColorBrush}" Width="32" Height="32" />
                                     <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" FontSize="18">REFRESH</TextBlock>
@@ -99,7 +99,7 @@
 
                 <Grid>
                     <DockPanel>
-                        <Border DockPanel.Dock="Top" Background="#ECECEC" Margin="20" Height="150" CornerRadius="5" Padding="20 0">
+                        <Border DockPanel.Dock="Top" Background="{StaticResource WhiteBrush100}" Margin="20" Height="150" CornerRadius="5" Padding="20 0">
                             <Border.Effect>
                                 <DropShadowEffect ShadowDepth="0" BlurRadius="10" Color="Gray" />
                             </Border.Effect>
@@ -156,7 +156,7 @@
                                     <RowDefinition Height="5" />
                                     <RowDefinition Height="40*" MinHeight="150" />
                                 </Grid.RowDefinitions>
-                                <Border Background="#8BFFFFFF" CornerRadius="5" Padding="20">
+                                <Border Background="{StaticResource TransparentBackgroundBrush500}" CornerRadius="5" Padding="20">
                                     <DataGrid x:Name="gridStorageItems" IsEnabled="{Binding IsFree}" MouseDoubleClick="DataGrid_MouseDoubleClick" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserResizeRows="False" CanUserSortColumns="True" IsReadOnly="True" Background="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding StorageManager.CurrentFolder.Items}" SelectedItem="{Binding SelectedStorageItem}">
                                         <DataGrid.CellStyle>
                                             <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
@@ -207,7 +207,7 @@
 
                                 <GridSplitter Grid.Row="1" Height="5" VerticalAlignment="Center" HorizontalAlignment="Stretch" Background="Gray" Margin="5 0" />
 
-                                <Border Background="#8BFFFFFF" CornerRadius="5" Padding="20" Grid.Row="3">
+                                <Border Background="{StaticResource TransparentBackgroundBrush500}" CornerRadius="5" Padding="20" Grid.Row="3">
                                     <DockPanel>
                                         <TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20" FontStyle="Italic" Foreground="{StaticResource AccentColorBrush}" FontWeight="Bold">FILE TRANSFERS</TextBlock>
                                         <DataGrid AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" IsReadOnly="True" Background="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding FileHandlers}">
@@ -226,11 +226,11 @@
                                                                 <materialDesign:PackIcon.Style>
                                                                     <Style TargetType="materialDesign:PackIcon">
                                                                         <Setter Property="Kind" Value="Download"></Setter>
-                                                                        <Setter Property="Foreground" Value="#20BB20"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource GreenBrush450}"></Setter>
                                                                         <Style.Triggers>
                                                                             <DataTrigger Binding="{Binding Type}" Value="Upload">
                                                                                 <Setter Property="Kind" Value="Upload"></Setter>
-                                                                                <Setter Property="Foreground" Value="#E76311"></Setter>
+                                                                                <Setter Property="Foreground" Value="{StaticResource OrangeUploadBrush}"></Setter>
                                                                             </DataTrigger>
                                                                         </Style.Triggers>
                                                                     </Style>
@@ -252,13 +252,13 @@
                                                             <ProgressBar Height="15" Margin="0 0 30 0" VerticalAlignment="Center" Maximum="{Binding Handler.Total,Mode=OneWay}" Value="{Binding Handler.Current,Mode=OneWay}">
                                                                 <ProgressBar.Style>
                                                                     <Style TargetType="ProgressBar">
-                                                                        <Setter Property="Foreground" Value="#2FD42F"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource GreenUploadBrush}"></Setter>
                                                                         <Style.Triggers>
                                                                             <DataTrigger Binding="{Binding Handler.Status}" Value="Canceled">
-                                                                                <Setter Property="Foreground" Value="#EF832B"></Setter>
+                                                                                <Setter Property="Foreground" Value="{StaticResource OrangeCanceledBrush}"></Setter>
                                                                             </DataTrigger>
                                                                             <DataTrigger Binding="{Binding Handler.Status}" Value="Failed">
-                                                                                <Setter Property="Foreground" Value="#E11A1A"></Setter>
+                                                                                <Setter Property="Foreground" Value="{StaticResource RedBrush500}"></Setter>
                                                                             </DataTrigger>
                                                                         </Style.Triggers>
                                                                     </Style>
@@ -290,7 +290,7 @@
                                                                                 <Setter Property="ContentTemplate">
                                                                                     <Setter.Value>
                                                                                         <DataTemplate>
-                                                                                            <Button Command="{Binding Source={x:Reference control},Path=DataContext.CancelFileHandlerCommand}" CommandParameter="{Binding}" Margin="5" Background="#FF6A6A" BorderBrush="#FF6A6A">CANCEL</Button>
+                                                                                            <Button Command="{Binding Source={x:Reference control},Path=DataContext.CancelFileHandlerCommand}" CommandParameter="{Binding}" Margin="5" Background="{StaticResource RedBrush100}" BorderBrush="{StaticResource RedBrush100}">CANCEL</Button>
                                                                                         </DataTemplate>
                                                                                     </Setter.Value>
                                                                                 </Setter>
@@ -303,7 +303,7 @@
                                                                                 <Setter Property="ContentTemplate">
                                                                                     <Setter.Value>
                                                                                         <DataTemplate>
-                                                                                            <Button Command="{Binding Source={x:Reference control},Path=DataContext.OpenFileHandlerCommand}" CommandParameter="{Binding}" Margin="5" Background="#2CC62C" BorderBrush="#2CC62C">OPEN</Button>
+                                                                                            <Button Command="{Binding Source={x:Reference control},Path=DataContext.OpenFileHandlerCommand}" CommandParameter="{Binding}" Margin="5" Background="{StaticResource GreenOpenFileBrush}" BorderBrush="{StaticResource GreenOpenFileBrush}">OPEN</Button>
                                                                                         </DataTemplate>
                                                                                     </Setter.Value>
                                                                                 </Setter>
@@ -318,7 +318,7 @@
                                                 <DataGridTemplateColumn Width="60">
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
-                                                            <Button Foreground="#FF5A5A" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Width="24" Height="24" Command="{Binding Source={x:Reference control},Path=DataContext.RemoveFileHandlerCommand}" CommandParameter="{Binding}" Margin="5">
+                                                            <Button Foreground="{StaticResource RedBrush100}" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Width="24" Height="24" Command="{Binding Source={x:Reference control},Path=DataContext.RemoveFileHandlerCommand}" CommandParameter="{Binding}" Margin="5">
                                                                 <materialDesign:PackIcon Kind="Close" Width="24" Height="24" />
                                                             </Button>
                                                         </DataTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Views/MainView.xaml
index bac93bff3..e6a18ddde 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Views/MainView.xaml
@@ -9,7 +9,7 @@
              
              xmlns:local="clr-namespace:Tango.MachineStudio.Stubs.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="#202020" Foreground="Gainsboro" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource DarkGrayBrush}" Foreground="Gainsboro" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
 
     <UserControl.Resources>
         <ResourceDictionary>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BlowerElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BlowerElementEditor.xaml
index 228424e80..524dd79c5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BlowerElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/BlowerElementEditor.xaml
@@ -56,7 +56,7 @@
                                 </i:Interaction.Triggers>
                             </visuals:AnalogSwitch>
 
-                            <Border Background="#202020" Margin="8" CornerRadius="3" Padding="5" Grid.Column="1">
+                            <Border Background="{StaticResource DarkGrayBrush}" Margin="8" CornerRadius="3" Padding="5" Grid.Column="1">
                                 <Grid>
                                     <mahapps:NumericUpDown Style="{x:Null}" InterceptMouseWheel="True" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Right" HideUpDownButtons="True" ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled" HasDecimals="True" Minimum="0" Maximum="10000" Padding="0" Value="{Binding HardwareBlower.Voltage,FallbackValue='0.0',Mode=TwoWay}"  VerticalAlignment="Center" FontSize="44" FontFamily="{StaticResource digital-7}" Foreground="#FFD400" Margin="0 0 16 0">
                                         <mahapps:NumericUpDown.Resources>
@@ -72,7 +72,7 @@
                             <Button Style="{x:Null}" Grid.Column="2" Margin="8" Cursor="Hand" Command="{Binding SetCommand}">
                                 <Button.Template>
                                     <ControlTemplate TargetType="Button">
-                                        <Grid Background="#404040">
+                                        <Grid Background="{StaticResource GrayBrush280}">
                                             <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Gainsboro" FontSize="16" FontWeight="SemiBold">SET</TextBlock>
                                         </Grid>
                                         <ControlTemplate.Triggers>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml
index 2686d57d9..27530ab10 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml
@@ -86,7 +86,7 @@
                                 <RowDefinition Height="70*"/>
                                 <RowDefinition Height="90*"/>
                             </Grid.RowDefinitions>
-                            <Border Background="#202020" Margin="0 3 0 0" CornerRadius="3" Padding="5">
+                            <Border Background="{StaticResource DarkGrayBrush}" Margin="0 3 0 0" CornerRadius="3" Padding="5">
                                 <Grid>
                                     <TextBlock Text="{Binding EffectiveValue,StringFormat=0.0,FallbackValue='0.0'}" Foreground="#FF6F78" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="44" FontFamily="{StaticResource digital-7}" Margin="0 0 12 0">
 
@@ -95,7 +95,7 @@
                                 </Grid>
                             </Border>
 
-                            <Border Background="#202020" Grid.Row="1" Margin="0 10 0 0" CornerRadius="3" Padding="5">
+                            <Border Background="{StaticResource DarkGrayBrush}" Grid.Row="1" Margin="0 10 0 0" CornerRadius="3" Padding="5">
                                 <Grid>
                                     <mahapps:NumericUpDown Style="{x:Null}" InterceptMouseWheel="True" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Right" HideUpDownButtons="True" ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled" StringFormat="0.0" HasDecimals="True" Minimum="{Binding ElementName=fader,Path=Minimum}" Maximum="{Binding ElementName=fader,Path=Maximum}" Padding="0" Value="{Binding Value,Mode=TwoWay,StringFormat=0.0,FallbackValue=0.0}"  VerticalAlignment="Center" FontSize="44" FontFamily="{StaticResource digital-7}" Foreground="#FFD400" Margin="0 0 12 0">
                                         <mahapps:NumericUpDown.Resources>
@@ -111,7 +111,7 @@
                             <Button Style="{x:Null}" Grid.Row="2" VerticalAlignment="Bottom" Height="60" Cursor="Hand" Command="{Binding SetCommand}">
                                 <Button.Template>
                                     <ControlTemplate TargetType="Button">
-                                        <Grid Background="#404040">
+                                        <Grid Background="{StaticResource GrayBrush280}">
                                             <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Gainsboro" FontSize="16" FontWeight="SemiBold">SET</TextBlock>
                                         </Grid>
                                         <ControlTemplate.Triggers>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
index 96f966d20..90e18d43e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
@@ -23,7 +23,7 @@
         <Grid x:Key="gridHoming">
             <DockPanel>
                 <Button Click="OnHomingStopped" DockPanel.Dock="Right" Padding="0" Style="{StaticResource MaterialDesignFlatButton}" VerticalAlignment="Center" Margin="0 0 5 0" ToolTip="Stop Homing">
-                    <materialDesign:PackIcon Kind="Stop" Foreground="#FF5F5F" HorizontalAlignment="Center" VerticalAlignment="Center" Width="32" Height="32" />
+                    <materialDesign:PackIcon Kind="Stop" Foreground="{StaticResource RedBrush100}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="32" Height="32" />
                 </Button>
                 <ProgressBar Foreground="DimGray" BorderBrush="DimGray" Maximum="{Binding HomingMaximumProgress}" Value="{Binding HomingProgress}" VerticalAlignment="Center" Height="10" Margin="5 0 5 0" Background="Transparent"></ProgressBar>
             </DockPanel>
@@ -102,7 +102,7 @@
                                 </Grid.ColumnDefinitions>
                                 <Image Source="../Images/dispenser-line.png" Grid.ColumnSpan="2" Stretch="Fill"></Image>
 
-                                <Path RenderTransformOrigin="0.5,0.5" Margin="10 80 40 10" HorizontalAlignment="Left" VerticalAlignment="Bottom" StrokeThickness="1" Stroke="#202020" Stretch="Uniform" Data="M728.4 312.2l-198.1-63.4c-0.5-5.9-1.6-11.6-3.4-17c8.4-2.8 17-5.9 25.7-9.2c78.8-29.7 124.3-63 135-98.8  c7.2-23.8-0.5-47.5-22.6-70.3c-17.5-18-56.2-44.9-57.8-46c-6.2-4.3-14.7-2.8-19.1 3.3L465.5 180.8c-3.2-0.4-6.4-0.6-9.6-0.6  c-2.2 0-4.5 0.1-6.7 0.3c-0.5-62.6-8.3-142.4-41.1-178.6c-12.7-14.1-28.3-21.2-46.1-21.2c0 0 0 0 0 0c-12.3 0-25.6 3.5-39.7 10.4  c-17.4 8.6-43.8 27.5-55.6 36.2c-3.5 2.6-5.7 4.2-6.1 4.5c-3.7 2.8-5.6 7.2-5.4 11.6c0.1 2.6 1 5.3 2.7 7.5l128.9 175.8  c-1.4 3.5-2.6 7.1-3.4 10.8c-42.1-13.7-94.9-27.4-138.4-27.4c-34.2 0-59.1 8.6-73.8 25.7c-13 15-17.7 35.8-14 61.7  c3.6 24.8 19.1 69.3 19.7 71.2c2 5.7 7.3 9.3 13 9.3c1.4 0 2.9-0.2 4.3-0.7L404 308.3c2.3 2.3 4.8 4.4 7.4 6.3  c-7.3 10-14.8 20.7-22.3 32c-46.3 70.4-63.5 124-51.1 159.3c8.2 23.5 28.3 38.2 59.6 43.6c16.2 2.8 41.8 3.4 60.4 3.4  c8.1 0 13.5-0.1 13.5-0.1c7.5-0.2 13.5-6.3 13.5-13.9L484 323.8c4.1-1.7 8.1-3.7 11.8-6.1c6.1 8.3 12.6 16.9 19.5 25.6  c52.2 65.4 97.5 98.6 134.8 98.6c17.6 0 42.4-7.5 61.3-43.3c11.7-22.2 25.4-67.3 25.9-69.2C739.5 322.2 735.5 314.5 728.4 312.2z   M455.9 293c-21.1 0-38.3-17.1-38.3-38.3s17.1-38.3 38.3-38.3c21.1 0 38.3 17.1 38.3 38.3C494.2 275.9 477 293 455.9 293z">
+                                <Path RenderTransformOrigin="0.5,0.5" Margin="10 80 40 10" HorizontalAlignment="Left" VerticalAlignment="Bottom" StrokeThickness="1" Stroke="{StaticResource DarkGrayBrush}" Stretch="Uniform" Data="M728.4 312.2l-198.1-63.4c-0.5-5.9-1.6-11.6-3.4-17c8.4-2.8 17-5.9 25.7-9.2c78.8-29.7 124.3-63 135-98.8  c7.2-23.8-0.5-47.5-22.6-70.3c-17.5-18-56.2-44.9-57.8-46c-6.2-4.3-14.7-2.8-19.1 3.3L465.5 180.8c-3.2-0.4-6.4-0.6-9.6-0.6  c-2.2 0-4.5 0.1-6.7 0.3c-0.5-62.6-8.3-142.4-41.1-178.6c-12.7-14.1-28.3-21.2-46.1-21.2c0 0 0 0 0 0c-12.3 0-25.6 3.5-39.7 10.4  c-17.4 8.6-43.8 27.5-55.6 36.2c-3.5 2.6-5.7 4.2-6.1 4.5c-3.7 2.8-5.6 7.2-5.4 11.6c0.1 2.6 1 5.3 2.7 7.5l128.9 175.8  c-1.4 3.5-2.6 7.1-3.4 10.8c-42.1-13.7-94.9-27.4-138.4-27.4c-34.2 0-59.1 8.6-73.8 25.7c-13 15-17.7 35.8-14 61.7  c3.6 24.8 19.1 69.3 19.7 71.2c2 5.7 7.3 9.3 13 9.3c1.4 0 2.9-0.2 4.3-0.7L404 308.3c2.3 2.3 4.8 4.4 7.4 6.3  c-7.3 10-14.8 20.7-22.3 32c-46.3 70.4-63.5 124-51.1 159.3c8.2 23.5 28.3 38.2 59.6 43.6c16.2 2.8 41.8 3.4 60.4 3.4  c8.1 0 13.5-0.1 13.5-0.1c7.5-0.2 13.5-6.3 13.5-13.9L484 323.8c4.1-1.7 8.1-3.7 11.8-6.1c6.1 8.3 12.6 16.9 19.5 25.6  c52.2 65.4 97.5 98.6 134.8 98.6c17.6 0 42.4-7.5 61.3-43.3c11.7-22.2 25.4-67.3 25.9-69.2C739.5 322.2 735.5 314.5 728.4 312.2z   M455.9 293c-21.1 0-38.3-17.1-38.3-38.3s17.1-38.3 38.3-38.3c21.1 0 38.3 17.1 38.3 38.3C494.2 275.9 477 293 455.9 293z">
                                     <Path.Fill>
                                         <LinearGradientBrush>
                                             <GradientStop Color="Black"/>
@@ -170,10 +170,10 @@
         </Grid>
 
         <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -65 0">
-            <Border Background="#202020" CornerRadius="3" Padding="3">
-                <mahapps:NumericUpDown BorderThickness="0" Background="Transparent" HideUpDownButtons="True" HasDecimals="False" Minimum="0" Maximum="10000" StringFormat="0" Value="{Binding Speed,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,StringFormat=0,FallbackValue=5000}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" FontSize="22" VerticalAlignment="Center" Foreground="#FF8585" FontFamily="{StaticResource digital-7}"></mahapps:NumericUpDown>
+            <Border Background="{StaticResource DarkGrayBrush}" CornerRadius="3" Padding="3">
+                <mahapps:NumericUpDown BorderThickness="0" Background="Transparent" HideUpDownButtons="True" HasDecimals="False" Minimum="0" Maximum="10000" StringFormat="0" Value="{Binding Speed,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,StringFormat=0,FallbackValue=5000}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" FontSize="22" VerticalAlignment="Center" Foreground="{StaticResource RedBrush400}" FontFamily="{StaticResource digital-7}"></mahapps:NumericUpDown>
             </Border>
-            <visuals:Knob Width="50" Height="50" TicksHighlightBrush="#FF8585" KnobType="MetroDark" TicksWidth="2" Margin="0 5 0 0" TicksHeight="5" Minimum="0" Maximum="5000" Value="{Binding Speed,Mode=TwoWay}" />
+            <visuals:Knob Width="50" Height="50" TicksHighlightBrush="{StaticResource RedBrush400}" KnobType="MetroDark" TicksWidth="2" Margin="0 5 0 0" TicksHeight="5" Minimum="0" Maximum="5000" Value="{Binding Speed,Mode=TwoWay}" />
         </StackPanel>
 
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/HeaterElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/HeaterElementEditor.xaml
index 4b7e2ea2c..190b4d3c8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/HeaterElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/HeaterElementEditor.xaml
@@ -48,7 +48,7 @@
                         </Grid>
 
                         <Grid Grid.Row="1">
-                            <Border Background="#202020" Margin="0 3 0 0" CornerRadius="3" Padding="5">
+                            <Border Background="{StaticResource DarkGrayBrush}" Margin="0 3 0 0" CornerRadius="3" Padding="5">
                                 <Grid>
                                     <TextBlock Text="{Binding HeaterState.CurrentValue,StringFormat=0.00,FallbackValue='0.00'}" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="80" FontFamily="{StaticResource digital-7}" Margin="0 0 12 0">
                                         <TextBlock.Style>
@@ -75,7 +75,7 @@
 
                             <Image Source="../Images/temperature.png" Margin="0 10 20 10" RenderOptions.BitmapScalingMode="Fant"></Image>
 
-                            <Border Background="#202020" Margin="0 3 0 0" CornerRadius="3" Padding="5" Grid.Column="1">
+                            <Border Background="{StaticResource DarkGrayBrush}" Margin="0 3 0 0" CornerRadius="3" Padding="5" Grid.Column="1">
                                 <Grid>
                                     <mahapps:NumericUpDown x:Name="txtSetPoint" InterceptMouseWheel="True" IsHitTestVisible="{Binding IsEditing}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Right" HideUpDownButtons="True" ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled" HasDecimals="True" Minimum="0" Maximum="400" Padding="0" Value="{Binding SetPoint,FallbackValue='0.0',Mode=TwoWay}"  VerticalAlignment="Center" FontSize="44" FontFamily="{StaticResource digital-7}" Foreground="#FFD400" Margin="0 0 12 0">
                                         <mahapps:NumericUpDown.Resources>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/JobRunnerElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/JobRunnerElementEditor.xaml
index 76a6a16a7..5165e9819 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/JobRunnerElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/JobRunnerElementEditor.xaml
@@ -43,9 +43,9 @@
 
         <!--Content-->
         <Grid>
-            <Border Padding="10" BorderThickness="1" BorderBrush="#202020" Background="#88FFFFFF" CornerRadius="5">
+            <Border Padding="10" BorderThickness="1" BorderBrush="{StaticResource DarkGrayBrush}" Background="#88FFFFFF" CornerRadius="5">
                 <DockPanel>
-                    <TextBox Foreground="#202020" FontSize="14" DockPanel.Dock="Top" Text="{Binding Job.Name}"></TextBox>
+                    <TextBox Foreground="{StaticResource DarkGrayBrush}" FontSize="14" DockPanel.Dock="Top" Text="{Binding Job.Name}"></TextBox>
                     <ItemsControl Margin="0 10 0 0" DockPanel.Dock="Top" ItemsSource="{Binding BrushStop.LiquidVolumes}" VerticalAlignment="Center">
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
@@ -74,7 +74,7 @@
 
                         <ProgressBar Margin="0 0 10 0" VerticalAlignment="Bottom" Height="10" Minimum="0" Maximum="{Binding RunningJobStatus.TotalProgress}" Value="{Binding RunningJobStatus.Progress}"></ProgressBar>
 
-                        <TextBlock HorizontalAlignment="Right" VerticalAlignment="Top" Foreground="#202020" FontSize="14" Margin="0 0 10 0">
+                        <TextBlock HorizontalAlignment="Right" VerticalAlignment="Top" Foreground="{StaticResource DarkGrayBrush}" FontSize="14" Margin="0 0 10 0">
                             <Run Text="{Binding RunningJobStatus.Progress,StringFormat=0.0}"></Run><Run Foreground="DodgerBlue" FontWeight="Bold">/</Run><Run Text="{Binding RunningJobStatus.TotalProgress,StringFormat=0.0}"></Run>
                             <Run Foreground="Gray">m</Run>
                             <Run></Run>
@@ -135,7 +135,7 @@
                                         <ComboBox ItemsSource="{Binding Source={StaticResource dispenserDivisions}}" SelectedItem="{Binding DispenserStepDivision,UpdateSourceTrigger=PropertyChanged}">
                                             <ComboBox.ItemContainerStyle>
                                                 <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
-                                                    <Setter Property="Background" Value="#ECECEC"></Setter>
+                                                    <Setter Property="Background" Value="{StaticResource WhiteBrush100}"></Setter>
                                                 </Style>
                                             </ComboBox.ItemContainerStyle>
                                             <ComboBox.ItemTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MonitorRecorderElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MonitorRecorderElementEditor.xaml
index 65f25f131..645f98331 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MonitorRecorderElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MonitorRecorderElementEditor.xaml
@@ -38,7 +38,7 @@
                             <RowDefinition Height="27"/>
                         </Grid.RowDefinitions>
 
-                        <TextBlock Text="CSV RECORDER" Foreground="#FF8585" FontFamily="{StaticResource digital-7}" FontSize="18" VerticalAlignment="Center" Margin="0,6,0,3" Height="18"></TextBlock>
+                        <TextBlock Text="CSV RECORDER" Foreground="{StaticResource RedBrush400}" FontFamily="{StaticResource digital-7}" FontSize="18" VerticalAlignment="Center" Margin="0,6,0,3" Height="18"></TextBlock>
 
                         <DockPanel Grid.Row="1">
                             <Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml
index ecfea2f28..7c3728d1e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml
@@ -24,7 +24,7 @@
         <Grid x:Key="gridHoming">
             <DockPanel>
                 <Button Click="OnHomingStopped" DockPanel.Dock="Right" Padding="0" Style="{StaticResource MaterialDesignFlatButton}" VerticalAlignment="Center" Margin="0 0 5 0" ToolTip="Stop Homing">
-                    <materialDesign:PackIcon Kind="Stop" Foreground="#FF5F5F" HorizontalAlignment="Center" VerticalAlignment="Center" Width="32" Height="32" />
+                    <materialDesign:PackIcon Kind="Stop" Foreground="{StaticResource RedBrush100}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="32" Height="32" />
                 </Button>
                 <ProgressBar Foreground="DimGray" BorderBrush="DimGray" Maximum="{Binding HomingMaximumProgress}" BorderThickness="1" Value="{Binding HomingProgress}" VerticalAlignment="Center" Height="10" Margin="5 0 5 0" Background="Transparent">
 
@@ -86,9 +86,9 @@
                 </Grid.RowDefinitions>
 
                 <Grid Grid.Column="1">
-                    <Border BorderThickness="1" BorderBrush="#303030" CornerRadius="10" Background="#252525">
+                    <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush300}" CornerRadius="10" Background="#252525">
                         <Grid Margin="20">
-                            <Path RenderTransformOrigin="0.5,0.5" StrokeThickness="1" Stroke="#202020" Stretch="Uniform" Margin="10" Data="M500.633 211.454l-58.729-14.443c-3.53-11.133-8.071-21.929-13.55-32.256c8.818-14.678 27.349-45.571 27.349-45.571    c3.545-5.903 2.607-13.462-2.256-18.325l-42.422-42.422c-4.863-4.878-12.407-5.815-18.325-2.256L347.055 83.53    c-10.269-5.435-21.006-9.932-32.065-13.433l-14.443-58.729C298.876 4.688 292.885 0 286 0h-60    c-6.885 0-12.891 4.688-14.546 11.367c0 0-10.005 40.99-14.429 58.715c-11.792 3.735-23.188 8.584-34.043 14.502l-47.329-28.403    c-5.918-3.516-13.447-2.607-18.325 2.256l-42.422 42.422c-4.863 4.863-5.801 12.422-2.256 18.325l29.268 48.882    c-4.717 9.302-8.672 18.984-11.821 28.901l-58.729 14.487C4.688 213.124 0 219.115 0 226v60c0 6.885 4.688 12.891 11.367 14.546    l58.744 14.443c3.56 11.294 8.188 22.266 13.799 32.798l-26.191 43.652c-3.545 5.903-2.607 13.462 2.256 18.325l42.422 42.422    c4.849 4.849 12.407 5.771 18.325 2.256c0 0 29.37-17.607 43.755-26.221c10.415 5.552 21.313 10.137 32.549 13.696l14.429 58.715    C213.109 507.313 219.115 512 226 512h60c6.885 0 12.876-4.688 14.546-11.367l14.429-58.715    c11.558-3.662 22.69-8.394 33.281-14.136c14.78 8.862 44.443 26.66 44.443 26.66c5.903 3.53 13.462 2.622 18.325-2.256    l42.422-42.422c4.863-4.863 5.801-12.422 2.256-18.325l-26.968-44.927c5.317-10.093 9.727-20.654 13.169-31.523l58.729-14.443    C507.313 298.876 512 292.885 512 286v-60C512 219.115 507.313 213.124 500.633 211.454z M256 361c-57.891 0-105-47.109-105-105    s47.109-105 105-105s105 47.109 105 105S313.891 361 256 361z">
+                            <Path RenderTransformOrigin="0.5,0.5" StrokeThickness="1" Stroke="{StaticResource DarkGrayBrush}" Stretch="Uniform" Margin="10" Data="M500.633 211.454l-58.729-14.443c-3.53-11.133-8.071-21.929-13.55-32.256c8.818-14.678 27.349-45.571 27.349-45.571    c3.545-5.903 2.607-13.462-2.256-18.325l-42.422-42.422c-4.863-4.878-12.407-5.815-18.325-2.256L347.055 83.53    c-10.269-5.435-21.006-9.932-32.065-13.433l-14.443-58.729C298.876 4.688 292.885 0 286 0h-60    c-6.885 0-12.891 4.688-14.546 11.367c0 0-10.005 40.99-14.429 58.715c-11.792 3.735-23.188 8.584-34.043 14.502l-47.329-28.403    c-5.918-3.516-13.447-2.607-18.325 2.256l-42.422 42.422c-4.863 4.863-5.801 12.422-2.256 18.325l29.268 48.882    c-4.717 9.302-8.672 18.984-11.821 28.901l-58.729 14.487C4.688 213.124 0 219.115 0 226v60c0 6.885 4.688 12.891 11.367 14.546    l58.744 14.443c3.56 11.294 8.188 22.266 13.799 32.798l-26.191 43.652c-3.545 5.903-2.607 13.462 2.256 18.325l42.422 42.422    c4.849 4.849 12.407 5.771 18.325 2.256c0 0 29.37-17.607 43.755-26.221c10.415 5.552 21.313 10.137 32.549 13.696l14.429 58.715    C213.109 507.313 219.115 512 226 512h60c6.885 0 12.876-4.688 14.546-11.367l14.429-58.715    c11.558-3.662 22.69-8.394 33.281-14.136c14.78 8.862 44.443 26.66 44.443 26.66c5.903 3.53 13.462 2.622 18.325-2.256    l42.422-42.422c4.863-4.863 5.801-12.422 2.256-18.325l-26.968-44.927c5.317-10.093 9.727-20.654 13.169-31.523l58.729-14.443    C507.313 298.876 512 292.885 512 286v-60C512 219.115 507.313 213.124 500.633 211.454z M256 361c-57.891 0-105-47.109-105-105    s47.109-105 105-105s105 47.109 105 105S313.891 361 256 361z">
                                 <Path.Fill>
                                     <LinearGradientBrush>
                                         <GradientStop Color="Black"/>
@@ -154,10 +154,10 @@
         </Viewbox>
 
         <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -65 5">
-            <Border Background="#202020" CornerRadius="3" Padding="3">
-                <mahapps:NumericUpDown BorderThickness="0" Background="Transparent" HideUpDownButtons="True" HasDecimals="False" Minimum="0" Maximum="10000" StringFormat="0" Value="{Binding Speed,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,StringFormat=0,FallbackValue=5000}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" FontSize="22" VerticalAlignment="Center" Foreground="#FF8585" FontFamily="{StaticResource digital-7}"></mahapps:NumericUpDown>
+            <Border Background="{StaticResource DarkGrayBrush}" CornerRadius="3" Padding="3">
+                <mahapps:NumericUpDown BorderThickness="0" Background="Transparent" HideUpDownButtons="True" HasDecimals="False" Minimum="0" Maximum="10000" StringFormat="0" Value="{Binding Speed,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,StringFormat=0,FallbackValue=5000}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" FontSize="22" VerticalAlignment="Center" Foreground="{StaticResource RedBrush400}" FontFamily="{StaticResource digital-7}"></mahapps:NumericUpDown>
             </Border>
-            <visuals:Knob Width="50" Height="50" TicksHighlightBrush="#FF8585" KnobType="MetroDark" TicksWidth="2" Margin="0 5 0 0" TicksHeight="5" Minimum="0" Maximum="5000" Value="{Binding Speed,Mode=TwoWay}" />
+            <visuals:Knob Width="50" Height="50" TicksHighlightBrush="{StaticResource RedBrush400}" KnobType="MetroDark" TicksWidth="2" Margin="0 5 0 0" TicksHeight="5" Minimum="0" Maximum="5000" Value="{Binding Speed,Mode=TwoWay}" />
         </StackPanel>
 
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml
index ac07f1390..a209270e7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml
@@ -24,7 +24,7 @@
         <Grid x:Key="gridHoming">
             <DockPanel>
                 <Button Click="OnHomingStopped" DockPanel.Dock="Right" Padding="0" Style="{StaticResource MaterialDesignFlatButton}" VerticalAlignment="Center" Margin="0 0 5 0" ToolTip="Stop Homing">
-                    <materialDesign:PackIcon Kind="Stop" Foreground="#FF5F5F" HorizontalAlignment="Center" VerticalAlignment="Center" Width="32" Height="32" />
+                    <materialDesign:PackIcon Kind="Stop" Foreground="{StaticResource RedBrush100}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="32" Height="32" />
                 </Button>
                 <ProgressBar Foreground="DimGray" BorderBrush="DimGray" Maximum="{Binding HomingMaximumProgress}" BorderThickness="1" Value="{Binding HomingProgress}" VerticalAlignment="Center" Height="10" Margin="5 0 5 0" Background="Transparent">
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ProcessParametersElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ProcessParametersElementEditor.xaml
index f057521e0..3c4373097 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ProcessParametersElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ProcessParametersElementEditor.xaml
@@ -38,7 +38,7 @@
                         <SolidColorBrush Color="{Binding Color}"></SolidColorBrush>
                     </Border.BorderBrush>
                     <DockPanel>
-                        <TextBox DockPanel.Dock="Top" FontSize="12" Foreground="#202020" Text="{Binding ProcessParameters.Name}"></TextBox>
+                        <TextBox DockPanel.Dock="Top" FontSize="12" Foreground="{StaticResource DarkGrayBrush}" Text="{Binding ProcessParameters.Name}"></TextBox>
                         <Button DockPanel.Dock="Bottom" Margin="0 10 0 0" Height="40" Command="{Binding PushParametersCommand}">
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock Margin="0 0 10 0">PUSH PARAMETERS</TextBlock>
@@ -57,7 +57,7 @@
                                         <Grid Margin="0 2" Focusable="False" Background="Transparent" Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessParametersDropped" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=editors:ParameterizedEditor},Path=DraggingSurface}">
                                             <ContentControl Focusable="False">
                                                 <DockPanel Focusable="False">
-                                                    <TextBlock Focusable="False" Width="150" FontSize="12" Foreground="#202020" DockPanel.Dock="Left" IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}"></TextBlock>
+                                                    <TextBlock Focusable="False" Width="150" FontSize="12" Foreground="{StaticResource DarkGrayBrush}" DockPanel.Dock="Left" IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}"></TextBlock>
                                                     <mahapps:NumericUpDown FontSize="14" Minimum="0" Margin="0 0 5 0" HorizontalContentAlignment="Left" HideUpDownButtons="True" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}" Background="#6EFFFFFF"></mahapps:NumericUpDown>
                                                 </DockPanel>
                                             </ContentControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml
index 3a7c7d53d..ac440ad64 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml
@@ -24,7 +24,7 @@
 
         <Grid x:Key="gridDefault">
             <Viewbox Stretch="Fill">
-                <materialDesign:PackIcon Kind="Home" Margin="25 0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="24" Height="24" Foreground="#202020" />
+                <materialDesign:PackIcon Kind="Home" Margin="25 0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="24" Height="24" Foreground="{StaticResource DarkGrayBrush}" />
             </Viewbox>
 
             <Button Click="OnHomingStarted" Style="{StaticResource emptyButton}" Background="Transparent" BorderThickness="0"></Button>
@@ -45,7 +45,7 @@
                 </Grid.ColumnDefinitions>
 
                 <Grid Grid.Column="0">
-                    <Border BorderThickness="1" BorderBrush="#303030" CornerRadius="10" Background="#252525">
+                    <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush300}" CornerRadius="10" Background="#252525">
 
                         <Grid>
                             <Image x:Name="image" Margin="5" RenderTransformOrigin="0.5,0.5" gif:ImageBehavior.AnimatedSource="../Images/thread-motion.gif" RenderOptions.BitmapScalingMode="Fant" gif:ImageBehavior.AutoStart="False" gif:ImageBehavior.AnimateInDesignMode="True" gif:ImageBehavior.RepeatBehavior="Forever">
@@ -68,10 +68,10 @@
         </Viewbox>
 
         <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -65 5">
-            <Border Background="#202020" CornerRadius="3" Padding="3">
-                <mahapps:NumericUpDown BorderThickness="0" Background="Transparent" HideUpDownButtons="True" HasDecimals="False" Minimum="0" Maximum="10000" StringFormat="0" Value="{Binding Speed,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,StringFormat=0,FallbackValue=5000}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" FontSize="22" VerticalAlignment="Center" Foreground="#FF8585" FontFamily="{StaticResource digital-7}"></mahapps:NumericUpDown>
+            <Border Background="{StaticResource DarkGrayBrush}" CornerRadius="3" Padding="3">
+                <mahapps:NumericUpDown BorderThickness="0" Background="Transparent" HideUpDownButtons="True" HasDecimals="False" Minimum="0" Maximum="10000" StringFormat="0" Value="{Binding Speed,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,StringFormat=0,FallbackValue=5000}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" FontSize="22" VerticalAlignment="Center" Foreground="{StaticResource RedBrush400}" FontFamily="{StaticResource digital-7}"></mahapps:NumericUpDown>
             </Border>
-            <visuals:Knob Width="50" Height="50" TicksHighlightBrush="#FF8585" KnobType="MetroDark" TicksWidth="2" Margin="0 5 0 0" TicksHeight="5" Minimum="0" Maximum="5000" Value="{Binding Speed,Mode=TwoWay}" />
+            <visuals:Knob Width="50" Height="50" TicksHighlightBrush="{StaticResource RedBrush400}" KnobType="MetroDark" TicksWidth="2" Margin="0 5 0 0" TicksHeight="5" Minimum="0" Maximum="5000" Value="{Binding Speed,Mode=TwoWay}" />
         </StackPanel>
 
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ValveElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ValveElementEditor.xaml
index 2304469e0..59b9fa2af 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ValveElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ValveElementEditor.xaml
@@ -46,7 +46,7 @@
                             <Button Margin="8" Cursor="Hand" Command="{Binding SetCommand}" CommandParameter="{Binding TechValve.State1}">
                                 <Button.Style>
                                     <Style TargetType="Button">
-                                        <Setter Property="Background" Value="#404040"></Setter>
+                                        <Setter Property="Background" Value="{StaticResource GrayBrush280}"></Setter>
                                         <Setter Property="IsEnabled" Value="True"></Setter>
                                     </Style>
                                 </Button.Style>
@@ -80,7 +80,7 @@
                                 </Button.Template>
                             </Button>
 
-                            <Border Background="#202020" Margin="8" CornerRadius="3" Padding="5" Grid.Column="1">
+                            <Border Background="{StaticResource DarkGrayBrush}" Margin="8" CornerRadius="3" Padding="5" Grid.Column="1">
                                 <StackPanel>
                                     <TextBlock FontFamily="{StaticResource digital-7}" Text="Valve Controller" FontSize="13" Foreground="#E94A4A" HorizontalAlignment="Center"></TextBlock>
                                     <Image Source="../Images/valve.png" RenderOptions.BitmapScalingMode="Fant" Margin="10" Stretch="Uniform" Height="36" />
@@ -90,7 +90,7 @@
                             <Button Margin="8" Cursor="Hand" Grid.Column="2" Command="{Binding SetCommand}" CommandParameter="{Binding TechValve.State2}">
                                 <Button.Style>
                                     <Style TargetType="Button">
-                                        <Setter Property="Background" Value="#404040"></Setter>
+                                        <Setter Property="Background" Value="{StaticResource GrayBrush280}"></Setter>
                                         <Setter Property="IsEnabled" Value="True"></Setter>
                                     </Style>
                                 </Button.Style>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml
index f12306523..7da979a00 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml
@@ -71,7 +71,7 @@
                     <DockPanel>
                         <Button HorizontalAlignment="Left" ToolTip="Record this graph data. When stopped, the data will be saved to a csv file." Command="{Binding ToggleRecordingCommand}">
                             <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon VerticalAlignment="Center" Kind="Record" Foreground="#FF6D6D">
+                                <materialDesign:PackIcon VerticalAlignment="Center" Kind="Record" Foreground="{StaticResource RedBrush100}">
                                     <materialDesign:PackIcon.Style>
                                         <Style TargetType="materialDesign:PackIcon">
                                             <Setter Property="Opacity" Value="1"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml
index 8179dccc9..3830ecc3e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml
@@ -71,7 +71,7 @@
                     <DockPanel>
                         <Button HorizontalAlignment="Left" ToolTip="Record this graph data. When stopped, the data will be saved to a csv file." Command="{Binding ToggleRecordingCommand}">
                             <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon VerticalAlignment="Center" Kind="Record" Foreground="#FF6D6D">
+                                <materialDesign:PackIcon VerticalAlignment="Center" Kind="Record" Foreground="{StaticResource RedBrush100}">
                                     <materialDesign:PackIcon.Style>
                                         <Style TargetType="materialDesign:PackIcon">
                                             <Setter Property="Opacity" Value="1"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Resources/GraphEx.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Resources/GraphEx.xaml
index 85cccc2dd..e41fa1095 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Resources/GraphEx.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Resources/GraphEx.xaml
@@ -14,22 +14,23 @@
     <sys:Double x:Key="MiniFontSize">12</sys:Double>
     <sys:Double x:Key="TinyFontSize">9</sys:Double>
 
-    <!--Colors-->
-    <Color x:Key="borderColor">Silver</Color>
+    <!-- moved to COMMON -->
+    <!-- Colors-->
+    <!--<Color x:Key="borderColor">Silver</Color>
     <Color x:Key="graphGridLinesColor">#FFE9E9E9</Color>
     <Color x:Key="graphsMarkerColor">Gray</Color>
     <Color x:Key="materialColor">#03A9F4</Color>
     
 
-    <!--Brushes-->
+    --><!--Brushes--><!--
     <SolidColorBrush x:Key="borderBrush" Color="{StaticResource borderColor}"></SolidColorBrush>
     <SolidColorBrush x:Key="graphGridLinesBrush" Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
     <SolidColorBrush x:Key="BlackBrush" Color="#545454"></SolidColorBrush>
 
     <SolidColorBrush x:Key="graphGridLinesLightBrush" Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
-    <SolidColorBrush x:Key="graphGridLinesDarkBrush" Color="#FF2E2E2E"></SolidColorBrush>
+    <SolidColorBrush x:Key="graphGridLinesDarkBrush" Color="#FF2E2E2E"></SolidColorBrush>-->
 
-    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackgroundLight">
+    <!--<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackgroundLight">
         <GradientStop Color="White"/>
         <GradientStop Color="#FFE9E9E9" Offset="1"/>
     </LinearGradientBrush>
@@ -42,9 +43,9 @@
     <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackground">
         <GradientStop Color="White"/>
         <GradientStop Color="#FFE9E9E9" Offset="1"/>
-    </LinearGradientBrush>
+    </LinearGradientBrush>-->
 
-    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphLabelBackground" Opacity="0.7">
+    <!--<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphLabelBackground" Opacity="0.7">
         <GradientStop Color="White"/>
         <GradientStop Color="#FFD9D9D9" Offset="1"/>
     </LinearGradientBrush>
@@ -54,7 +55,7 @@
         <GradientStop Color="#FFBDBDBD" Offset="1"/>
     </LinearGradientBrush>
 
-    <SolidColorBrush Color="#FFF1F1F1" x:Key="topBarBackgroundBrush"></SolidColorBrush>
+    <SolidColorBrush Color="{DynamicResource WhiteBrush100}" x:Key="topBarBackgroundBrush"></SolidColorBrush>-->
 
     <!--Navigation Link Button-->
     <Style x:Key="LinkButton" TargetType="Button">
@@ -67,7 +68,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Foreground" Value="{StaticResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{StaticResource BlackForegroundBrush}" />
         <Style.Triggers>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Opacity" Value="0.5"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/ImportProjectTabView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/ImportProjectTabView.xaml
index b0d6b23fb..1cb7876cf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/ImportProjectTabView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/ImportProjectTabView.xaml
@@ -20,7 +20,7 @@
             </StackPanel>
             <StackPanel DockPanel.Dock="Top" VerticalAlignment="Top" Margin="0 30 0 0">
                 <StackPanel Orientation="Horizontal">
-                    <materialDesign:PackIcon Kind="Table" VerticalAlignment="Top" Width="50" Height="50" Foreground="#202020" />
+                    <materialDesign:PackIcon Kind="Table" VerticalAlignment="Top" Width="50" Height="50" Foreground="{StaticResource DarkGrayBrush}" />
                     <TextBlock Padding="0 10 0 0" TextWrapping="Wrap" Margin="10 0 0 0" VerticalAlignment="Top" FontSize="14" Text="IMPORT PROJECT TABS" Width="400"></TextBlock>
                 </StackPanel>
             </StackPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
index 8820fcd4d..2d180a8a2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
@@ -53,13 +53,13 @@
                         EditorWidth="1920"
                         EditorHeight="1080"
                         FontSize="10" 
-                        Background="#7EFFFFFF" 
-                        EditorBackground="#70FFFFFF" 
+                        Background="{StaticResource TransparentBackgroundBrush450}" 
+                        EditorBackground="{StaticResource TransparentBackgroundBrush600}" 
                         RulerBackground="Transparent" 
-                        Foreground="#1EA9FF" 
-                        SelectionFillBrush="#338D8D8D" 
-                        SelectionStrokeBrush="#1EA9FF" 
-                        BorderBrush="#1EA9FF" 
+                        Foreground="{StaticResource BlueSelectionStrokBrush}" 
+                        SelectionFillBrush="{StaticResource SelectionFillBrush}" 
+                        SelectionStrokeBrush="{StaticResource BlueSelectionStrokBrush}" 
+                        BorderBrush="{StaticResource BlueSelectionStrokBrush}" 
                         BorderThickness="1">
 
                         <editors:ElementsEditor.Style>
@@ -136,7 +136,7 @@
                     <RowDefinition Height="1*"/>
                 </Grid.RowDefinitions>
 
-                <Menu Padding="5" Background="#C6ECECEC" Visibility="{Binding HideMenu,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                <Menu Padding="5" Background="{StaticResource WhiteBrush100}" Visibility="{Binding HideMenu,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                     <MenuItem Header="File">
                         <MenuItem Command="{Binding NewProjectCommand}" MinWidth="180" Header="New" VerticalContentAlignment="Center">
                             <MenuItem.Icon>
@@ -265,8 +265,8 @@
                                                     <Setter Property="BorderThickness" Value="1"></Setter>
                                                     <Style.Triggers>
                                                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
-                                                            <Setter Property="Background" Value="White"></Setter>
-                                                            <Setter Property="BorderBrush" Value="#FF7575"></Setter>
+                                                            <Setter Property="Background" Value="{StaticResource WhiteBackgroundBrush}"></Setter>
+                                                            <Setter Property="BorderBrush" Value="{StaticResource RedBrush300}"></Setter>
                                                             <Setter Property="BorderThickness" Value="2"></Setter>
                                                         </DataTrigger>
                                                     </Style.Triggers>
@@ -327,8 +327,8 @@
                                                 <Setter Property="BorderThickness" Value="1"></Setter>
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
-                                                        <Setter Property="Background" Value="White"></Setter>
-                                                        <Setter Property="BorderBrush" Value="#FF7575"></Setter>
+                                                        <Setter Property="Background" Value="{StaticResource WhiteBackgroundBrush}"></Setter>
+                                                        <Setter Property="BorderBrush" Value="{StaticResource RedBrush300}"></Setter>
                                                         <Setter Property="BorderThickness" Value="2"></Setter>
                                                         <DataTrigger.EnterActions>
                                                             <BeginStoryboard>
@@ -398,12 +398,12 @@
                                     </Border.ContextMenu>
                                     <Border.Style>
                                         <Style TargetType="Border">
-                                            <Setter Property="Background" Value="#CBCBCB"></Setter>
-                                            <Setter Property="TextElement.Foreground" Value="#202020"></Setter>
+                                            <Setter Property="Background" Value="{StaticResource LightGrayBrush150}"></Setter>
+                                            <Setter Property="TextElement.Foreground" Value="{StaticResource DarkGrayBrush}"></Setter>
                                             <Style.Triggers>
                                                 <DataTrigger Binding="{Binding IsSelected}" Value="True">
                                                     <Setter Property="Background" Value="{StaticResource AccentColorBrush}"></Setter>
-                                                    <Setter Property="TextElement.Foreground" Value="White"></Setter>
+                                                    <Setter Property="TextElement.Foreground" Value="{StaticResource WhiteTextBrush}"></Setter>
                                                 </DataTrigger>
                                                 <Trigger Property="IsMouseOver" Value="True">
                                                     <Setter Property="Opacity" Value="0.8"></Setter>
@@ -416,10 +416,10 @@
                                             <materialDesign:PackIcon Kind="Close">
                                                 <materialDesign:PackIcon.Style>
                                                     <Style TargetType="materialDesign:PackIcon">
-                                                        <Setter Property="Foreground" Value="#202020"></Setter>
+                                                        <Setter Property="Foreground" Value="{StaticResource DarkGrayBrush}"></Setter>
                                                         <Style.Triggers>
                                                             <DataTrigger Binding="{Binding IsSelected}" Value="True">
-                                                                <Setter Property="Foreground" Value="White"></Setter>
+                                                                <Setter Property="Foreground" Value="{StaticResource WhiteTextBrush}"></Setter>
                                                             </DataTrigger>
                                                         </Style.Triggers>
                                                     </Style>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml
index 64b05769a..f8045d7a6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml
@@ -28,7 +28,7 @@
                 <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-            <Border Background="#A6FFFFFF" BorderBrush="Gray" BorderThickness="0 0 1 0">
+            <Border Background="#A6FFFFFF" BorderBrush="{StaticResource GrayBrush}" BorderThickness="0 0 1 0">
                 <Grid Margin="10 20 10 10">
                     <StackPanel HorizontalAlignment="Center">
 
@@ -84,13 +84,13 @@
                     </Grid>
                     <Grid DockPanel.Dock="Bottom">
                         <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
-                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveUserCommand}">
+                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding RemoveUserCommand}">
                                 <StackPanel Orientation="Horizontal">
                                     <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
                                     <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
                                 </StackPanel>
                             </Button>
-                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding AddUserCommand}">
+                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding AddUserCommand}">
                                 <StackPanel Orientation="Horizontal">
                                     <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
                                     <TextBlock Margin="5 0 0 0" FontSize="16">NEW USER</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationSelectionView.xaml
index 16dd36360..3e71836d3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationSelectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationSelectionView.xaml
@@ -23,13 +23,13 @@
             </Grid>
             <Grid DockPanel.Dock="Bottom">
                 <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveOrganizationCommand}">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding RemoveOrganizationCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
                             <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
                         </StackPanel>
                     </Button>
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding AddOrganizationCommand}">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding AddOrganizationCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
                             <TextBlock Margin="5 0 0 0" FontSize="16">NEW ORGANIZATION</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml
index ccb38b198..7e38447d8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml
@@ -149,7 +149,7 @@
                                                                 </Style.Triggers>
                                                             </Style>
                                                         </Button.Style>
-                                                        <materialDesign:PackIcon Kind="Delete" Foreground="#FF5C5C" Width="16" Height="16" />
+                                                        <materialDesign:PackIcon Kind="Delete" Foreground="{StaticResource RedBrush100}" Width="16" Height="16" />
                                                     </Button>
                                                 </Grid>
                                             </DataTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml
index 692b3f818..7f135efbc 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml
@@ -33,19 +33,19 @@
                     <RowDefinition Height="45"/>
                     <RowDefinition Height="1*"/>
                 </Grid.RowDefinitions>
-                <Button ToolTip="Increase Delta Resolution" Click="OnResolutionUpClicked" Style="{StaticResource MaterialDesignFlatButton}" Height="50" Padding="0" Foreground="#202020" VerticalAlignment="Bottom">
+                <Button ToolTip="Increase Delta Resolution" Click="OnResolutionUpClicked" Style="{StaticResource MaterialDesignFlatButton}" Height="50" Padding="0" Foreground="{StaticResource DarkGrayBrush}" VerticalAlignment="Bottom">
                     <materialDesign:PackIcon Kind="ArrowUp" Width="24" Height="24" />
                 </Button>
 
                 <Grid Grid.Row="1">
-                    <shapes:Hexagon Stroke="#202020" StrokeThickness="1" Margin="5" />
+                    <shapes:Hexagon Stroke="{StaticResource DarkGrayBrush}" StrokeThickness="1" Margin="5" />
                     <TextBlock TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" FontStyle="Italic" FontSize="10">
                         <Run Text="&#916;"></Run>
                         <Run Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Resolution,FallbackValue=1}"></Run>
                     </TextBlock>
                 </Grid>
 
-                <Button ToolTip="Decrease Delta Resolution" Click="OnResolutionDownClicked" Grid.Row="2" Style="{StaticResource MaterialDesignFlatButton}" Height="50" Padding="0" Foreground="#202020" VerticalAlignment="Top">
+                <Button ToolTip="Decrease Delta Resolution" Click="OnResolutionDownClicked" Grid.Row="2" Style="{StaticResource MaterialDesignFlatButton}" Height="50" Padding="0" Foreground="{StaticResource DarkGrayBrush}" VerticalAlignment="Top">
                     <materialDesign:PackIcon Kind="ArrowDown" Width="24" Height="24" />
                 </Button>
             </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
index d90d03545..03c6649d6 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
@@ -57,9 +57,11 @@
 
         <ResourceDictionary Source="GradientOffsetSlider.xaml" />
 
+        <!--<local:SharedResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Themes/LightThemeColors.xaml"/>-->
+
         <!--MahApps Brushes-->
-        <ResourceDictionary>
-            <SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource Primary700}" />
+        <!--<ResourceDictionary>-->
+            <!--<SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource Primary700}" />
             <SolidColorBrush x:Key="AccentColorBrush" Color="{DynamicResource Primary500}" />
             <SolidColorBrush x:Key="AccentColorBrush2" Color="{DynamicResource Primary400}" />
             <SolidColorBrush x:Key="AccentColorBrush3" Color="{DynamicResource Primary300}" />
@@ -73,8 +75,8 @@
             <SolidColorBrush x:Key="CheckmarkFill" Color="{DynamicResource Primary500}" />
             <SolidColorBrush x:Key="RightArrowFill" Color="{DynamicResource Primary500}" />
             <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="{DynamicResource Primary500Foreground}" />
-            <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Color="{DynamicResource Primary500}" Opacity="0.4" />
-        </ResourceDictionary>
+            <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Color="{DynamicResource Primary500}" Opacity="0.4" />-->
+        <!--</ResourceDictionary>-->
         
 
         <!--Fonts-->
@@ -206,13 +208,13 @@
             <sys:Double x:Key="MiniFontSize">12</sys:Double>
             <sys:Double x:Key="TinyFontSize">9</sys:Double>
 
-            <!--Colors-->
+            <!--Colors--><!--
             <Color x:Key="borderColor">Silver</Color>
             <Color x:Key="graphGridLinesColor">#FF464646</Color>
             <Color x:Key="graphsMarkerColor">Gray</Color>
             <Color x:Key="materialColor">#03A9F4</Color>
 
-            <!--Brushes-->
+            --><!--Brushes--><!--
             <SolidColorBrush x:Key="borderBrush" Color="{StaticResource borderColor}"></SolidColorBrush>
             <SolidColorBrush x:Key="graphGridLinesBrush" Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
             <SolidColorBrush x:Key="BlackBrush" Color="#545454"></SolidColorBrush>
@@ -233,11 +235,11 @@
             <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackground">
                 <GradientStop Color="#121212"/>
                 <GradientStop Color="#FF333333" Offset="1"/>
-            </LinearGradientBrush>
+            </LinearGradientBrush>-->
 
 
 
-            <SolidColorBrush Color="#FFF1F1F1" x:Key="topBarBackgroundBrush"></SolidColorBrush>
+            <!--<SolidColorBrush Color="{DynamicResource WhiteBrush100}" x:Key="topBarBackgroundBrush"></SolidColorBrush>-->
             <!--Brushes-->
 
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs
new file mode 100644
index 000000000..6b1a86741
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Tango.MachineStudio.Common.Resources
+{
+/// <summary>
+/// The shared resource dictionary is a specialized resource dictionary
+/// that loads it content only once. If a second instance with the same source
+/// is created, it only merges the resources from the cache.
+/// </summary>
+    public class SharedResourceDictionary : ResourceDictionary
+    {
+        /// <summary>
+        /// Internal cache of loaded dictionaries 
+        /// </summary>
+        public static Dictionary<Uri, ResourceDictionary> _sharedDictionaries =
+            new Dictionary<Uri, ResourceDictionary>();
+
+        /// <summary>
+        /// Local member of the source uri
+        /// </summary>
+        private Uri _sourceUri;
+
+        /// <summary>
+        /// Gets or sets the uniform resource identifier (URI) to load resources from.
+        /// </summary>
+        public new Uri Source
+        {
+            get { return _sourceUri; }
+            set
+            {
+                _sourceUri = value;
+
+                if (!_sharedDictionaries.ContainsKey(value))
+                {
+                    // If the dictionary is not yet loaded, load it by setting
+                    // the source of the base class
+                    base.Source = value;
+
+                    // add it to the cache
+                    _sharedDictionaries.Add(value, this);
+                }
+                else
+                {
+                    // If the dictionary is already loaded, get it from the cache
+                    MergedDictionaries.Add(_sharedDictionaries[value]);
+                }
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index 897c4f72d..c368a499c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -93,6 +93,7 @@
     <Compile Include="Controls\WpfGraphControl.cs" />
     <Compile Include="Converters\UserRoleToBooleanConverter.cs" />
     <Compile Include="Converters\UserRoleToVisibilityConverter.cs" />
+    <Compile Include="Resources\SharedResourceDictionary.cs" />
     <Compile Include="Web\LoginRequest.cs" />
     <Compile Include="Web\LoginResponse.cs" />
     <Compile Include="AutoComplete\MachinesProvider.cs" />
@@ -189,6 +190,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Themes\LightThemeColors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml
index 79245745e..6f7cd0e32 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml
@@ -63,7 +63,7 @@
 
     <Style TargetType="{x:Type local:WpfGraphControl}">
         <Setter Property="BorderThickness" Value="1"></Setter>
-        <Setter Property="BorderBrush" Value="#FF2E2E2E"></Setter>
+        <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush300}"></Setter>
         <Setter Property="Padding" Value="20 20 30 20"></Setter>
         <Setter Property="FontSize" Value="11"></Setter>
         <Setter Property="Foreground" Value="DodgerBlue"></Setter>
@@ -94,7 +94,7 @@
                             </Grid.ColumnDefinitions>
 
                             <Grid Grid.Column="1">
-                                <realTimeGraphX:WpfGraphGridLines Controller="{TemplateBinding Controller}" Foreground="#FF2E2E2E" />
+                                <realTimeGraphX:WpfGraphGridLines Controller="{TemplateBinding Controller}" Foreground="{DynamicResource GrayBrush300}" />
                                 <realTimeGraphX:WpfGraphSurface x:Name="surface" Controller="{TemplateBinding Controller}" BorderThickness="1 0 0 1" BorderBrush="{TemplateBinding Foreground}" />
 
                                 <Grid IsHitTestVisible="False" Visibility="{TemplateBinding GraphLabelVisibility}">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
new file mode 100644
index 000000000..90b3b0829
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
@@ -0,0 +1,158 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Tango.MachineStudio.Common.Themes">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary>
+        <SolidColorBrush x:Key="OrangeBrush" Color="#FFA300"/>
+        <SolidColorBrush x:Key="OrangeBrush200" Color="#FFA65F"/>
+        <SolidColorBrush x:Key="OrangeBrush250" Color="#E79F20"/>
+            <SolidColorBrush x:Key="OrangeCanceledBrush" Color="#EF832B"/>
+            <!--Background for all duplicate buttons-->
+            <SolidColorBrush x:Key="OrangeBrush300" Color="#FF9A6A"/>
+        <SolidColorBrush x:Key="OrangeBrush400" Color="#F38B76"/>
+
+        <SolidColorBrush x:Key="RedBrush100" Color="#FF5151"/>
+            <SolidColorBrush x:Key="RedBrush200" Color="#FF6F6F"/>
+            <!--Background for all remove/delete buttons-->
+            <SolidColorBrush x:Key="RedBrush300" Color="#FF7272"/>
+        <SolidColorBrush x:Key="RedBrush400" Color="#FF8585"/>
+        <SolidColorBrush x:Key="RedBrush500" Color="#E14141"/>
+         <SolidColorBrush x:Key="OrangeUploadBrush" Color="#E76311"/>
+
+
+            <SolidColorBrush x:Key="GreenBrush" Color="#04CB04"/>
+            <SolidColorBrush x:Key="GreenDownloadFileBrush" Color="#2DD42D"/>
+            <SolidColorBrush x:Key="GreenBrush100" Color="#68E46E"/>
+            <!--<SolidColorBrush x:Key="GreenBrush200" Color="#65C682"/>-->
+            <!--Background for all new buttons-->
+            <SolidColorBrush x:Key="GreenBrush300" Color="#68B367"/>
+            <SolidColorBrush x:Key="GreenBrush400" Color="#90E990"/>
+            <SolidColorBrush x:Key="GreenBrush450" Color="#20BB20"/>
+            <SolidColorBrush x:Key="GreenUploadBrush" Color="#2FD42F"/>
+            <SolidColorBrush x:Key="GreenOpenFileBrush" Color="#2CC62C"/>
+            <SolidColorBrush x:Key="GreenMConnectionBrush" Color="#03FF8E"/>
+            <SolidColorBrush x:Key="GreenMenuDebugBrush" Color="#8DD28A"/>
+
+
+            <SolidColorBrush x:Key="DarkBlueBrush" Color="#3C7EF4"/>
+        <SolidColorBrush x:Key="DodgerBlueBrush" Color="DodgerBlue"/>
+        <SolidColorBrush x:Key="BlueBrush100" Color="#03A9F4" />
+        <SolidColorBrush x:Key="BlueBrush" Color="#64B8EC"/>
+        <SolidColorBrush x:Key="BlueSelectionStrokBrush" Color="#1EA9FF"/>
+
+        <SolidColorBrush x:Key="LilacBrush" Color="#833CEC"/>
+        <SolidColorBrush x:Key="LilacBrush100" Color="#682EBE"/>
+        <SolidColorBrush x:Key="LilacBrush200" Color="#532990"/>
+
+
+
+            <SolidColorBrush x:Key="WhiteTextBrush" Color="White"/>
+        <SolidColorBrush x:Key="WhiteBackgroundBrush" Color="White"/>
+        <SolidColorBrush x:Key="WhiteBrush" Color="#E6FFFFFF"/>
+        <SolidColorBrush x:Key="WhiteBrush50" Color="#FFF1F1F1"/>
+            
+        <SolidColorBrush x:Key="WhiteBrush100" Color="#ECECEC"/>
+        <SolidColorBrush x:Key="LightGrayBrush" Color="#A5A4A4"/>
+        <SolidColorBrush x:Key="LightGrayBrush100" Color="#BBBBBB"/>
+        <SolidColorBrush x:Key="LightGrayBrush150" Color="#CBCBCB"/>
+        <SolidColorBrush x:Key="LightGrayBrush200" Color="#D9D9D9"/>
+
+            <!-- used for regular text color -->
+        <SolidColorBrush x:Key="BlackForegroundBrush" Color="black"/>
+        <SolidColorBrush x:Key="DarkGrayBrush" Color="#1B1B1B"/>
+        <SolidColorBrush x:Key="DarkGrayBrush100" Color="#101010"/>
+        <SolidColorBrush x:Key="DarkGrayBrush200" Color="#202020"/>
+        <SolidColorBrush x:Key="GrayBrush300" Color="#303030"/>
+            <!--used for Foreground Storage-->
+        <SolidColorBrush x:Key="GrayBrush310" Color="#363636"/>
+        <SolidColorBrush x:Key="GrayBrush280" Color="#3E3E3E"/>
+        <SolidColorBrush x:Key="GrayBrush290" Color="#404040"/>
+         <!-- used for text color-->
+        <SolidColorBrush x:Key="GrayBrush250" Color="#5E5E5E"/>
+        <SolidColorBrush x:Key="GrayBrush200" Color="#616161"/>
+        <SolidColorBrush x:Key="GrayBrush50" Color="#7A7A7A"/>
+        <SolidColorBrush x:Key="GrayBrush" Color="Gray"/>
+        <SolidColorBrush x:Key="DimGrayBrush" Color="DimGray"/>
+
+
+            <LinearGradientBrush x:Key="BlueGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
+            <GradientStop Color="#03A9F4"/>
+            <GradientStop Color="#0081BB" Offset="1"/>
+        </LinearGradientBrush>
+
+        <SolidColorBrush x:Key="TransparentBackgroundBrush" Color="#96FFFFFF"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush100" Color="#B9FFFFFF"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush200" Color="#E6FFFFFF"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush300" Color="#D4FFFFFF"/>
+        <SolidColorBrush x:Key="Transparent200" Color="#C9F6F6F6"/>
+         <!--MachineJobSelectionView Grid Background-->
+        <SolidColorBrush x:Key="TransparentBackgroundBrush400" Color="#B1FFFFFF"/>
+        <!--Storage.Views.MainView-->
+        <SolidColorBrush x:Key="TransparentBackgroundBrush500" Color="#8BFFFFFF"/>
+            
+        <!--MachineTechView-->
+        <SolidColorBrush x:Key="TransparentBackgroundBrush450" Color="#7EFFFFFF"/>
+            <SolidColorBrush x:Key="TransparentBackgroundBrush600" Color="#70FFFFFF"/>
+        <SolidColorBrush x:Key="SelectionFillBrush" Color="#338D8D8D"/>
+        
+            <!--base background and foreground-->
+        <SolidColorBrush x:Key="MainWindow.Background" Color="White"></SolidColorBrush>
+        <SolidColorBrush x:Key="MainWindow.Foreground" Color="#FF494949"></SolidColorBrush>
+            
+            <!--material design colors-->
+            <SolidColorBrush x:Key="HighlightBrush" Color="#FF0288d1" />
+            <SolidColorBrush x:Key="AccentColorBrush" Color="#2196f3" />
+            <SolidColorBrush x:Key="AccentColorBrush2" Color="#FF29b6f6" />
+            <SolidColorBrush x:Key="AccentColorBrush3" Color="#FF4fc3f7" />
+            <SolidColorBrush x:Key="AccentColorBrush4" Color="#FF81d4fa" />
+            <SolidColorBrush x:Key="WindowTitleColorBrush" Color="#FF0288d1" />
+            <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="#FFFFFFFF" />
+            <LinearGradientBrush x:Key="ProgressBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
+                <GradientStop Color="#0288d1" Offset="0" />
+                <GradientStop Color="#4fc3f7" Offset="1" />
+            </LinearGradientBrush>
+            <SolidColorBrush x:Key="CheckmarkFill" Color="#FF03a9f4" />
+            <SolidColorBrush x:Key="RightArrowFill" Color="#FF03a9f4" />
+            <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="#FFFFFFFF" />
+            <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Color="#2196f3" Opacity="0.4" />
+            <!--Colors-->
+            <Color x:Key="borderColor">Silver</Color>
+            <Color x:Key="graphGridLinesColor">#FF464646</Color>
+            <Color x:Key="graphsMarkerColor">Gray</Color>
+            <Color x:Key="materialColor">#FF03A9F4</Color>
+            <!--Brushes-->
+            <SolidColorBrush x:Key="borderBrush" Color="{StaticResource borderColor}"></SolidColorBrush>
+            <SolidColorBrush x:Key="graphGridLinesBrush" Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
+            <SolidColorBrush x:Key="BlackBrush" Color="#545454"></SolidColorBrush>
+            <SolidColorBrush x:Key="graphGridLinesLightBrush" Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
+            <SolidColorBrush x:Key="graphGridLinesDarkBrush" Color="#FF2E2E2E"></SolidColorBrush>
+            <SolidColorBrush x:Key="MaterialDesignFlatButtonClick" Color="#FFDEDEDE"></SolidColorBrush>
+           
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackgroundLight">
+                <GradientStop Color="White"/>
+                <GradientStop Color="#FFE9E9E9" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackgroundDark">
+                <GradientStop Color="Black"/>
+                <GradientStop Color="#FF333333" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackground">
+                <GradientStop Color="#121212"/>
+                <GradientStop Color="#FF333333" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphLabelBackground" Opacity="0.7">
+                <GradientStop Color="White"/>
+                <GradientStop Color="#FFD9D9D9" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphLegendBackground" Opacity="0.7">
+                <GradientStop Color="#FFE9E9E9"/>
+                <GradientStop Color="#FFBDBDBD" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5" x:Key="borderBackground">
+                <GradientStop Color="#00E6E6E6"/>
+                <GradientStop Color="#DEDEDE" Offset="1"/>
+            </LinearGradientBrush>
+            <SolidColorBrush Color="#FFECECEC" x:Key="topBarBackgroundBrush"></SolidColorBrush>
+    </ResourceDictionary>
+</ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml
index 20e381b70..11ab79afd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml
@@ -3,14 +3,15 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
              xmlns:local="clr-namespace:Tango.MachineStudio.UI"
              xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"
-             StartupUri="MainWindow.xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" d1p1:Ignorable="d" xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006">
+             StartupUri="MainWindow.xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" d1p1:Ignorable="d" xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:resources="clr-namespace:Tango.MachineStudio.Common.Resources;assembly=Tango.MachineStudio.Common">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
                 <!-- Accent and AppTheme setting -->
                 <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Resources/MaterialDesign.xaml"></ResourceDictionary>
-
+                <resources:SharedResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Themes/LightThemeColors.xaml"/>
                 <!-- Include the Dragablz Material Design style -->
                 <ResourceDictionary Source="pack://application:,,,/Dragablz;component/Themes/materialdesign.xaml"/>
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml
index 22338fea7..0408319ea 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml
@@ -98,7 +98,7 @@
                         <fa:ImageAwesome Icon="Play" Width="12" Margin="2">
                             <fa:ImageAwesome.Style>
                                 <Style TargetType="fa:ImageAwesome">
-                                    <Setter Property="Foreground" Value="#8DD28A"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource GreenMenuDebugBrush}"></Setter>
                                     <Style.Triggers>
                                         <Trigger Property="IsEnabled" Value="False">
                                             <Setter Property="Foreground" Value="Gray"></Setter>
@@ -114,7 +114,7 @@
                         <fa:ImageAwesome Icon="Stop" Width="12" Margin="2">
                             <fa:ImageAwesome.Style>
                                 <Style TargetType="fa:ImageAwesome">
-                                    <Setter Property="Foreground" Value="#F38B76"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource OrangeBrush400}"/>
                                     <Style.Triggers>
                                         <Trigger Property="IsEnabled" Value="False">
                                             <Setter Property="Foreground" Value="Gray"></Setter>
@@ -129,7 +129,7 @@
         </Menu>
 
         <DockPanel Grid.Row="1">
-            <materialDesign:ColorZone Background="#2E2E2E" Padding="16" materialDesign:ShadowAssist.ShadowDepth="Depth2"
+            <materialDesign:ColorZone Background="{StaticResource GrayBrush300}" Padding="16" materialDesign:ShadowAssist.ShadowDepth="Depth2"
                                             Mode="PrimaryMid" DockPanel.Dock="Top">
                 <DockPanel>
                     <Grid>
@@ -156,22 +156,26 @@
                                 <RowDefinition Height="200*"/>
                             </Grid.RowDefinitions>
 
-                            <controls:ScriptEditorControl BorderThickness="0 1 0 0" BorderBrush="#616161" Text="{Binding Code,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" RunCommand="{Binding RunCommand}" StopCommand="{Binding StopCommand}" HighlightTypes="{Binding HighlightTypes}" IntellisenseTypes="{Binding IntellisenseTypes}"></controls:ScriptEditorControl>
+                            <controls:ScriptEditorControl BorderThickness="0 1 0 0" 
+                                                          BorderBrush="#616161" 
+                                                          Text="{Binding Code,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
+                                                          RunCommand="{Binding RunCommand}" 
+                                                          StopCommand="{Binding StopCommand}"  IntellisenseTypes="{Binding IntellisenseTypes}"
+                                                          HighlightTypes="{Binding HighlightTypes}"/>
+                            <GridSplitter Grid.Row="1" Background="{StaticResource DarkGrayBrush100}" Foreground="{StaticResource DarkGrayBrush200}" BorderBrush="{StaticResource DarkGrayBrush200}" Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
 
-                            <GridSplitter Grid.Row="1" Background="#101010" Foreground="#202020" BorderBrush="#202020" Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
 
-
-                            <Grid Grid.Row="2" Background="#1B1B1B">
+                            <Grid Grid.Row="2" Background="{StaticResource DarkGrayBrush}">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="20"/>
                                     <RowDefinition Height="57*"/>
                                 </Grid.RowDefinitions>
 
-                                <Border BorderThickness="0 0 0 1" BorderBrush="#595959">
+                                <Border BorderThickness="0 0 0 1" BorderBrush="{StaticResource GrayBrush250}">
                                     <TextBlock Margin="2" HorizontalAlignment="Center">LOG</TextBlock>
                                 </Border>
 
-                                <TextBox x:Name="txtLog" TextChanged="TextBox_TextChanged" FontFamily="Lucida Console" Background="#202020" BorderThickness="0" AcceptsReturn="True" VerticalScrollBarVisibility="Visible" Padding="5" IsReadOnly="True" TextWrapping="Wrap" FontSize="11" Foreground="Gainsboro" Grid.Row="2"></TextBox>
+                                <TextBox x:Name="txtLog" TextChanged="TextBox_TextChanged" FontFamily="Lucida Console" Background="{StaticResource DarkGrayBrush200}" BorderThickness="0" AcceptsReturn="True" VerticalScrollBarVisibility="Visible" Padding="5" IsReadOnly="True" TextWrapping="Wrap" FontSize="11" Foreground="Gainsboro" Grid.Row="2"></TextBox>
                             </Grid>
                         </Grid>
                     </Grid>
@@ -180,6 +184,7 @@
                 <Border HorizontalAlignment="Right" Margin="0 -1 10 0" VerticalAlignment="Top" Width="300" Height="40" Padding="5" CornerRadius="0 0 30 30" BorderThickness="1 0 1 1" BorderBrush="DimGray">
                     <Border.Style>
                         <Style TargetType="Border">
+                            <Setter Property="Background" Value="{StaticResource BlueGradientBrush}"></Setter>
                             <Setter Property="RenderTransform">
                                 <Setter.Value>
                                     <ScaleTransform ScaleX="1" ScaleY="0"></ScaleTransform>
@@ -205,12 +210,12 @@
                             </Style.Triggers>
                         </Style>
                     </Border.Style>
-                    <Border.Background>
-                        <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                    <!--<Border.Background>-->
+                    <!--<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
                             <GradientStop Color="#03A9F4"/>
                             <GradientStop Color="#0081BB" Offset="1"/>
-                        </LinearGradientBrush>
-                    </Border.Background>
+                        </LinearGradientBrush>-->
+                    <!--</Border.Background>-->
 
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="20 0 0 0">
                         <mahapps:ProgressRing Width="24" Height="24" Foreground="White"></mahapps:ProgressRing>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
index 6c55f6c5e..810114144 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
@@ -8,7 +8,8 @@
         xmlns:views="clr-namespace:Tango.MachineStudio.UI.Views"
         xmlns:sharedControls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
         mc:Ignorable="d"
-        Title="Tango" Height="800" Width="1280" Foreground="#494949" BorderThickness="1" BorderBrush="{StaticResource AccentColorBrush}">
+        Title="Tango" Height="800" Width="1280"  Foreground="{StaticResource MainWindow.Foreground}" 
+                     BorderThickness="1"  BorderBrush="{StaticResource AccentColorBrush}" Background="{DynamicResource MainWindow.Background}">
 
     <Grid x:Name="main_grid">
         <Grid.Background>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
index 338cb2d22..6c0a42ed1 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
@@ -225,8 +225,8 @@
                 <Grid Grid.Column="1">
                     <DockPanel>
                         <StackPanel>
-                            <Button FontSize="11" Height="40" Width="140" Command="{Binding ResetCommand}" Background="Transparent" BorderBrush="#202020" Foreground="#202020" Margin="0 2" ToolTip="Reset the embedded device">RESET</Button>
-                            <Button FontSize="11" Height="40" Width="140" Command="{Binding TurnOffHeatersCommand}" Background="Transparent" BorderBrush="#202020" Foreground="#202020" Margin="0 2" ToolTip="Resets the current process parameters in the embedded device">
+                            <Button FontSize="11" Height="40" Width="140" Command="{Binding ResetCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush}" Foreground="{StaticResource DarkGrayBrush}" Margin="0 2" ToolTip="Reset the embedded device">RESET</Button>
+                            <Button FontSize="11" Height="40" Width="140" Command="{Binding TurnOffHeatersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush}" Foreground="{StaticResource DarkGrayBrush}" Margin="0 2" ToolTip="Resets the current process parameters in the embedded device">
                                 <TextBlock TextWrapping="Wrap" TextAlignment="Center">
                                 TURN OFF HEATERS
                                 </TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
index 976c3866a..9af5c6b06 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
@@ -88,7 +88,7 @@
                             <TextBlock HorizontalAlignment="Center" FontSize="18" FontWeight="SemiBold">Upgrading Machine Firmware</TextBlock>
                             <TextBlock Margin="0 40 0 0" HorizontalAlignment="Center" Foreground="Gray" Text="{Binding Handler.Message,Converter={StaticResource EnumToDescriptionConverter},Mode=OneWay}"></TextBlock>
                             <ProgressBar Height="15" Width="600" Margin="0 5 0 0" Maximum="{Binding Handler.Total,Mode=OneWay}" Value="{Binding Handler.Current,Mode=OneWay}" ></ProgressBar>
-                            <Button Width="150" Background="#FF5151" BorderBrush="#FF5151" Margin="0 40 0 0" Height="35" Command="{Binding AbortCommand}">ABORT</Button>
+                            <Button Width="150" Background="{StaticResource RedBrush100}" BorderBrush="{StaticResource RedBrush100}" Margin="0 40 0 0" Height="35" Command="{Binding AbortCommand}">ABORT</Button>
                         </StackPanel>
                     </Grid>
 
@@ -103,8 +103,8 @@
                     <Grid>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                             <TextBlock HorizontalAlignment="Center" FontSize="18" FontWeight="SemiBold">Firmware Upgrade Failed</TextBlock>
-                            <materialDesign:PackIcon HorizontalAlignment="Center" Width="100" Margin="0 10 0 0" Height="100" Kind="AlertOutline" Foreground="#FF5151" />
-                            <TextBlock HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" Text="{Binding UpgradeError}" Foreground="#FF5151" FontWeight="SemiBold"></TextBlock>
+                            <materialDesign:PackIcon HorizontalAlignment="Center" Width="100" Margin="0 10 0 0" Height="100" Kind="AlertOutline" Foreground="{StaticResource RedBrush100}" />
+                            <TextBlock HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" Text="{Binding UpgradeError}" Foreground="{StaticResource RedBrush100}" FontWeight="SemiBold"></TextBlock>
                             <Button Width="150" Margin="0 15 0 0" Height="35" Command="{Binding CloseCommand}">CLOSE</Button>
                         </StackPanel>
                     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
index f66e247a9..57b8335c5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -248,11 +248,11 @@
                                                     <materialDesign:PackIcon Margin="10 0 0 0" Width="24" Height="24">
                                                         <materialDesign:PackIcon.Style>
                                                             <Style TargetType="materialDesign:PackIcon">
-                                                                <Setter Property="Foreground" Value="#333333"></Setter>
+                                                                <Setter Property="Foreground" Value="{StaticResource GrayBrush300}"></Setter>
                                                                 <Setter Property="Kind" Value="LanDisconnect"></Setter>
                                                                 <Style.Triggers>
                                                                     <DataTrigger Binding="{Binding ApplicationManager.IsMachineConnected,Mode=OneWay}" Value="True">
-                                                                        <Setter Property="Foreground" Value="#03FF8E"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource GreenMConnectionBrush}"></Setter>
                                                                         <Setter Property="Kind" Value="LanConnect"></Setter>
                                                                     </DataTrigger>
                                                                 </Style.Triggers>
@@ -470,6 +470,7 @@
                     <Border HorizontalAlignment="Right" Margin="0 -1 10 0" VerticalAlignment="Top" Width="300" Height="Auto" CornerRadius="0 0 30 30" BorderThickness="1 0 1 1" BorderBrush="DimGray">
                         <Border.Style>
                             <Style TargetType="Border">
+                                <Setter Property="Background" Value="{StaticResource BlueGradientBrush}"/>
                                 <Setter Property="RenderTransform">
                                     <Setter.Value>
                                         <ScaleTransform ScaleX="1" ScaleY="0"></ScaleTransform>
@@ -495,12 +496,12 @@
                                 </Style.Triggers>
                             </Style>
                         </Border.Style>
-                        <Border.Background>
+                        <!--<Border.Background>
                             <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
                                 <GradientStop Color="#03A9F4"/>
                                 <GradientStop Color="#0081BB" Offset="1"/>
                             </LinearGradientBrush>
-                        </Border.Background>
+                        </Border.Background>-->
 
                         <ItemsControl ItemsSource="{Binding NotificationProvider.TaskItems}">
                             <ItemsControl.ItemTemplate>
@@ -517,7 +518,7 @@
                     </Border>
 
                     <Grid HorizontalAlignment="Right" VerticalAlignment="Top" Margin="10" Visibility="{Binding IsMachineErrorsOpened,Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <Border Width="350" Background="#FFF1F1F1" BorderBrush="White" CornerRadius="5" Padding="5">
+                        <Border Width="350" Background="{StaticResource WhiteBrush50}" BorderBrush="White" CornerRadius="5" Padding="5">
                             <Border.Effect>
                                 <DropShadowEffect ShadowDepth="0" BlurRadius="10" />
                             </Border.Effect>
@@ -525,7 +526,7 @@
                             <ItemsControl ItemsSource="{Binding ApplicationManager.ConnectedMachine.MachineEventsStateProvider.Events}">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate DataType="{x:Type entities:MachinesEvent}">
-                                        <Border BorderThickness="0 0 0 1" BorderBrush="#E1E1E1" Padding="5">
+                                        <Border BorderThickness="0 0 0 1" BorderBrush="{StaticResource WhiteBrush100}" Padding="5">
                                             <DockPanel>
                                                 <Grid DockPanel.Dock="Right" HorizontalAlignment="Right" VerticalAlignment="Center">
                                                     <ContentControl>
@@ -576,11 +577,11 @@
                                                                     <Style.Triggers>
                                                                         <DataTrigger Binding="{Binding Category}" Value="Warning">
                                                                             <Setter Property="Kind" Value="Alert"></Setter>
-                                                                            <Setter Property="Foreground" Value="#FFA300"></Setter>
+                                                                            <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
                                                                         </DataTrigger>
                                                                         <DataTrigger Binding="{Binding Category}" Value="Error">
                                                                             <Setter Property="Kind" Value="AlertOctagon"></Setter>
-                                                                            <Setter Property="Foreground" Value="#FF5C5C"></Setter>
+                                                                            <Setter Property="Foreground" Value="{StaticResource RedBrush100}"></Setter>
                                                                         </DataTrigger>
                                                                         <DataTrigger Binding="{Binding Category}" Value="Critical">
                                                                             <Setter Property="Kind" Value="BellPlus"></Setter>
@@ -605,7 +606,7 @@
                         </Border>
 
                         <Canvas HorizontalAlignment="Center">
-                            <Polygon Points="12,0 0,31 24,31" Fill="#FFF1F1F1" Canvas.Top="-30" Canvas.Left="90"></Polygon>
+                            <Polygon Points="12,0 0,31 24,31" Fill="{StaticResource WhiteBrush50}" Canvas.Top="-30" Canvas.Left="90"></Polygon>
                         </Canvas>
                     </Grid>
                 </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
index 5f5e1042b..a209df34a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
@@ -140,12 +140,12 @@
             </Grid>
 
             <Grid Grid.Row="2">
-                <Button HorizontalAlignment="Right" Height="40" Width="140" Command="{Binding OKCommand}" Background="#FF6262" BorderBrush="#FF6262" IsDefault="True">SUBMIT</Button>
+                <Button HorizontalAlignment="Right" Height="40" Width="140" Command="{Binding OKCommand}" Background="{StaticResource RedBrush100}" BorderBrush="{StaticResource RedBrush100}" IsDefault="True">SUBMIT</Button>
 
                 <ItemsControl ItemsSource="{Binding ValidationErrors}" HorizontalAlignment="Left" Margin="5" VerticalAlignment="Center" Visibility="Visible">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <TextBlock Foreground="#FF4C4C" Margin="0 2 0 0"><Run>*</Run> <Run Text="{Binding Path=.,Mode=OneWay}"></Run></TextBlock>
+                            <TextBlock Foreground="{StaticResource RedBrush100}" Margin="0 2 0 0"><Run>*</Run> <Run Text="{Binding Path=.,Mode=OneWay}"></Run></TextBlock>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
index 97c42d58d..d1ff75fc7 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
@@ -42,7 +42,7 @@
                             <Border BorderBrush="#E6E6E6" BorderThickness="0 0 0 1" Padding="5">
                                 <DockPanel>
                                     <StackPanel DockPanel.Dock="Right" HorizontalAlignment="Right" Orientation="Horizontal">
-                                        <Button Background="#FF8282" BorderBrush="#FF8282" Padding="0" Width="90" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DeclineCommand}" CommandParameter="{Binding}">
+                                        <Button Background="{StaticResource RedBrush400}" BorderBrush="{StaticResource RedBrush400}" Padding="0" Width="90" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DeclineCommand}" CommandParameter="{Binding}">
                                             <StackPanel Orientation="Horizontal">
                                                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Close" />
                                                 <TextBlock Margin="10 0 0 0" FontSize="11" VerticalAlignment="Center">NOT FIXED</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
index f5d1065b8..a35928e12 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
@@ -54,7 +54,7 @@
                                 </Style>
                             </StackPanel.Style>
                             <TextBlock Foreground="Gray" FontSize="16">Release Notes</TextBlock>
-                            <TextBlock FontSize="12" TextWrapping="Wrap" Foreground="#404040" Margin="0 5 0 0" Text="{Binding UpdateComments}"></TextBlock>
+                            <TextBlock FontSize="12" TextWrapping="Wrap" Foreground="{StaticResource GrayBrush290}" Margin="0 5 0 0" Text="{Binding UpdateComments}"></TextBlock>
                         </StackPanel>
                     </Canvas>
                 </Grid>
@@ -109,7 +109,7 @@
                                                                 </StackPanel>
                                                             </Button>
 
-                                                            <Button Visibility="{Binding IsRollbackAvailable,Converter={StaticResource BoolToVisConverter}}" MinWidth="140" Height="40" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Restore Machine Studio to the previous version." Margin="0 40 0 0" Command="{Binding RollbackCommand}" Foreground="#FF5F5F">
+                                                            <Button Visibility="{Binding IsRollbackAvailable,Converter={StaticResource BoolToVisConverter}}" MinWidth="140" Height="40" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Restore Machine Studio to the previous version." Margin="0 40 0 0" Command="{Binding RollbackCommand}" Foreground="{StaticResource RedBrush100}">
                                                                 <StackPanel Orientation="Horizontal">
                                                                     <materialDesign:PackIcon Kind="BackupRestore" Width="24" Height="24" />
                                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Restore previous version</TextBlock>
@@ -185,7 +185,7 @@
                                                                 <TextBlock VerticalAlignment="Center" Margin="0 20 0 0">Your version of Machine Studio is up to date!</TextBlock>
                                                             </StackPanel>
 
-                                                            <Button Visibility="{Binding IsRollbackAvailable,Converter={StaticResource BoolToVisConverter}}" MinWidth="140" Height="40" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Restore Machine Studio to the previous version." Margin="0 40 0 0" Command="{Binding RollbackCommand}" Foreground="#FF5F5F">
+                                                            <Button Visibility="{Binding IsRollbackAvailable,Converter={StaticResource BoolToVisConverter}}" MinWidth="140" Height="40" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Restore Machine Studio to the previous version." Margin="0 40 0 0" Command="{Binding RollbackCommand}" Foreground="{StaticResource RedBrush100}">
                                                                 <StackPanel Orientation="Horizontal">
                                                                     <materialDesign:PackIcon Kind="BackupRestore" Width="24" Height="24" />
                                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Restore previous version</TextBlock>
@@ -201,7 +201,7 @@
                                                 <Setter.Value>
                                                     <Grid>
                                                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                            <materialDesign:PackIcon Kind="Alert" Width="100" Height="100" Foreground="#FF5F5F" HorizontalAlignment="Center" />
+                                                            <materialDesign:PackIcon Kind="Alert" Width="100" Height="100" Foreground="{StaticResource RedBrush100}" HorizontalAlignment="Center" />
                                                             <TextBlock VerticalAlignment="Center" Margin="0 20 0 0" HorizontalAlignment="Center">Error updating machine studio</TextBlock>
                                                             <TextBlock HorizontalAlignment="Center" Margin="0 10 0 0" FontSize="12" TextAlignment="Center">
                                                         <Run>An error occurred while updating your software.</Run>
@@ -238,7 +238,7 @@
                                                 <Setter.Value>
                                                     <Grid>
                                                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                            <materialDesign:PackIcon Kind="Alert" Width="100" Height="100" Foreground="#FF5F5F" HorizontalAlignment="Center" />
+                                                            <materialDesign:PackIcon Kind="Alert" Width="100" Height="100" Foreground="{StaticResource RedBrush100}" HorizontalAlignment="Center" />
                                                             <TextBlock VerticalAlignment="Center" Margin="0 20 0 0" HorizontalAlignment="Center">Error restoring previous version</TextBlock>
                                                             <TextBlock HorizontalAlignment="Center" Margin="0 10 0 0" FontSize="12" TextAlignment="Center">
                                                         <Run>An error occurred while restore the last version.</Run>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml
index 147b40892..a1c58aab2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml
@@ -43,7 +43,7 @@
                         </Grid>
 
                         <Grid Grid.Row="1" Margin="0 10 0 0">
-                            <TextBox Style="{x:Null}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderBrush="#515151" IsReadOnly="True" AcceptsReturn="True" Foreground="#202020" Padding="2" TextWrapping="Wrap" Text="{Binding Exception}"></TextBox>
+                            <TextBox Style="{x:Null}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderBrush="{StaticResource GrayBrush200}" IsReadOnly="True" AcceptsReturn="True"  Foreground="{StaticResource DarkGrayBrush}" Padding="2" TextWrapping="Wrap" Text="{Binding Exception}"></TextBox>
                         </Grid>
                     </Grid>
 
@@ -55,7 +55,7 @@
                             <Button x:Name="btnReport" Style="{StaticResource MaterialDesignFlatButton}" Width="150" Command="{Binding ResolveCommand}" CommandParameter="{x:Static local:ExceptionResolutions.Report}">
                                 <StackPanel Orientation="Horizontal">
                                     <Image Source="/Images/bug.png" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                    <TextBlock Foreground="#FF5C5C" Margin="10 0 0 0" VerticalAlignment="Center">Report Issue</TextBlock>
+                                    <TextBlock Foreground="{StaticResource RedBrush100}" Margin="10 0 0 0" VerticalAlignment="Center">Report Issue</TextBlock>
                                 </StackPanel>
                             </Button>
                             <Button Margin="5 0 0 0" Width="140" Command="{Binding ResolveCommand}" CommandParameter="{x:Static local:ExceptionResolutions.Shutdown}">Shutdown</Button>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml
index 8721cfd6a..d53cb934e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml
@@ -51,6 +51,7 @@
                             <Border HorizontalAlignment="Right" Margin="0 -1 10 0" VerticalAlignment="Top" Width="300" Height="40" Padding="5" CornerRadius="0 0 30 30" BorderThickness="1 0 1 1" BorderBrush="DimGray">
                                 <Border.Style>
                                     <Style TargetType="Border">
+                                        <!--<Setter Property="Background" Value="{StaticResource BlueGradientBrush}"/>-->
                                         <Setter Property="RenderTransform">
                                             <Setter.Value>
                                                 <ScaleTransform ScaleX="1" ScaleY="0"></ScaleTransform>
@@ -78,7 +79,7 @@
                                 </Border.Style>
                                 <Border.Background>
                                     <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                        <GradientStop Color="#03A9F4"/>
+                                        <GradientStop Color="#FF03A9F4"/>
                                         <GradientStop Color="#0081BB" Offset="1"/>
                                     </LinearGradientBrush>
                                 </Border.Background>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>
-- 
cgit v1.3.1