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.RML/Images/data-table.png  | Bin 0 -> 1238 bytes
 .../Tango.MachineStudio.RML.csproj                 |   3 ++
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     |  37 +++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/data-table.png

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/data-table.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/data-table.png
new file mode 100644
index 000000000..0d5e5eaa6
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/data-table.png differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
index b1c8f580d..6b113be5f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
@@ -186,6 +186,9 @@
   <ItemGroup>
     <Resource Include="Images\thread_128px.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\data-table.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
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 8f2c5d187..e43c20c3d 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
@@ -132,6 +132,43 @@
 
                     <Grid>
                         <DockPanel>
+                            <Border DockPanel.Dock="Top" Background="#E9FFFFFF" Margin="20 0" Padding="5" CornerRadius="5">
+                                <Border.Effect>
+                                    <DropShadowEffect Opacity="0.4" />
+                                </Border.Effect>
+                                <Grid>
+                                    <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">COLOR CONVERSION TABLE (CCT)</TextBlock>
+                                </Grid>
+                            </Border>
+                            <Grid DockPanel.Dock="Top" Margin="20 10">
+                                <StackPanel HorizontalAlignment="Left" Margin="20 0 0 0">
+                                    <Grid>
+                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                                            <materialDesign:PackIcon Kind="ArrowLeftBoldHexagonOutline" VerticalAlignment="Center" Width="40" Height="40" />
+                                            <Image Source="../Images/data-table.png" Height="80" Opacity="0.8"></Image>
+                                            <StackPanel VerticalAlignment="Center" Width="300" Margin="10 0 0 0">
+
+                                                <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding CCT.ForwardFileName}" HorizontalContentAlignment="Center"></TextBox>
+                                                <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
+                                                    <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
+                                                        <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
+                                                            <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
+                                                            <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
+                                                        </StackPanel>
+                                                    </Button>
+                                                    <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportForwardDataCommand}">
+                                                        <StackPanel Orientation="Horizontal">
+                                                            <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
+                                                            <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
+                                                        </StackPanel>
+                                                    </Button>
+                                                </UniformGrid>
+                                            </StackPanel>
+                                        </StackPanel>
+                                    </Grid>
+                                </StackPanel>
+                            </Grid>
+
                             <Border DockPanel.Dock="Top" Background="#E9FFFFFF" Margin="20 0" Padding="5" CornerRadius="5">
                                 <Border.Effect>
                                     <DropShadowEffect Opacity="0.4" />
-- 
cgit v1.3.1


From b2e41ba5213c6a7f08cf8bcb2e4e2654aa6a6224 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 11 Jul 2019 14:01:43 +0300
Subject: Refactored CCT to single CCT per RML.

---
 .../ViewModels/MainViewVM.cs                       |  45 +---
 .../Views/MainView.xaml                            |   2 +-
 .../ViewModels/CctsViewVM.cs                       |   8 +-
 .../ViewModels/MainViewVM.cs                       |   4 +-
 .../ViewModels/MainViewVM.cs                       |  70 ++++++-
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     |   2 +-
 .../Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs |   2 +-
 .../Printing/DefaultPrintingManager.cs             |   2 +-
 .../Visual_Studio/Tango.BL/Builders/RmlBuilder.cs  |  16 +-
 .../Tango.BL/Builders/RmlsCollectionBuilder.cs     |  19 +-
 Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs  |  28 +--
 Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs  |   8 +
 .../Visual_Studio/Tango.BL/Entities/CctBase.cs     | 226 ++++-----------------
 .../Visual_Studio/Tango.BL/Entities/RmlBase.cs     |  59 ++++--
 .../Tango.BL/Enumerations/ColorCatalogsItems.cs    |   6 +
 .../Tango.BL/ObservablesContextAdapter.cs          |  10 -
 .../Tango.ColorConversion/DefaultColorConverter.cs |   4 +-
 Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs  |  17 +-
 Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs  |   5 +-
 .../Tango.DAL.Remote/DB/RemoteADO.edmx             |  83 ++++----
 .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram     | 148 +++++++-------
 .../DefaultGradientGenerationConfiguration.cs      |   2 +-
 .../Tango.Integration/Operation/MachineOperator.cs |  10 +-
 23 files changed, 336 insertions(+), 440 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
index a106ea184..94fa36e57 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
@@ -248,12 +248,8 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
 
         public RelayCommand ImportForwardDataCommand { get; set; }
 
-        public RelayCommand ImportInverseDataCommand { get; set; }
-
         public RelayCommand ExportForwardDataCommand { get; set; }
 
-        public RelayCommand ExportInverseDataCommand { get; set; }
-
         public RelayCommand SaveCommand { get; set; }
 
         #endregion
@@ -274,10 +270,8 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             SourceColor.ColorChanged += SourceColor_ColorChanged;
 
             ImportForwardDataCommand = new RelayCommand(ImportForwardData, () => SelectedRML != null && IsFree);
-            ImportInverseDataCommand = new RelayCommand(ImportInverseData, () => SelectedRML != null && IsFree);
 
-            ExportForwardDataCommand = new RelayCommand(ExportForwardData, () => SelectedRML != null && CCT != null && CCT.ForwardFileName != null && IsFree);
-            ExportInverseDataCommand = new RelayCommand(ExportInverseData, () => SelectedRML != null && CCT != null && CCT.InverseFileName != null && IsFree);
+            ExportForwardDataCommand = new RelayCommand(ExportForwardData, () => SelectedRML != null && CCT != null && CCT.FileName != null && IsFree);
 
             SaveCommand = new RelayCommand(Save, () => SelectedRML != null && IsFree);
         }
@@ -336,13 +330,13 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             {
                 try
                 {
-                    if (LiquidsCalibrationData == null || CCT.ForwardData == null) return;
+                    if (LiquidsCalibrationData == null || CCT.Data == null) return;
 
                     ConversionInput input = new ConversionInput();
                     input.ColorSpace = SourceColor.IsLab ? PMR.ColorLab.ColorSpace.Lab : PMR.ColorLab.ColorSpace.Rgb;
                     input.DeltaChroma = DeltaChroma;
                     input.DeltaL = DeltaL;
-                    input.ForwardData = ByteString.CopyFrom(CCT.ForwardData);
+                    input.ForwardData = ByteString.CopyFrom(CCT.Data);
 
                     input.InputCoordinates = new InputCoordinates();
                     input.InputCoordinates.Red = (int)SourceColor.Red;
@@ -455,36 +449,17 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             String file = GetCCTFileOpen();
             if (file != null)
             {
-                CCT.ForwardFileName = Path.GetFileName(file);
-                CCT.ForwardData = File.ReadAllBytes(file);
-            }
-        }
-
-        private void ImportInverseData()
-        {
-            String file = GetCCTFileOpen();
-            if (file != null)
-            {
-                CCT.InverseFileName = Path.GetFileName(file);
-                CCT.InverseData = File.ReadAllBytes(file);
+                CCT.FileName = Path.GetFileName(file);
+                CCT.Data = File.ReadAllBytes(file);
             }
         }
 
         private void ExportForwardData()
         {
-            String file = GetCCTFileSave(CCT.ForwardFileName);
-            if (file != null)
-            {
-                File.WriteAllBytes(file, CCT.ForwardData);
-            }
-        }
-
-        private void ExportInverseData()
-        {
-            String file = GetCCTFileSave(CCT.InverseFileName);
+            String file = GetCCTFileSave(CCT.FileName);
             if (file != null)
             {
-                File.WriteAllBytes(file, CCT.InverseData);
+                File.WriteAllBytes(file, CCT.Data);
             }
         }
 
@@ -573,7 +548,7 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                 input.ColorSpace = PMR.ColorLab.ColorSpace.Volume;
                 input.DeltaChroma = DeltaChroma;
                 input.DeltaL = DeltaL;
-                input.ForwardData = ByteString.CopyFrom(CCT.ForwardData);
+                input.ForwardData = ByteString.CopyFrom(CCT.Data);
 
                 input.InputCoordinates = new InputCoordinates();
                 input.ThreadL = 92.1815; //SelectedRML.MediaColor.L;
@@ -695,12 +670,12 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                         }
 
                         _isNewCCT = false;
-                        CCT = SelectedRML.Ccts.FirstOrDefault();
+                        CCT = SelectedRML.Cct;
 
                         if (CCT == null)
                         {
                             CCT = new Cct();
-                            CCT.Rml = SelectedRML;
+                            SelectedRML.Cct = CCT;
                             _isNewCCT = true;
                         }
 
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 d78424d4e..888945579 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
@@ -148,7 +148,7 @@
                                     <Image Source="../Images/data-table.png" Height="80" Opacity="0.8"></Image>
                                     <StackPanel VerticalAlignment="Center" Width="300" Margin="10 0 0 0">
 
-                                        <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding CCT.ForwardFileName}" HorizontalContentAlignment="Center"></TextBox>
+                                        <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding CCT.FileName}" HorizontalContentAlignment="Center"></TextBox>
                                         <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
                                             <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
                                                 <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs
index 58ffddbb0..090d54036 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs
@@ -30,8 +30,8 @@ namespace Tango.MachineStudio.DB.ViewModels
             {
                 try
                 {
-                    EditEntity.InverseData = File.ReadAllBytes(file);
-                    EditEntity.InverseFileName = Path.GetFileName(file);
+                    //EditEntity.InverseData = File.ReadAllBytes(file);
+                    //EditEntity.InverseFileName = Path.GetFileName(file);
                 }
                 catch (Exception ex)
                 {
@@ -47,8 +47,8 @@ namespace Tango.MachineStudio.DB.ViewModels
             {
                 try
                 {
-                    EditEntity.ForwardData = File.ReadAllBytes(file);
-                    EditEntity.ForwardFileName = Path.GetFileName(file);
+                    //EditEntity.ForwardData = File.ReadAllBytes(file);
+                    //EditEntity.ForwardFileName = Path.GetFileName(file);
                 }
                 catch (Exception ex)
                 {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index a865cdc8f..ac5354a74 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1537,9 +1537,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 LogManager.Log("Invalidating liquid factors, process parameters and process group history...");
 
-                _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().Build();
+                _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML.Guid).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().Build();
 
-                if (_selectedRML.Ccts.Count == 0)
+                if (_selectedRML.Cct == null)
                 {
                     InvokeUI(() =>
                     {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index ebcfe72fd..7218ef5ea 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -119,7 +120,6 @@ namespace Tango.MachineStudio.RML.ViewModels
             set { _activeProcessParametersTableView = value; RaisePropertyChangedAuto(); }
         }
 
-
         /// <summary>
         /// Gets or sets the manage RML command.
         /// </summary>
@@ -135,6 +135,10 @@ namespace Tango.MachineStudio.RML.ViewModels
         /// </summary>
         public RelayCommand RemoveRmlCommand { get; set; }
 
+        public RelayCommand ImportForwardDataCommand { get; set; }
+
+        public RelayCommand ExportForwardDataCommand { get; set; }
+
         public RelayCommand AddProcessParametersTableCommand { get; set; }
 
         public RelayCommand<ProcessParametersTable> RemoveProcessParametersTableCommand { get; set; }
@@ -165,6 +169,10 @@ namespace Tango.MachineStudio.RML.ViewModels
             RemoveLiquidFactorCommand = new RelayCommand<LiquidTypesRml>(RemoveLiquidFactor, () => IsFree);
             CreateCalibrationDataExcelTemplateCommand = new RelayCommand(CreateCalibrationDataExcelTemplate);
             SaveCommand = new RelayCommand(Save, () => IsFree);
+
+            ImportForwardDataCommand = new RelayCommand(ImportForwardData, () => ActiveRML != null && IsFree);
+
+            ExportForwardDataCommand = new RelayCommand(ExportForwardData, () => ActiveRML != null && ActiveRML.Cct != null && IsFree);
         }
 
         public override void OnApplicationReady()
@@ -199,6 +207,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                     .Set(guid)
                     .WithActiveParametersGroup()
                     .WithLiquidFactors()
+                    .WithCCT()
                     .BuildAsync();
 
                 if (ActiveRML.ProcessParametersTablesGroups.ToList().Count == 0)
@@ -251,6 +260,8 @@ namespace Tango.MachineStudio.RML.ViewModels
 
                 View.NavigateTo(RmlNavigationView.RmlView);
 
+                InvalidateRelayCommands();
+
                 IsFree = true;
             }
         }
@@ -491,5 +502,62 @@ namespace Tango.MachineStudio.RML.ViewModels
             View.NavigateTo(RmlNavigationView.RmlsView);
             LoadRmls();
         }
+
+        #region Import / Export Color Conversion Data
+
+        private void ImportForwardData()
+        {
+            String file = GetCCTFileOpen();
+            if (file != null)
+            {
+                if (ActiveRML.Cct == null)
+                {
+                    Cct cct = new Cct();
+                    ActiveRML.Cct = cct;
+                }
+
+                ActiveRML.Cct.FileName = Path.GetFileName(file);
+                ActiveRML.Cct.Data = File.ReadAllBytes(file);
+            }
+        }
+
+        private void ExportForwardData()
+        {
+            String file = GetCCTFileSave(ActiveRML.Cct.FileName);
+            if (file != null)
+            {
+                File.WriteAllBytes(file, ActiveRML.Cct.Data);
+            }
+        }
+
+        private String GetCCTFileOpen()
+        {
+            OpenFileDialog dlg = new OpenFileDialog();
+            dlg.Title = "Select color adjustment file";
+            dlg.Filter = "Color Conversion Table|*.cct";
+            if (dlg.ShowDialogCenter())
+            {
+                return dlg.FileName;
+            }
+
+            return null;
+        }
+
+        private String GetCCTFileSave(String fileName)
+        {
+            SaveFileDialog dlg = new SaveFileDialog();
+            dlg.Title = "Select color adjustment file";
+            dlg.Filter = "Color Conversion Table|*.cct";
+            dlg.FileName = fileName;
+            dlg.DefaultExt = ".cct";
+            if (dlg.ShowDialogCenter())
+            {
+                return dlg.FileName;
+            }
+
+            return null;
+        }
+
+        #endregion
     }
 }
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 e43c20c3d..962e59291 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
@@ -148,7 +148,7 @@
                                             <Image Source="../Images/data-table.png" Height="80" Opacity="0.8"></Image>
                                             <StackPanel VerticalAlignment="Center" Width="300" Margin="10 0 0 0">
 
-                                                <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding CCT.ForwardFileName}" HorizontalContentAlignment="Center"></TextBox>
+                                                <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding ActiveRML.Cct.FileName}" HorizontalContentAlignment="Center"></TextBox>
                                                 <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
                                                     <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
                                                         <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index 08a5e1168..8b596a45f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -1188,7 +1188,7 @@ namespace Tango.PPC.Jobs.ViewModels
             {
                 Thread.Sleep(500);
 
-                if (Job != null && Job.Rml.Ccts.Count > 0 && IsVisible && (Job.ColorSpace != null && (Job.ColorSpace.Code == BL.Enumerations.ColorSpaces.RGB.ToInt32() || Job.ColorSpace.Code == BL.Enumerations.ColorSpaces.LAB.ToInt32())))
+                if (Job != null && Job.Rml.Cct != null && IsVisible && (Job.ColorSpace != null && (Job.ColorSpace.Code == BL.Enumerations.ColorSpaces.RGB.ToInt32() || Job.ColorSpace.Code == BL.Enumerations.ColorSpaces.LAB.ToInt32())))
                 {
                     var brushStops = Job.Segments.SelectMany(x => x.BrushStops).Where(x => !x.Corrected && !x.OutOfGamutChecked).ToList();
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
index a0734ffb8..f9615199a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
@@ -258,7 +258,7 @@ namespace Tango.PPC.UI.Printing
             {
                 throw new InvalidOperationException("Error starting job. Please select a catalog color.");
             }
-            if (job.Rml.Ccts.Count == 0)
+            if (job.Rml.Cct == null)
             {
                 throw new InvalidOperationException($"Error starting job. No color table found for thread '{job.Rml.Name}'.");
             }
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs
index dd40ceedc..ec777e599 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs
@@ -27,6 +27,14 @@ namespace Tango.BL.Builders
                 Include(x => x.FiberSynth);
         }
 
+        public virtual RmlBuilder WithCCT()
+        {
+            return AddQueryStep(1, (query) =>
+            {
+                return query.Include(x => x.Cct);
+            });
+        }
+
         public virtual RmlBuilder WithAllParametersGroup()
         {
             return AddStep(1, () =>
@@ -49,14 +57,6 @@ namespace Tango.BL.Builders
             });
         }
 
-        public virtual RmlBuilder WithCCT()
-        {
-            return AddStep(3, () =>
-            {
-                Context.Ccts.FirstOrDefault(x => x.RmlGuid == Entity.Guid);
-            });
-        }
-
         public virtual RmlBuilder WithCAT(String machineGuid)
         {
             return AddStep(4, () =>
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs
index fa0056259..055f02474 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs
@@ -14,6 +14,14 @@ namespace Tango.BL.Builders
         {
         }
 
+        public virtual RmlsCollectionBuilder WithCCT()
+        {
+            return AddQueryStep(1, (query) =>
+            {
+                return query.Include(x => x.Cct);
+            });
+        }
+
         public virtual RmlsCollectionBuilder WithAllParametersGroup()
         {
             return AddStep(1, () =>
@@ -41,17 +49,6 @@ namespace Tango.BL.Builders
             });
         }
 
-        public virtual RmlsCollectionBuilder WithCCT()
-        {
-            return AddStep(3, () =>
-            {
-                foreach (var rml in Entities.ToList())
-                {
-                    Context.Ccts.FirstOrDefault(x => x.RmlGuid == rml.Guid);
-                }
-            });
-        }
-
         public virtual RmlsCollectionBuilder WithCAT(String machineGuid)
         {
             return AddStep(4, () =>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs
index b0529dd3d..1205a857e 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs
@@ -38,33 +38,9 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
-        /// forward file name
+        /// file name
         /// </summary>
-        public String ForwardFileName 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// inverse file name
-        /// </summary>
-        public String InverseFileName 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// version
-        /// </summary>
-        public Double Version 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// rml guid
-        /// </summary>
-        public String RmlGuid 
+        public String FileName 
         {
             get; set; 
         }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
index fe29999ab..537d731bc 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
@@ -205,5 +205,13 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// cct guid
+        /// </summary>
+        public String CctGuid 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs
index 2eacd5057..70cdedadd 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs
@@ -29,17 +29,11 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> DescriptionChanged;
 
-        public event EventHandler<String> ForwardFileNameChanged;
+        public event EventHandler<String> FileNameChanged;
 
-        public event EventHandler<String> InverseFileNameChanged;
+        public event EventHandler<Byte[]> DataChanged;
 
-        public event EventHandler<Byte[]> ForwardDataChanged;
-
-        public event EventHandler<Byte[]> InverseDataChanged;
-
-        public event EventHandler<Double> VersionChanged;
-
-        public event EventHandler<Rml> RmlChanged;
+        public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged;
 
         protected String _name;
 
@@ -95,194 +89,80 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected String _forwardfilename;
-
-        /// <summary>
-        /// Gets or sets the cctbase forward file name.
-        /// </summary>
-
-        [Column("FORWARD_FILE_NAME")]
-
-        public  String ForwardFileName
-        {
-            get 
-            {
-                return _forwardfilename; 
-            }
-
-            set 
-            {
-                if (_forwardfilename != value)
-                {
-                    _forwardfilename = value;
-
-                    OnForwardFileNameChanged(value);
-
-                }
-            }
-        }
-
-        protected String _inversefilename;
-
-        /// <summary>
-        /// Gets or sets the cctbase inverse file name.
-        /// </summary>
-
-        [Column("INVERSE_FILE_NAME")]
-
-        public  String InverseFileName
-        {
-            get 
-            {
-                return _inversefilename; 
-            }
-
-            set 
-            {
-                if (_inversefilename != value)
-                {
-                    _inversefilename = value;
-
-                    OnInverseFileNameChanged(value);
-
-                }
-            }
-        }
-
-        protected Byte[] _forwarddata;
-
-        /// <summary>
-        /// Gets or sets the cctbase forward data.
-        /// </summary>
-
-        [Column("FORWARD_DATA")]
-
-        public  Byte[] ForwardData
-        {
-            get 
-            {
-                return _forwarddata; 
-            }
-
-            set 
-            {
-                if (_forwarddata != value)
-                {
-                    _forwarddata = value;
-
-                    OnForwardDataChanged(value);
-
-                }
-            }
-        }
-
-        protected Byte[] _inversedata;
+        protected String _filename;
 
         /// <summary>
-        /// Gets or sets the cctbase inverse data.
+        /// Gets or sets the cctbase file name.
         /// </summary>
 
-        [Column("INVERSE_DATA")]
+        [Column("FILE_NAME")]
 
-        public  Byte[] InverseData
+        public  String FileName
         {
             get 
             {
-                return _inversedata; 
+                return _filename; 
             }
 
             set 
             {
-                if (_inversedata != value)
+                if (_filename != value)
                 {
-                    _inversedata = value;
+                    _filename = value;
 
-                    OnInverseDataChanged(value);
+                    OnFileNameChanged(value);
 
                 }
             }
         }
 
-        protected Double _version;
+        protected Byte[] _data;
 
         /// <summary>
-        /// Gets or sets the cctbase version.
+        /// Gets or sets the cctbase data.
         /// </summary>
 
-        [Column("VERSION")]
+        [Column("DATA")]
 
-        public  Double Version
+        public  Byte[] Data
         {
             get 
             {
-                return _version; 
+                return _data; 
             }
 
             set 
             {
-                if (_version != value)
+                if (_data != value)
                 {
-                    _version = value;
-
-                    OnVersionChanged(value);
-
-                }
-            }
-        }
-
-        protected String _rmlguid;
-
-        /// <summary>
-        /// Gets or sets the cctbase rml guid.
-        /// </summary>
-
-        [Column("RML_GUID")]
-        [ForeignKey("Rml")]
-
-        public  String RmlGuid
-        {
-            get 
-            {
-                return _rmlguid; 
-            }
+                    _data = value;
 
-            set 
-            {
-                if (_rmlguid != value)
-                {
-                    _rmlguid = value;
+                    OnDataChanged(value);
 
                 }
             }
         }
 
-        protected Rml _rml;
+        protected SynchronizedObservableCollection<Rml> _rmls;
 
         /// <summary>
-        /// Gets or sets the cctbase rml.
+        /// Gets or sets the cctbase rmls.
         /// </summary>
 
-        [XmlIgnore]
-        [JsonIgnore]
-        public virtual Rml Rml
+        public virtual SynchronizedObservableCollection<Rml> Rmls
         {
             get 
             {
-                return _rml; 
+                return _rmls; 
             }
 
             set 
             {
-                if (_rml != value)
+                if (_rmls != value)
                 {
-                    _rml = value;
+                    _rmls = value;
 
-                    if (Rml != null)
-                    {
-                        RmlGuid = Rml.Guid;
-                    }
-
-                    OnRmlChanged(value);
+                    OnRmlsChanged(value);
 
                 }
             }
@@ -307,57 +187,30 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
-        /// Called when the ForwardFileName has changed.
-        /// </summary>
-        protected virtual void OnForwardFileNameChanged(String forwardfilename)
-        {
-            ForwardFileNameChanged?.Invoke(this, forwardfilename);
-            RaisePropertyChanged(nameof(ForwardFileName));
-        }
-
-        /// <summary>
-        /// Called when the InverseFileName has changed.
+        /// Called when the FileName has changed.
         /// </summary>
-        protected virtual void OnInverseFileNameChanged(String inversefilename)
+        protected virtual void OnFileNameChanged(String filename)
         {
-            InverseFileNameChanged?.Invoke(this, inversefilename);
-            RaisePropertyChanged(nameof(InverseFileName));
+            FileNameChanged?.Invoke(this, filename);
+            RaisePropertyChanged(nameof(FileName));
         }
 
         /// <summary>
-        /// Called when the ForwardData has changed.
+        /// Called when the Data has changed.
         /// </summary>
-        protected virtual void OnForwardDataChanged(Byte[] forwarddata)
+        protected virtual void OnDataChanged(Byte[] data)
         {
-            ForwardDataChanged?.Invoke(this, forwarddata);
-            RaisePropertyChanged(nameof(ForwardData));
+            DataChanged?.Invoke(this, data);
+            RaisePropertyChanged(nameof(Data));
         }
 
         /// <summary>
-        /// Called when the InverseData has changed.
+        /// Called when the Rmls has changed.
         /// </summary>
-        protected virtual void OnInverseDataChanged(Byte[] inversedata)
+        protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls)
         {
-            InverseDataChanged?.Invoke(this, inversedata);
-            RaisePropertyChanged(nameof(InverseData));
-        }
-
-        /// <summary>
-        /// Called when the Version has changed.
-        /// </summary>
-        protected virtual void OnVersionChanged(Double version)
-        {
-            VersionChanged?.Invoke(this, version);
-            RaisePropertyChanged(nameof(Version));
-        }
-
-        /// <summary>
-        /// Called when the Rml has changed.
-        /// </summary>
-        protected virtual void OnRmlChanged(Rml rml)
-        {
-            RmlChanged?.Invoke(this, rml);
-            RaisePropertyChanged(nameof(Rml));
+            RmlsChanged?.Invoke(this, rmls);
+            RaisePropertyChanged(nameof(Rmls));
         }
 
         /// <summary>
@@ -365,6 +218,9 @@ namespace Tango.BL.Entities
         /// </summary>
         public CctBase() : base()
         {
+
+            Rmls = new SynchronizedObservableCollection<Rml>();
+
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
index 6ec36b87f..bc97a2618 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
@@ -63,7 +63,7 @@ namespace Tango.BL.Entities
 
         public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged;
 
-        public event EventHandler<SynchronizedObservableCollection<Cct>> CctsChanged;
+        public event EventHandler<Cct> CctChanged;
 
         public event EventHandler<SynchronizedObservableCollection<ColorCatalogsItemsRecipe>> ColorCatalogsItemsRecipesChanged;
 
@@ -729,6 +729,32 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected String _cctguid;
+
+        /// <summary>
+        /// Gets or sets the rmlbase cct guid.
+        /// </summary>
+
+        [Column("CCT_GUID")]
+        [ForeignKey("Cct")]
+
+        public  String CctGuid
+        {
+            get 
+            {
+                return _cctguid; 
+            }
+
+            set 
+            {
+                if (_cctguid != value)
+                {
+                    _cctguid = value;
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<Cat> _cats;
 
         /// <summary>
@@ -754,26 +780,33 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected SynchronizedObservableCollection<Cct> _ccts;
+        protected Cct _cct;
 
         /// <summary>
-        /// Gets or sets the rmlbase ccts.
+        /// Gets or sets the rmlbase cct.
         /// </summary>
 
-        public virtual SynchronizedObservableCollection<Cct> Ccts
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual Cct Cct
         {
             get 
             {
-                return _ccts; 
+                return _cct; 
             }
 
             set 
             {
-                if (_ccts != value)
+                if (_cct != value)
                 {
-                    _ccts = value;
+                    _cct = value;
+
+                    if (Cct != null)
+                    {
+                        CctGuid = Cct.Guid;
+                    }
 
-                    OnCctsChanged(value);
+                    OnCctChanged(value);
 
                 }
             }
@@ -1268,12 +1301,12 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
-        /// Called when the Ccts has changed.
+        /// Called when the Cct has changed.
         /// </summary>
-        protected virtual void OnCctsChanged(SynchronizedObservableCollection<Cct> ccts)
+        protected virtual void OnCctChanged(Cct cct)
         {
-            CctsChanged?.Invoke(this, ccts);
-            RaisePropertyChanged(nameof(Ccts));
+            CctChanged?.Invoke(this, cct);
+            RaisePropertyChanged(nameof(Cct));
         }
 
         /// <summary>
@@ -1383,8 +1416,6 @@ namespace Tango.BL.Entities
 
             Cats = new SynchronizedObservableCollection<Cat>();
 
-            Ccts = new SynchronizedObservableCollection<Cct>();
-
             ColorCatalogsItemsRecipes = new SynchronizedObservableCollection<ColorCatalogsItemsRecipe>();
 
             Jobs = new SynchronizedObservableCollection<Job>();
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/ColorCatalogsItems.cs b/Software/Visual_Studio/Tango.BL/Enumerations/ColorCatalogsItems.cs
index 5fae7e974..85cd43b54 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/ColorCatalogsItems.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/ColorCatalogsItems.cs
@@ -613,6 +613,12 @@ namespace Tango.BL.Enumerations
         [Description("Green58")]
         Green58 = 198,
 
+        /// <summary>
+        /// (Roy Color)
+        /// </summary>
+        [Description("Roy Color")]
+        RoyColor = 0,
+
         /// <summary>
         /// (Blue56)
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContextAdapter.cs b/Software/Visual_Studio/Tango.BL/ObservablesContextAdapter.cs
index cb9f63938..ec13b0a10 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContextAdapter.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContextAdapter.cs
@@ -121,16 +121,6 @@ namespace Tango.BL
             return groups;
         }
 
-        /// <summary>
-        /// Gets the RML CCTS.
-        /// </summary>
-        /// <param name="rmlGuid">The RML unique identifier.</param>
-        /// <returns></returns>
-        public ObservableCollection<Cct> GetRmlCCTs(String rmlGuid)
-        {
-            return _db.Ccts.Where(x => x.RmlGuid == rmlGuid).ToObservableCollection();
-        }
-
         /// <summary>
         /// Gets the RML CATS.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
index cccdc5dca..f6fe9c74e 100644
--- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
+++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
@@ -68,7 +68,7 @@ namespace Tango.ColorConversion
                 throw new ArgumentNullException("Specified RML is a null reference.");
             }
 
-            if (rml.Ccts == null || rml.Ccts.Count == 0)
+            if (rml.Cct == null)
             {
                 throw new InvalidOperationException($"No CCT found for RML {rml.Name}. Could not create a conversion input.");
             }
@@ -114,7 +114,7 @@ namespace Tango.ColorConversion
             conversionInput.ThreadA = rml.WhitePointA;
             conversionInput.ThreadB = rml.WhitePointB;
 
-            conversionInput.ForwardData = ByteString.CopyFrom(rml.Ccts.FirstOrDefault().ForwardData);
+            conversionInput.ForwardData = ByteString.CopyFrom(rml.Cct.Data);
 
             foreach (var processTable in rml.ProcessParametersTablesGroups.First(x => x.Active).ProcessParametersTables)
             {
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs
index 87c657d50..ac9b95885 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs
@@ -14,18 +14,21 @@ namespace Tango.DAL.Remote.DB
     
     public partial class CCT
     {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public CCT()
+        {
+            this.RMLS = new HashSet<RML>();
+        }
+    
         public int ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public string NAME { get; set; }
         public string DESCRIPTION { get; set; }
-        public string FORWARD_FILE_NAME { get; set; }
-        public string INVERSE_FILE_NAME { get; set; }
-        public byte[] FORWARD_DATA { get; set; }
-        public byte[] INVERSE_DATA { get; set; }
-        public double VERSION { get; set; }
-        public string RML_GUID { get; set; }
+        public string FILE_NAME { get; set; }
+        public byte[] DATA { get; set; }
     
-        public virtual RML RML { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML> RMLS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
index 1270e7774..478dffa73 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
@@ -18,7 +18,6 @@ namespace Tango.DAL.Remote.DB
         public RML()
         {
             this.CATS = new HashSet<CAT>();
-            this.CCTS = new HashSet<CCT>();
             this.COLOR_CATALOGS_ITEMS_RECIPES = new HashSet<COLOR_CATALOGS_ITEMS_RECIPES>();
             this.JOBS = new HashSet<JOB>();
             this.LIQUID_TYPES_RMLS = new HashSet<LIQUID_TYPES_RMLS>();
@@ -53,11 +52,11 @@ namespace Tango.DAL.Remote.DB
         public double ESTIMATED_THREAD_DIAMETER { get; set; }
         public int RANK { get; set; }
         public byte[] THUMBNAIL { get; set; }
+        public string CCT_GUID { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<CAT> CATS { get; set; }
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<CCT> CCTS { get; set; }
+        public virtual CCT CCT { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<COLOR_CATALOGS_ITEMS_RECIPES> COLOR_CATALOGS_ITEMS_RECIPES { get; set; }
         public virtual FIBER_SHAPES FIBER_SHAPES { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index f1ab52353..2739abd99 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -122,12 +122,8 @@
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="100" />
           <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="200" />
-          <Property Name="FORWARD_FILE_NAME" Type="nvarchar" MaxLength="100" />
-          <Property Name="INVERSE_FILE_NAME" Type="nvarchar" MaxLength="100" />
-          <Property Name="FORWARD_DATA" Type="image" />
-          <Property Name="INVERSE_DATA" Type="image" />
-          <Property Name="VERSION" Type="float" Nullable="false" />
-          <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="FILE_NAME" Type="nvarchar" MaxLength="100" />
+          <Property Name="DATA" Type="image" />
         </EntityType>
         <EntityType Name="COLOR_CATALOGS">
           <Key>
@@ -867,6 +863,7 @@
           <Property Name="ESTIMATED_THREAD_DIAMETER" Type="float" Nullable="false" />
           <Property Name="RANK" Type="int" Nullable="false" />
           <Property Name="THUMBNAIL" Type="image" />
+          <Property Name="CCT_GUID" Type="varchar" MaxLength="36" />
         </EntityType>
         <EntityType Name="ROLES">
           <Key>
@@ -1163,20 +1160,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_CCTS_RMLS">
-          <End Role="RMLS" Type="Self.RMLS" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Role="CCTS" Type="Self.CCTS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="RMLS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="CCTS">
-              <PropertyRef Name="RML_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_COLOR_CATALOGS_GROUPS_COLOR_CATALOGS">
           <End Role="COLOR_CATALOGS" Type="Self.COLOR_CATALOGS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -1965,6 +1948,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RMLS_CCTS">
+          <End Role="CCTS" Type="Self.CCTS" Multiplicity="0..1" />
+          <End Role="RMLS" Type="Self.RMLS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="CCTS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RMLS">
+              <PropertyRef Name="CCT_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_ROLES_PERMISSIONS_PERMISSIONS">
           <End Role="PERMISSIONS" Type="Self.PERMISSIONS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -2218,10 +2213,6 @@
             <End Role="RMLS" EntitySet="RMLS" />
             <End Role="CATS" EntitySet="CATS" />
           </AssociationSet>
-          <AssociationSet Name="FK_CCTS_RMLS" Association="Self.FK_CCTS_RMLS">
-            <End Role="RMLS" EntitySet="RMLS" />
-            <End Role="CCTS" EntitySet="CCTS" />
-          </AssociationSet>
           <AssociationSet Name="FK_COLOR_CATALOGS_GROUPS_COLOR_CATALOGS" Association="Self.FK_COLOR_CATALOGS_GROUPS_COLOR_CATALOGS">
             <End Role="COLOR_CATALOGS" EntitySet="COLOR_CATALOGS" />
             <End Role="COLOR_CATALOGS_GROUPS" EntitySet="COLOR_CATALOGS_GROUPS" />
@@ -2466,6 +2457,10 @@
             <End Role="MEDIA_PURPOSES" EntitySet="MEDIA_PURPOSES" />
             <End Role="RMLS" EntitySet="RMLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RMLS_CCTS" Association="Self.FK_RMLS_CCTS">
+            <End Role="CCTS" EntitySet="CCTS" />
+            <End Role="RMLS" EntitySet="RMLS" />
+          </AssociationSet>
           <AssociationSet Name="FK_ROLES_PERMISSIONS_PERMISSIONS" Association="Self.FK_ROLES_PERMISSIONS_PERMISSIONS">
             <End Role="PERMISSIONS" EntitySet="PERMISSIONS" />
             <End Role="ROLES_PERMISSIONS" EntitySet="ROLES_PERMISSIONS" />
@@ -2642,9 +2637,9 @@
             <End Role="RML" EntitySet="RMLS" />
             <End Role="CAT" EntitySet="CATS" />
           </AssociationSet>
-          <AssociationSet Name="FK_CCTS_RMLS" Association="RemoteModel.FK_CCTS_RMLS">
-            <End Role="RML" EntitySet="RMLS" />
+          <AssociationSet Name="FK_RMLS_CCTS" Association="RemoteModel.FK_RMLS_CCTS">
             <End Role="CCT" EntitySet="CCTS" />
+            <End Role="RML" EntitySet="RMLS" />
           </AssociationSet>
           <AssociationSet Name="FK_COLOR_CATALOGS_GROUPS_COLOR_CATALOGS" Association="RemoteModel.FK_COLOR_CATALOGS_GROUPS_COLOR_CATALOGS">
             <End Role="COLOR_CATALOGS" EntitySet="COLOR_CATALOGS" />
@@ -3052,13 +3047,9 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="NAME" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
           <Property Name="DESCRIPTION" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
-          <Property Name="FORWARD_FILE_NAME" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
-          <Property Name="INVERSE_FILE_NAME" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
-          <Property Name="FORWARD_DATA" Type="Binary" MaxLength="Max" FixedLength="false" />
-          <Property Name="INVERSE_DATA" Type="Binary" MaxLength="Max" FixedLength="false" />
-          <Property Name="VERSION" Type="Double" Nullable="false" />
-          <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <NavigationProperty Name="RML" Relationship="RemoteModel.FK_CCTS_RMLS" FromRole="CCT" ToRole="RML" />
+          <Property Name="FILE_NAME" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="DATA" Type="Binary" MaxLength="Max" FixedLength="false" />
+          <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RMLS_CCTS" FromRole="CCT" ToRole="RML" />
         </EntityType>
         <EntityType Name="COLOR_CATALOGS">
           <Key>
@@ -3908,8 +3899,9 @@
           <Property Name="ESTIMATED_THREAD_DIAMETER" Type="Double" Nullable="false" />
           <Property Name="RANK" Type="Int32" Nullable="false" />
           <Property Name="THUMBNAIL" Type="Binary" MaxLength="Max" FixedLength="false" />
+          <Property Name="CCT_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_RMLS" FromRole="RML" ToRole="CAT" />
-          <NavigationProperty Name="CCTS" Relationship="RemoteModel.FK_CCTS_RMLS" FromRole="RML" ToRole="CCT" />
+          <NavigationProperty Name="CCT" Relationship="RemoteModel.FK_RMLS_CCTS" FromRole="RML" ToRole="CCT" />
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS_RECIPES" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_RMLS" FromRole="RML" ToRole="COLOR_CATALOGS_ITEMS_RECIPES" />
           <NavigationProperty Name="FIBER_SHAPES" Relationship="RemoteModel.FK_RML_FIBER_SHAPES" FromRole="RML" ToRole="FIBER_SHAPES" />
           <NavigationProperty Name="FIBER_SYNTHS" Relationship="RemoteModel.FK_RML_FIBER_SYNTHESIS" FromRole="RML" ToRole="FIBER_SYNTHS" />
@@ -4307,17 +4299,15 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_CCTS_RMLS">
-          <End Type="RemoteModel.RML" Role="RML" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Type="RemoteModel.CCT" Role="CCT" Multiplicity="*" />
+        <Association Name="FK_RMLS_CCTS">
+          <End Type="RemoteModel.CCT" Role="CCT" Multiplicity="0..1" />
+          <End Type="RemoteModel.RML" Role="RML" Multiplicity="*" />
           <ReferentialConstraint>
-            <Principal Role="RML">
+            <Principal Role="CCT">
               <PropertyRef Name="GUID" />
             </Principal>
-            <Dependent Role="CCT">
-              <PropertyRef Name="RML_GUID" />
+            <Dependent Role="RML">
+              <PropertyRef Name="CCT_GUID" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
@@ -5322,12 +5312,8 @@
           <EntitySetMapping Name="CCTS">
             <EntityTypeMapping TypeName="RemoteModel.CCT">
               <MappingFragment StoreEntitySet="CCTS">
-                <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
-                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
-                <ScalarProperty Name="INVERSE_DATA" ColumnName="INVERSE_DATA" />
-                <ScalarProperty Name="FORWARD_DATA" ColumnName="FORWARD_DATA" />
-                <ScalarProperty Name="INVERSE_FILE_NAME" ColumnName="INVERSE_FILE_NAME" />
-                <ScalarProperty Name="FORWARD_FILE_NAME" ColumnName="FORWARD_FILE_NAME" />
+                <ScalarProperty Name="DATA" ColumnName="DATA" />
+                <ScalarProperty Name="FILE_NAME" ColumnName="FILE_NAME" />
                 <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
@@ -6094,6 +6080,7 @@
           <EntitySetMapping Name="RMLS">
             <EntityTypeMapping TypeName="RemoteModel.RML">
               <MappingFragment StoreEntitySet="RMLS">
+                <ScalarProperty Name="CCT_GUID" ColumnName="CCT_GUID" />
                 <ScalarProperty Name="THUMBNAIL" ColumnName="THUMBNAIL" />
                 <ScalarProperty Name="RANK" ColumnName="RANK" />
                 <ScalarProperty Name="ESTIMATED_THREAD_DIAMETER" ColumnName="ESTIMATED_THREAD_DIAMETER" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index aea8eff7d..ad55214ff 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,79 +5,79 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="6.75" PointY="65.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="44.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="41.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="49.875" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="14.75" PointY="29.375" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9" PointY="72.5" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="19.125" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="57.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="7.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="12.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="11.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="21" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="43.125" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="46.75" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="6.75" PointY="61.75" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="8" PointY="31" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="10.5" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="47" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="14.25" PointY="11" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="20.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="32.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.75" PointY="79.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12" PointY="53" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="37.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="9" PointY="53.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="6.75" PointY="70.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9" PointY="57.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.75" PointY="65.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="15" PointY="51" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="9.75" PointY="68.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="12" PointY="45.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="83.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12" PointY="57.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="52.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="12.75" PointY="61.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="15" PointY="47.25" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9" PointY="6.25" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="11.25" PointY="37.25" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="12.5" PointY="28.5" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="10.25" PointY="27" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="29.5" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="16" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="10.25" PointY="23.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="16.5" PointY="25.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="37.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="13.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="16.5" PointY="16" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="17.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="26.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="23.625" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9" PointY="75.5" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="9" PointY="63.875" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="14.25" PointY="2.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="23.75" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="25.375" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="20.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="14.25" PointY="6.875" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.5" PointY="6.875" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="12.5" PointY="32.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="14.75" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.5" PointY="16.125" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="17.5" PointY="30.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="4.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="4.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="6.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="3.75" PointY="6.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="5.75" PointY="6.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="14.25" PointY="20.875" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="16.5" PointY="21.875" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="8" PointY="34.125" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="0.75" PointY="7.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="54.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="41.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="51.25" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="18.125" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="38.5" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="22.625" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="35.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="57.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="3.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="22.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="34.125" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="46.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="0.75" PointY="11.125" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="35.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3.75" PointY="63.125" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6" PointY="62.5" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="44" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="8.25" PointY="26.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="15.625" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="18.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="0.75" PointY="65.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3" PointY="52.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="3.75" PointY="66.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6" PointY="47.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="8.75" PointY="61.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="11" PointY="39.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.75" PointY="67.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="10" PointY="45.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.75" PointY="71.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="10" PointY="53.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="0.75" PointY="61.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3" PointY="42.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="47" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="3.75" PointY="57.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6" PointY="43.375" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6" PointY="35.125" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="39.5" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.5" PointY="24.5" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="19.5" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="29.375" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="30.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="26.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="10.5" PointY="10.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3" PointY="37.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="13" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="10.5" PointY="14.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="32.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="26.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="23.125" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="59.375" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3" PointY="9.125" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="11.25" PointY="2.625" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="52" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="53.625" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.75" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="11.25" PointY="6.5" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.5" PointY="6.625" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="30" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="7.5" PointY="15.625" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="5.75" PointY="2.5" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="13.5" PointY="28.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="5.75" PointY="5.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="7.75" PointY="2.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="7.75" PointY="5.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="12.75" PointY="14.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="13.75" PointY="2.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="14.75" PointY="14.5" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="9.5" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="13.5" PointY="10.625" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="32.5" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" />
@@ -90,7 +90,7 @@
         <AssociationConnector Association="RemoteModel.FK_CATS_LIQUID_TYPES1" />
         <AssociationConnector Association="RemoteModel.FK_CATS_MACHINES" />
         <AssociationConnector Association="RemoteModel.FK_CATS_RMLS" />
-        <AssociationConnector Association="RemoteModel.FK_CCTS_RMLS" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_CCTS" />
         <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_GROUPS_COLOR_CATALOGS" />
         <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_ITEMS_COLOR_CATALOGS_GROUPS" />
         <AssociationConnector Association="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_COLOR_CATALOGS_ITEMS" />
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs b/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs
index c44114c94..9f716846b 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs
@@ -169,7 +169,7 @@ namespace Tango.Integration.Operation
 
             var cmykCollection = brushStopsCollection.Select(x => GetCMYK(x)).ToList();
 
-            var stop = cmykCollection.SingleOrDefault(f => f.OffsetPercent == offset);
+            var stop = cmykCollection.FirstOrDefault(f => f.OffsetPercent == offset);
             if (stop != null) return stop;
 
             CMYK before = cmykCollection.Where(w => w.OffsetPercent == cmykCollection.Min(m => m.OffsetPercent)).First();
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index bfc31fc40..ad59ed234 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1316,6 +1316,11 @@ namespace Tango.Integration.Operation
                 RunningJob = null;
                 RunningJobStatus = null;
 
+                if (job.NumberOfUnits < 1)
+                {
+                    job.NumberOfUnits = 1;
+                }
+
                 var originalJob = job;
                 var clonedJob = job.Clone();
                 clonedJob.Guid = job.Guid;
@@ -1324,11 +1329,6 @@ namespace Tango.Integration.Operation
 
                 JobRequest request = new JobRequest();
 
-                if (job.NumberOfUnits < 1)
-                {
-                    job.NumberOfUnits = 1;
-                }
-
                 job = job.Clone();
                 job.Guid = originalJob.Guid;
 
-- 
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.RML')

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


From d045a47ad7363e62b763013fa6afcdb1762a7ce3 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 11 Aug 2019 16:48:35 +0300
Subject: Machine Studio : added configuration for  dark /light theme

---
 .../Views/DispenserView.xaml                       |   2 +-
 .../Views/DispensersView.xaml                      |   2 +-
 .../Views/CatalogsView.xaml                        |   2 +-
 .../Views/MainView.xaml                            |  12 +-
 .../Views/CalibrationDataView.xaml                 |  11 +-
 .../Views/MainView.xaml                            |  38 +--
 .../Views/DBViews/AddressesView.xaml               |   2 +-
 .../ApplicationDisplayPanelVersionsView.xaml       |   2 +-
 .../DBViews/ApplicationFirmwareVersionsView.xaml   |   2 +-
 .../Views/DBViews/ApplicationOsVersionsView.xaml   |   2 +-
 .../Views/DBViews/CartridgeTypesView.xaml          |   2 +-
 .../Views/DBViews/CatsView.xaml                    |   2 +-
 .../Views/DBViews/CctsView.xaml                    |   2 +-
 .../Views/DBViews/ConfigurationsView.xaml          |   2 +-
 .../Views/DBViews/ContactsView.xaml                |   2 +-
 .../Views/DBViews/DispenserTypesView.xaml          |   2 +-
 .../DBViews/EmbeddedFirmwareVersionsView.xaml      |   2 +-
 .../Views/DBViews/FiberShapesView.xaml             |   2 +-
 .../Views/DBViews/FiberSynthsView.xaml             |   2 +-
 .../Views/DBViews/HardwareDancerTypesView.xaml     |   2 +-
 .../Views/DBViews/HardwareMotorTypesView.xaml      |   2 +-
 .../Views/DBViews/HardwarePidControlTypesView.xaml |   2 +-
 .../Views/DBViews/HardwareVersionsView.xaml        |   2 +-
 .../Views/DBViews/IdsPackFormulasView.xaml         |   2 +-
 .../Views/DBViews/IdsPacksView.xaml                |   2 +-
 .../Views/DBViews/LinearMassDensityUnitsView.xaml  |   2 +-
 .../Views/DBViews/LiquidTypesRmlsView.xaml         |   2 +-
 .../Views/DBViews/LiquidTypesView.xaml             |   2 +-
 .../Views/DBViews/MachineVersionsView.xaml         |   2 +-
 .../Views/DBViews/MachinesView.xaml                |   2 +-
 .../Views/DBViews/MediaConditionsView.xaml         |   2 +-
 .../Views/DBViews/MediaMaterialsView.xaml          |   2 +-
 .../Views/DBViews/MediaPurposesView.xaml           |   2 +-
 .../Views/DBViews/MidTankTypesView.xaml            |   2 +-
 .../Views/DBViews/OrganizationsView.xaml           |   2 +-
 .../Views/DBViews/PermissionsView.xaml             |   2 +-
 .../DBViews/ProcessParametersTablesGroupsView.xaml |   2 +-
 .../Views/DBViews/ProcessParametersTablesView.xaml |   2 +-
 .../Views/DBViews/RmlsView.xaml                    |   2 +-
 .../Views/DBViews/RolesView.xaml                   |   2 +-
 .../Views/DBViews/SpoolTypesView.xaml              |   2 +-
 .../Views/DBViews/UsersView.xaml                   |   2 +-
 .../Views/MainView.xaml                            |  10 +-
 .../Views/JobView.xaml                             | 102 ++++---
 .../Views/MainView.xaml                            |   4 +-
 .../Views/RunningJobView.xaml                      |   4 +-
 .../Views/MainView.xaml                            |  32 +--
 ...go.MachineStudio.Logging_wuxohuiz_wpftmp.csproj | 276 +++++++++++++++++++
 .../Views/ApplicationLogDetailsView.xaml           |   6 +-
 .../Views/ApplicationLogsView.xaml                 |  10 +-
 .../Views/EmbeddedLogDetailsView.xaml              |   4 +-
 .../Views/EmbeddedLogsView.xaml                    |  10 +-
 .../Views/EventDetailsView.xaml                    |   6 +-
 .../Views/EventsView.xaml                          |  27 +-
 .../Views/HomeView.xaml                            |  14 +-
 .../Views/TimelineView.xaml                        | 200 +++++++-------
 .../Views/ConfigurationView.xaml                   |  64 ++---
 .../Views/MachineSettingsView.xaml                 |  14 +-
 .../Views/MachinesView.xaml                        |   2 +-
 .../Views/SpoolsView.xaml                          |   2 +-
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     |  26 +-
 .../Tango.MachineStudio.RML/Views/RmlsView.xaml    |   2 +-
 .../Views/MainView.xaml                            |  37 ++-
 .../Tango.MachineStudio.Stubs/Views/MainView.xaml  |   2 +-
 .../PropertiesTemplates/JobRunnerTemplate.xaml     |   6 +-
 .../PropertiesTemplates/MultiGraphTemplate.xaml    |   4 +-
 .../PropertiesTemplates/SingleGraphTemplate.xaml   |   4 +-
 .../Views/ImportProjectTabView.xaml                |   2 +-
 .../Views/MachineTechView.xaml                     |  62 ++---
 .../Views/OrganizationManagementView.xaml          |   8 +-
 .../Views/OrganizationSelectionView.xaml           |   2 +-
 .../Views/UserManagementView.xaml                  |  57 ++--
 .../Controls/HiveComboControl.xaml                 |   2 +-
 .../Controls/MachineView.xaml                      |  12 +-
 .../MachineStudioSettings.cs                       |   6 +
 .../MachineStudioTheme.cs                          |  14 +
 .../Resources/MaterialDesign.xaml                  |  17 +-
 .../Resources/SharedResourceDictionary.cs          |   6 +
 .../Tango.MachineStudio.Common.csproj              |   5 +
 .../Themes/DarkThemeColors.xaml                    | 301 +++++++++++++++++++++
 .../Themes/LightThemeColors.xaml                   |  93 +++++--
 .../MachineStudio/Tango.MachineStudio.UI/App.xaml  |   1 +
 .../Tango.MachineStudio.UI/App.xaml.cs             |   6 +-
 .../Tango.MachineStudio.UI/MainWindow.xaml         |   2 +-
 .../Notifications/DialogWindow.xaml                |   4 +-
 .../Notifications/MessageBoxWindow.xaml            |   6 +-
 .../Notifications/TextInputBoxWindow.xaml          |   6 +-
 .../ViewModels/MainViewVM.cs                       |  18 ++
 .../Tango.MachineStudio.UI/Views/AboutView.xaml    |  10 +-
 .../Views/ConnectedMachineView.xaml                |   2 +-
 .../Views/ConnectionLostView.xaml                  |   4 +-
 .../Views/FirmwareUpgradeView.xaml                 |   8 +-
 .../Tango.MachineStudio.UI/Views/LoadingView.xaml  |   2 +-
 .../Views/MachineConnectionView.xaml               |   4 +-
 .../Views/MachineLoginView.xaml                    |   2 +-
 .../Views/MachineSerialView.xaml                   |   4 +-
 .../Tango.MachineStudio.UI/Views/MainView.xaml     |  44 +--
 .../Tango.MachineStudio.UI/Views/MainView.xaml.cs  |   5 +
 .../Views/ReportIssueView.xaml                     |  10 +-
 .../Views/ResolvedIssuesView.xaml                  |   6 +-
 .../Windows/ExceptionWindow.xaml                   |   2 +-
 .../Windows/ModuleWindow.xaml                      |   6 +-
 .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest    |   2 +-
 .../Themes/MaterialDesignTheme.ToggleButton.xaml   |   5 +-
 104 files changed, 1229 insertions(+), 524 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging_wuxohuiz_wpftmp.csproj
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioTheme.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml
index 0b295b620..977ab865a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml
@@ -45,7 +45,7 @@
                     <ColumnDefinition Width="237*"/>
                 </Grid.ColumnDefinitions>
 
-                <Border Margin="100 140" CornerRadius="5" Background="#68F6F6F6" Padding="10" BorderBrush="Silver" BorderThickness="1">
+                <Border Margin="100 140" CornerRadius="5" Background="{StaticResource TransparentBackgroundBrush600}" Padding="10" BorderBrush="Silver" BorderThickness="1">
                     <controls:TableGrid RowHeight="50" Margin="10">
                         <TextBlock FontWeight="SemiBold">Serial Number:</TextBlock>
                         <TextBox Text="{Binding ActiveDispenser.SerialNumber}"></TextBox>
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 0943d76bf..7caca4b40 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
@@ -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="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" 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="{StaticResource borderBrush}" 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 343131e83..221afe568 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
@@ -47,7 +47,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 Catalogs}" SelectedItem="{Binding SelectedCatalog}">
+                <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 Catalogs}" SelectedItem="{Binding SelectedCatalog}">
                     <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.ColorCapture/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
index 0ff36e86a..f4bb09caa 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="{Binding Color, Source={StaticResource LightGrayBrush100}}" />
-            <SolidColorBrush x:Key="Background" Color="{Binding Color, Source={StaticResource DarkGrayBrush200}}" />
+            <SolidColorBrush x:Key="Foreground" Color="#BBBBBB" />
+            <SolidColorBrush x:Key="Background" Color="#202020" />
             <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}}" />
+            <SolidColorBrush x:Key="LightBackground" Color="#303030" />
 
             <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
             <localConverters:CaptureModeToVisibilityConverter x:Key="CaptureModeToVisibilityConverter" />
@@ -492,17 +492,17 @@
                                         <UniformGrid  Columns="3" Margin="20 0 70 0">
                                             <DockPanel>
                                                 <TextBlock FontWeight="SemiBold">L:</TextBlock>
-                                                <mahapps:NumericUpDown  BorderBrush="{StaticResource BorderBrush}" MinWidth="120" HorizontalContentAlignment="Left" Value="{Binding MeasureL,UpdateSourceTrigger=PropertyChanged}" Minimum="0" Maximum="100" Margin="5 0 0 0" HasDecimals="True" HideUpDownButtons="True" Background="{StaticResource LightBackground}" FontSize="16" Foreground="{StaticResource Accent}" BorderThickness="1" />
+                                                <mahapps:NumericUpDown  BorderBrush="{StaticResource borderBrush}" MinWidth="120" HorizontalContentAlignment="Left" Value="{Binding MeasureL,UpdateSourceTrigger=PropertyChanged}" Minimum="0" Maximum="100" Margin="5 0 0 0" HasDecimals="True" HideUpDownButtons="True" Background="{StaticResource LightBackground}" FontSize="16" Foreground="{StaticResource Accent}" BorderThickness="1" />
                                             </DockPanel>
 
                                             <DockPanel>
                                                 <TextBlock Margin="20 0 0 0" FontWeight="SemiBold">A:</TextBlock>
-                                                <mahapps:NumericUpDown BorderBrush="{StaticResource BorderBrush}" MinWidth="120" HorizontalContentAlignment="Left" Value="{Binding MeasureA,UpdateSourceTrigger=PropertyChanged}" Minimum="-127" Maximum="128" Margin="5 0 0 0" HasDecimals="True" HideUpDownButtons="True" Background="{StaticResource LightBackground}" FontSize="16" Foreground="{StaticResource Accent}" BorderThickness="1" />
+                                                <mahapps:NumericUpDown BorderBrush="{StaticResource borderBrush}" MinWidth="120" HorizontalContentAlignment="Left" Value="{Binding MeasureA,UpdateSourceTrigger=PropertyChanged}" Minimum="-127" Maximum="128" Margin="5 0 0 0" HasDecimals="True" HideUpDownButtons="True" Background="{StaticResource LightBackground}" FontSize="16" Foreground="{StaticResource Accent}" BorderThickness="1" />
                                             </DockPanel>
 
                                             <DockPanel>
                                                 <TextBlock Margin="20 0 0 0" FontWeight="SemiBold">B:</TextBlock>
-                                                <mahapps:NumericUpDown BorderBrush="{StaticResource BorderBrush}" MinWidth="120" HorizontalContentAlignment="Left" Value="{Binding MeasureB,UpdateSourceTrigger=PropertyChanged}" Minimum="-127" Maximum="128" Margin="5 0 0 0" HasDecimals="True" HideUpDownButtons="True" Background="{StaticResource LightBackground}" FontSize="16" Foreground="{StaticResource Accent}" BorderThickness="1" />
+                                                <mahapps:NumericUpDown BorderBrush="{StaticResource borderBrush}" MinWidth="120" HorizontalContentAlignment="Left" Value="{Binding MeasureB,UpdateSourceTrigger=PropertyChanged}" Minimum="-127" Maximum="128" Margin="5 0 0 0" HasDecimals="True" HideUpDownButtons="True" Background="{StaticResource LightBackground}" FontSize="16" Foreground="{StaticResource Accent}" BorderThickness="1" />
                                             </DockPanel>
                                         </UniformGrid>
                                     </DockPanel>
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 172e08ff5..022b0db44 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
@@ -34,31 +34,32 @@
 
                             <StackPanel DockPanel.Dock="Right" VerticalAlignment="Bottom" HorizontalAlignment="Right" Orientation="Horizontal" Margin="0 0 5 0">
                                 <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Import from excel" Width="30" Command="{Binding RelativeSource={RelativeSource AncestorType=local:CalibrationDataView},Path=DataContext.ImportExcelCommand}" CommandParameter="{Binding}">
-                                    <materialDesign:PackIcon Kind="Download" Foreground="Black" />
+                                    <materialDesign:PackIcon Kind="Download" Foreground="{StaticResource BlackForegroundBrush}" />
                                 </Button>
                                 <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Export to excel" Width="30" Command="{Binding RelativeSource={RelativeSource AncestorType=local:CalibrationDataView},Path=DataContext.ExportExcelCommand}" CommandParameter="{Binding}">
-                                    <materialDesign:PackIcon Kind="Upload" Foreground="Black" />
+                                    <materialDesign:PackIcon Kind="Upload" Foreground="{StaticResource BlackForegroundBrush}" />
                                 </Button>
                             </StackPanel>
                             <Border Padding="2" Margin="5" CornerRadius="3">
                             <Border.Background>
                                 <SolidColorBrush Opacity="0.4" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
                             </Border.Background>
-                            <TextBlock Text="{Binding LiquidType.Name}" HorizontalAlignment="Center" Foreground="Black"></TextBlock>
+                                <TextBlock Text="{Binding LiquidType.Name}" HorizontalAlignment="Center" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
                         </Border>
                         </StackPanel>
 
                         <Grid Margin="0 0 0 5">
-                            <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 Background="{StaticResource TransparentBackgroundBrush400}" AlternatingRowBackground="{StaticResource Transparent200}" 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"/>
                                         <Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
                                         <Setter Property="FlowDirection" Value="RightToLeft"></Setter>
+                                        <Setter Property="Foreground" Value="{StaticResource BlackForegroundBrush}"></Setter>
                                     </Style>
                                 </DataGrid.CellStyle>
                                 <DataGrid.Columns>
-                                    <DataGridTextColumn Header="#" Binding="{Binding Index}" Width="Auto" IsReadOnly="True" Foreground="DimGray" FontSize="11" />
+                                    <DataGridTextColumn Header="#" Binding="{Binding Index}" Width="Auto" IsReadOnly="True" Foreground="{StaticResource DimGrayBrush}" FontSize="11" />
                                     <mahapps:DataGridNumericUpDownColumn Header="X" Binding="{Binding X}" Minimum="0" Maximum="10000" HideUpDownButtons="True" Width="1*"/>
                                     <mahapps:DataGridNumericUpDownColumn Header="Y" Binding="{Binding Y}" Minimum="0" Maximum="10000" HideUpDownButtons="True" Width="1*" />
                                 </DataGrid.Columns>
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 a16b6b4d2..f4fa039dc 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
@@ -50,7 +50,7 @@
         <Grid IsEnabled="{Binding IsFree}">
             <Grid.Style>
                 <Style TargetType="Grid">
-                    <Setter Property="Background" Value="#B1FFFFFF"></Setter>
+                    <Setter Property="Background" Value="{StaticResource TransparentBackgroundBrush400}"></Setter>
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding IsHosted}" Value="True">
                             <Setter Property="Background" Value="Transparent"></Setter>
@@ -71,12 +71,12 @@
                 <StackPanel>
                     <StackPanel Visibility="{Binding IsHosted,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                         <TextBlock Margin="40 20" FontSize="30" FontWeight="SemiBold" FontStyle="Italic">TARGET MACHINE</TextBlock>
-                        <ComboBox ItemsSource="{Binding Machines}" FontSize="20" SelectedItem="{Binding SelectedMachine}" materialDesign:HintAssist.Hint="Serial Number" Margin="40 0 40 0">
+                        <ComboBox ItemsSource="{Binding Machines}" FontSize="20" SelectedItem="{Binding SelectedMachine}" materialDesign:HintAssist.Hint="Serial Number" Margin="40 0 40 0" Background="{StaticResource Combobox.Background}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel>
                                         <TextBlock Text="{Binding SerialNumber}" FontWeight="Bold" FontStyle="Italic"></TextBlock>
-                                        <TextBlock FontSize="11" Text="{Binding Name}" Foreground="Gray"></TextBlock>
+                                        <TextBlock FontSize="11" Text="{Binding Name}" Foreground="{StaticResource GrayBrush}"></TextBlock>
                                     </StackPanel>
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
@@ -86,12 +86,13 @@
                     <commonControls:MachineView Width="500" Margin="0 40 0 0" DataContext="{Binding SelectedMachine}" />
                     <StackPanel Margin="40 40">
                         <TextBlock FontSize="16">MEDIA</TextBlock>
-                        <ComboBox ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" FontSize="16" IsEnabled="{Binding SelectedMachine,Converter={StaticResource NullObjectToBooleanConverter}}">
+                        <ComboBox ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" FontSize="16" IsEnabled="{Binding SelectedMachine,Converter={StaticResource NullObjectToBooleanConverter}}" Background="{StaticResource Combobox.Background}" >
+
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel>
-                                        <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic"></TextBlock>
-                                        <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="Gray"></TextBlock>
+                                        <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
+                                        <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="{StaticResource GrayBrush}"></TextBlock>
                                     </StackPanel>
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
@@ -108,9 +109,9 @@
                             <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 Hexagon.ForegroundBrush}" Text="{Binding LiquidType.Name}"></TextBlock>
                                         <Grid Width="58" Height="48" Margin="0 5 0 0">
-                                            <shapes:Hexagon StrokeThickness="1" Stroke="Gray">
+                                            <shapes:Hexagon StrokeThickness="1" Stroke="{StaticResource GrayBrush}">
                                                 <shapes:Hexagon.Fill>
                                                     <LinearGradientBrush Opacity="0.7" >
                                                         <GradientStop Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
@@ -119,7 +120,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"  BorderThickness="0" Text="{Binding MaxNlPerCm}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontWeight="Bold" FontStyle="Italic" Foreground="{StaticResource Hexagon.ForegroundBrush}"/>
                                         </Grid>
                                     </StackPanel>
                                 </DataTemplate>
@@ -169,7 +170,7 @@
                         </StackPanel>
                     </Grid>
 
-                    <Rectangle VerticalAlignment="Bottom" Stroke="Silver" Visibility="{Binding IsHosted,Converter={StaticResource BooleanToVisibilityInverseConverter}}"></Rectangle>
+                    <Rectangle VerticalAlignment="Bottom" Stroke="{StaticResource borderBrush}" Visibility="{Binding IsHosted,Converter={StaticResource BooleanToVisibilityInverseConverter}}"></Rectangle>
                 </Grid>
 
                 <Grid Grid.Row="1" Margin="0 40 0 0" HorizontalAlignment="Center">
@@ -187,6 +188,11 @@
                             <RowDefinition Height="30" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
+                        <Grid.Resources>
+                            <Style TargetType="TextBlock" >
+                                <Setter Property="Foreground" Value="{StaticResource JobFieldForeground}"/>
+                            </Style>
+                        </Grid.Resources>
 
                         <Grid Grid.Row="1">
 
@@ -294,7 +300,7 @@
 
                             <hive:HexList.ItemTemplate>
                                 <DataTemplate>
-                                    <TextBlock Foreground="White">
+                                    <TextBlock Foreground="{StaticResource WhiteTextBrush}">
                                         <Run Text="{Binding Row}"></Run><Run>,</Run>
                                         <Run Text="{Binding Column}"/>
                                     </TextBlock>
@@ -453,7 +459,7 @@
 
                         <Image Source="../Images/arrow-long-Left.png" Grid.Column="2" Grid.Row="3" Width="140" Stretch="Fill" Height="30" Opacity="0.8"></Image>
 
-                        <Border BorderBrush="Silver" Grid.Row="3">
+                        <Border BorderBrush="{StaticResource borderBrush}" Grid.Row="3">
                             <Grid>
                                 <DockPanel Width="80" HorizontalAlignment="Left">
                                     <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">COMPOSITE</TextBlock>
@@ -510,7 +516,7 @@
 
                                             <Grid>
                                                 <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
-                                                <TextBlock Text="{Binding TargetColor.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                                <TextBlock Text="{Binding TargetColor.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
                                             </Grid>
                                         </DockPanel>
                                         <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
@@ -518,7 +524,7 @@
 
                                             <Grid>
                                                 <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
-                                                <TextBlock Text="{Binding TargetColor.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                                <TextBlock Text="{Binding TargetColor.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
                                             </Grid>
                                         </DockPanel>
                                         <DockPanel Width="50" HorizontalAlignment="Left">
@@ -526,7 +532,7 @@
 
                                             <Grid>
                                                 <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
-                                                <TextBlock Text="{Binding TargetColor.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                                <TextBlock Text="{Binding TargetColor.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
                                             </Grid>
                                         </DockPanel>
                                     </StackPanel>
@@ -537,7 +543,7 @@
                 </Grid>
 
                 <Grid Grid.Row="2" Margin="0 20 0 0">
-                    <Rectangle VerticalAlignment="Top" Stroke="Silver"></Rectangle>
+                    <Rectangle VerticalAlignment="Top" Stroke="{StaticResource borderBrush}"></Rectangle>
                     <DockPanel>
                         <Grid DockPanel.Dock="Top">
                             <TextBlock FontSize="20" Margin="0 20 0 0" TextAlignment="Center">CALIBRATION DATA</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/AddressesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/AddressesView.xaml
index e338f3c0f..402740f82 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/AddressesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/AddressesView.xaml
@@ -7,7 +7,7 @@
              xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.AddressesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.AddressesViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.AddressesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationDisplayPanelVersionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationDisplayPanelVersionsView.xaml
index 704f5f5e2..bc1e948b0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationDisplayPanelVersionsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationDisplayPanelVersionsView.xaml
@@ -7,7 +7,7 @@
              xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.ApplicationDisplayPanelVersionsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.ApplicationDisplayPanelVersionsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.ApplicationDisplayPanelVersionsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationFirmwareVersionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationFirmwareVersionsView.xaml
index a216f4a1f..8fb4976c7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationFirmwareVersionsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationFirmwareVersionsView.xaml
@@ -7,7 +7,7 @@
              xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.ApplicationFirmwareVersionsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.ApplicationFirmwareVersionsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.ApplicationFirmwareVersionsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationOsVersionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationOsVersionsView.xaml
index f53c182c3..fdbcdabc4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationOsVersionsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ApplicationOsVersionsView.xaml
@@ -7,7 +7,7 @@
              xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.ApplicationOsVersionsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.ApplicationOsVersionsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.ApplicationOsVersionsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeTypesView.xaml
index d17f79c8d..b77c31aed 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeTypesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeTypesView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.CartridgeTypesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.CartridgeTypesViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.CartridgeTypesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml
index 6eb693780..1a4cf673a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml
@@ -9,7 +9,7 @@
              xmlns:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.CatsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.CatsViewVM}">
 
     <UserControl.Resources>
         <converters:ByteArrayToFileSizeConverter x:Key="ByteArrayToFileSizeConverter"></converters:ByteArrayToFileSizeConverter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctsView.xaml
index 09962447c..6b80b94fe 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctsView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.CctsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.CctsViewVM}">
 
     <UserControl.Resources>
         <converters:ByteArrayToFileSizeConverter x:Key="ByteArrayToFileSizeConverter"></converters:ByteArrayToFileSizeConverter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ConfigurationsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ConfigurationsView.xaml
index 819dbd1c7..45bb2e776 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ConfigurationsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ConfigurationsView.xaml
@@ -7,7 +7,7 @@
              xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.ConfigurationsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.ConfigurationsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.ConfigurationsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ContactsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ContactsView.xaml
index e05808d83..e54a72a4c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ContactsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ContactsView.xaml
@@ -7,7 +7,7 @@
              xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.ContactsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.ContactsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.ContactsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypesView.xaml
index 040ac5799..12bc16f1e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypesView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.DispenserTypesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.DispenserTypesViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.DispenserTypesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedFirmwareVersionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedFirmwareVersionsView.xaml
index 219230d32..0ff1f8a6b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedFirmwareVersionsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EmbeddedFirmwareVersionsView.xaml
@@ -7,7 +7,7 @@
              xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.EmbeddedFirmwareVersionsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.EmbeddedFirmwareVersionsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.EmbeddedFirmwareVersionsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/FiberShapesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/FiberShapesView.xaml
index f46b5894e..2a22bf929 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/FiberShapesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/FiberShapesView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.FiberShapesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.FiberShapesViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.FiberShapesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/FiberSynthsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/FiberSynthsView.xaml
index bec19add1..28b7a7b1b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/FiberSynthsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/FiberSynthsView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.FiberSynthsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.FiberSynthsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.FiberSynthsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwareDancerTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwareDancerTypesView.xaml
index 93859e74d..c4b8026c6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwareDancerTypesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwareDancerTypesView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.HardwareDancerTypesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.HardwareDancerTypesViewVM}">
 
     <UserControl.Resources>
         <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwareMotorTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwareMotorTypesView.xaml
index 49f7c9232..52af91e8a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwareMotorTypesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwareMotorTypesView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.HardwareMotorTypesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.HardwareMotorTypesViewVM}">
 
     <UserControl.Resources>
         <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwarePidControlTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwarePidControlTypesView.xaml
index 16ae138dc..01f9a444c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwarePidControlTypesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwarePidControlTypesView.xaml
@@ -9,7 +9,7 @@
              xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" d:DataContext="{d:DesignInstance Type=observables:HardwarePidControlType, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.HardwarePidControlTypesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" d:DataContext="{d:DesignInstance Type=observables:HardwarePidControlType, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.HardwarePidControlTypesViewVM}">
 
     <UserControl.Resources>
         <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwareVersionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwareVersionsView.xaml
index 4a60ffcaa..ea6f97171 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwareVersionsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/HardwareVersionsView.xaml
@@ -7,7 +7,7 @@
              xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.HardwareVersionsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.HardwareVersionsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.HardwareVersionsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackFormulasView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackFormulasView.xaml
index 81c9124f3..cc9889d6e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackFormulasView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackFormulasView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.IdsPackFormulasViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.IdsPackFormulasViewVM}">
 
     <UserControl.Resources>
         <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml
index 03ab1d7d4..2ba826a12 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.IdsPacksViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.IdsPacksViewVM}">
 
     <UserControl.Resources>
         <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LinearMassDensityUnitsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LinearMassDensityUnitsView.xaml
index 41d719dad..d25f4eace 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LinearMassDensityUnitsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LinearMassDensityUnitsView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.LinearMassDensityUnitsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.LinearMassDensityUnitsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.LinearMassDensityUnitsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml
index 11f781e5b..2bfa395c8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml
@@ -8,7 +8,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.LiquidTypesRmlViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.LiquidTypesRmlViewVM}">
 
     <Grid>
         <controls:DbTableView>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml
index 4da0a8b59..90040469e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml
@@ -9,7 +9,7 @@
              xmlns:localConverters="clr-namespace:Tango.MachineStudio.DB.Converters"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.LiquidTypesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.LiquidTypesViewVM}">
 
     <UserControl.Resources>
         <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineVersionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineVersionsView.xaml
index be917634a..370171855 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineVersionsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineVersionsView.xaml
@@ -7,7 +7,7 @@
              xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.MachineVersionsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.MachineVersionsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.MachineVersionsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachinesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachinesView.xaml
index c6febd63c..90b24af9a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachinesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachinesView.xaml
@@ -7,7 +7,7 @@
              xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.MachinesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.MachinesViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.MachinesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaConditionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaConditionsView.xaml
index 08f144710..36d441b0e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaConditionsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaConditionsView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.MediaConditionsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.MediaConditionsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.MediaConditionsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaMaterialsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaMaterialsView.xaml
index 7530cf9df..7eae23499 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaMaterialsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaMaterialsView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.MediaMaterialsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.MediaMaterialsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.MediaMaterialsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaPurposesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaPurposesView.xaml
index ee4903f69..ab1c844ea 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaPurposesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaPurposesView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.MediaPurposesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.MediaPurposesViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.MediaPurposesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MidTankTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MidTankTypesView.xaml
index a808b8438..ba027b8ba 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MidTankTypesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MidTankTypesView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.MidTankTypesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.MidTankTypesViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.MidTankTypesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/OrganizationsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/OrganizationsView.xaml
index ff5e7df4a..4ec9f43c9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/OrganizationsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/OrganizationsView.xaml
@@ -8,7 +8,7 @@
              xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-            d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.OrganizationsViewVM}">
+            d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.OrganizationsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.OrganizationsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/PermissionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/PermissionsView.xaml
index 9455fd519..ad8815eeb 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/PermissionsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/PermissionsView.xaml
@@ -7,7 +7,7 @@
              xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.PermissionsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.PermissionsViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.PermissionsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTablesGroupsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTablesGroupsView.xaml
index 0eee2aa77..68f641e44 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTablesGroupsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTablesGroupsView.xaml
@@ -9,7 +9,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.ProcessParametersTablesGroupsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.ProcessParametersTablesGroupsViewVM}">
 
     <UserControl.Resources>
         <sharedConverters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter"></sharedConverters:BooleanToYesNoConverter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTablesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTablesView.xaml
index 0e20ce5af..dedf23a54 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTablesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTablesView.xaml
@@ -9,7 +9,7 @@
              xmlns:localConverters="clr-namespace:Tango.MachineStudio.DB.Converters"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.ProcessParametersTablesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.ProcessParametersTablesViewVM}">
 
     <UserControl.Resources>
         <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter"></converters:BooleanToYesNoConverter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml
index 8cd51ccac..bffe4e3c1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml
@@ -8,7 +8,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.RmlsViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.RmlsViewVM}">
 
     <UserControl.Resources>
         <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter"></converters:BooleanToYesNoConverter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RolesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RolesView.xaml
index 858cfd37b..77da90df7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RolesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RolesView.xaml
@@ -7,7 +7,7 @@
              xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters"
              xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.RolesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.RolesViewVM}">
 
     <UserControl.Resources>
         <converters:RolesPermissionsToStringConverter x:Key="RolesPermissionsToStringConverter"></converters:RolesPermissionsToStringConverter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypesView.xaml
index 4ed13cb11..438e80e03 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypesView.xaml
@@ -8,7 +8,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.SpoolTypesViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.SpoolTypesViewVM}">
     <Grid>
         <controls:DbTableView>
             <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.SpoolTypesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/UsersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/UsersView.xaml
index ad3814185..6d4cf4d23 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/UsersView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/UsersView.xaml
@@ -8,7 +8,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.UsersViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}" DataContext="{x:Static global:ViewModelLocator.UsersViewVM}">
 
     <UserControl.Resources>
         <converters:UsersRolesToStringConverter x:Key="UsersRolesToStringConverter"></converters:UsersRolesToStringConverter>
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 7fc9034cd..de4acd68f 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
@@ -14,7 +14,7 @@
              xmlns:global="clr-namespace:Tango.MachineStudio.DataCapture"
              xmlns:local="clr-namespace:Tango.MachineStudio.DataCapture.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920" Background="White" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="{StaticResource MainWindow.Background}" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
 
     <UserControl.Resources>
         <converters:StringEllipsisConverter x:Key="StringEllipsisConverter" />
@@ -36,10 +36,10 @@
                     <Grid DockPanel.Dock="Top">
                         <StackPanel Orientation="Horizontal" Margin="0 0 0 10">
                             <Image Source="../Images/recordings.png" Width="42"></Image>
-                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" Foreground="DimGray" FontSize="16" FontWeight="SemiBold">RECORDINGS</TextBlock>
+                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" Foreground="{StaticResource DimGrayBrush}" FontSize="16" FontWeight="SemiBold">RECORDINGS</TextBlock>
                         </StackPanel>
 
-                        <Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeDashArray="5 5 5 5"></Rectangle>
+                        <Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeDashArray="5 5 5 5"></Rectangle>
                     </Grid>
 
                     <Grid Margin="0 10 0 0">
@@ -69,7 +69,7 @@
                     </Grid>
                 </DockPanel>
 
-                <Rectangle HorizontalAlignment="Right" VerticalAlignment="Stretch" Stroke="Gainsboro" StrokeDashArray="5 5 5 5" Margin="0 50 0 50"></Rectangle>
+                <Rectangle HorizontalAlignment="Right" VerticalAlignment="Stretch" Stroke="{StaticResource BorderBrushGainsboro}" StrokeDashArray="5 5 5 5" Margin="0 50 0 50"></Rectangle>
             </Grid>
 
             <Grid Grid.Column="1" Margin="10">
@@ -177,7 +177,7 @@
                         </ItemsControl>
                     </DockPanel>
 
-                    <Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeDashArray="5 5 5 5"></Rectangle>
+                    <Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeDashArray="5 5 5 5"></Rectangle>
                 </Grid>
 
                 <Grid Grid.Row="1">
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 b90aa62b8..54a3b72a9 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
@@ -85,7 +85,7 @@
         </ObjectDataProvider>
 
 
-        <SolidColorBrush x:Key="SideBarBackground" Color="White">
+        <SolidColorBrush x:Key="SideBarBackground" Color="{Binding Path=Color, Source={StaticResource SideBarBackgroundBrush}}">
 
         </SolidColorBrush>
 
@@ -188,7 +188,7 @@
                                                                 <Setter Property="BorderThickness" Value="1"></Setter>
                                                                 <Setter Property="ToolTip">
                                                                     <Setter.Value>
-                                                                        <ToolTip Background="White">
+                                                                        <ToolTip Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}">
                                                                             <ItemsControl ItemsSource="{Binding Coordinates.OutputLiquids}">
                                                                                 <ItemsControl.ItemsPanel>
                                                                                     <ItemsPanelTemplate>
@@ -519,24 +519,13 @@
                                                 <Polygon.Style>
                                                     <Style TargetType="Polygon">
                                                         <Setter Property="Stroke" Value="{StaticResource BlackForegroundBrush}"></Setter>
-                                                        <Setter Property="Fill">
-                                                            <Setter.Value>
-                                                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                                                    <GradientStop Color="#00EEEEEE" Offset="0" />
-                                                                    <GradientStop Color="#FFB5B5B5" Offset="1" />
-                                                                </LinearGradientBrush>
-                                                            </Setter.Value>
+                                                        <Setter Property="Fill" Value="{StaticResource SegmentGradientBrush}">
                                                         </Setter>
                                                         <Style.Triggers>
                                                             <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,FallbackValue=False}" Value="True">
                                                                 <Setter Property="Stroke" Value="{StaticResource BlackForegroundBrush}"></Setter>
-                                                                <Setter Property="Fill">
-                                                                    <Setter.Value>
-                                                                        <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                                                            <GradientStop Color="White" Offset="0" />
-                                                                            <GradientStop Color="{StaticResource AccentColor}" Offset="2" />
-                                                                        </LinearGradientBrush>
-                                                                    </Setter.Value>
+                                                                <Setter Property="Fill" Value="{StaticResource SelectedSegmentGradientBrush}">
+                                                                    
                                                                 </Setter>
                                                             </DataTrigger>
                                                         </Style.Triggers>
@@ -558,12 +547,12 @@
                                                 </Grid.ColumnDefinitions>
 
                                                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                                                    <TextBlock FontWeight="SemiBold">#</TextBlock>
-                                                    <TextBlock FontWeight="SemiBold" Margin="5 0 0 0" Text="{Binding SegmentIndex}"></TextBlock>
+                                                    <TextBlock FontWeight="SemiBold" Foreground="{StaticResource DarkGrayBrush}">#</TextBlock>
+                                                    <TextBlock FontWeight="SemiBold" Margin="5 0 0 0" Text="{Binding SegmentIndex}" Foreground="{StaticResource DarkGrayBrush}"></TextBlock>
                                                 </StackPanel>
 
 
-                                                <TextBox Grid.Column="1" CaretBrush="Transparent" Cursor="Arrow" VerticalAlignment="Center" Width="200" HorizontalContentAlignment="Center" Style="{x:Null}" BorderThickness="0" Background="Transparent" Text="{Binding Name}"></TextBox>
+                                                <TextBox Grid.Column="1" CaretBrush="Transparent" Cursor="Arrow" VerticalAlignment="Center" Width="200" HorizontalContentAlignment="Center" Style="{x:Null}" BorderThickness="0" Background="Transparent" Text="{Binding Name}" Foreground="{StaticResource DarkGrayBrush}"></TextBox>
                                             </Grid>
 
                                         </Grid>
@@ -575,16 +564,16 @@
                         <Rectangle HorizontalAlignment="Right" StrokeThickness="1" Width="3" Margin="0 0 0 0">
                             <Rectangle.Fill>
                                 <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                    <GradientStop Offset="0" Color="#ECECEC" />
-                                    <GradientStop Offset="0.5" Color="Black" />
-                                    <GradientStop Offset="1.1" Color="Black" />
+                                    <GradientStop Offset="0" Color="{Binding Source={StaticResource WhiteBrush100}, Path=Color}" />
+                                    <GradientStop Offset="0.5" Color="{Binding Source={StaticResource BlackForegroundBrush}, Path=Color}" />
+                                    <GradientStop Offset="1.1" Color="{Binding Source={StaticResource BlackForegroundBrush}, Path=Color}" />
                                 </LinearGradientBrush>
                             </Rectangle.Fill>
                             <Rectangle.Stroke>
                                 <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                    <GradientStop Offset="0" Color="White" />
-                                    <GradientStop Offset="0.5" Color="White" />
-                                    <GradientStop Offset="1" Color="White" />
+                                    <GradientStop Offset="0" Color="{Binding Source={StaticResource BorderBrushGainsboro}, Path=Color}" />
+                                    <GradientStop Offset="0.5" Color="{Binding Source={StaticResource BorderBrushGainsboro}, Path=Color}" />
+                                    <GradientStop Offset="1" Color="{Binding Source={StaticResource BorderBrushGainsboro}, Path=Color}" />
                                 </LinearGradientBrush>
                             </Rectangle.Stroke>
                         </Rectangle>
@@ -595,7 +584,12 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition/>
                         </Grid.RowDefinitions>
-
+                        <Grid.Resources>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="Foreground"
+                                        Value="{StaticResource JobFieldForeground}" />
+                            </Style>
+                        </Grid.Resources>
                         <Grid>
                             <StackPanel>
                                 <Grid>
@@ -617,7 +611,7 @@
                                                 <Image Source="../Images/name.png" Width="32"></Image>
                                                 <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Name</TextBlock>
                                             </StackPanel>
-                                            <TextBox Margin="0 3 0 0" Width="100" HorizontalAlignment="Left" Text="{Binding ActiveJob.Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                                            <TextBox Margin="0 3 0 0" Width="100" HorizontalAlignment="Left" Text="{Binding ActiveJob.Name,UpdateSourceTrigger=PropertyChanged}" Foreground="{StaticResource JobFieldForeground}"></TextBox>
                                         </StackPanel>
                                     </Border>
 
@@ -649,8 +643,8 @@
                                                     <DataTemplate>
                                                         <TextBlock TextTrimming="CharacterEllipsis">
                                                             <Run Text="{Binding Name}"></Run>
-                                                            <Run FontSize="9" Foreground="Gray" Text="{Binding Length,Mode=OneWay}"></Run>
-                                                            <Run FontSize="9" Foreground="Gray" Text="m"></Run>
+                                                            <Run FontSize="9" Foreground="{StaticResource GrayBrush}" Text="{Binding Length,Mode=OneWay}"></Run>
+                                                            <Run FontSize="9" Foreground="{StaticResource GrayBrush}" Text="m"></Run>
                                                         </TextBlock>
                                                     </DataTemplate>
                                                 </ComboBox.ItemTemplate>
@@ -700,7 +694,7 @@
                                                 <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Description</TextBlock>
                                             </StackPanel>
 
-                                            <Border BorderThickness="0" BorderBrush="Silver" CornerRadius="5" Margin="0 0 5 5">
+                                            <Border BorderThickness="0" BorderBrush="{StaticResource borderBrush}" CornerRadius="5" Margin="0 0 5 5">
                                                 <TextBox Padding="5 0 0 0" FontStyle="Italic" Background="Transparent" Style="{x:Null}" BorderThickness="0" Margin="5" Height="40" Text="{Binding ActiveJob.Description}" VerticalAlignment="Stretch" materialDesign:HintAssist.Hint="Enter description" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"></TextBox>
                                             </Border>
                                         </StackPanel>
@@ -818,7 +812,7 @@
                                                                                             </shapes:Hexagon.Fill>
                                                                                         </shapes:Hexagon>
 
-                                                                                        <TextBox Style="{x:Null}" Background="Transparent" Foreground="{StaticResource BlackForegroundBrush}" BorderThickness="0" Text="{Binding MaxNlPerCm}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontWeight="Bold" FontStyle="Italic"></TextBox>
+                                                                                        <TextBox Style="{x:Null}" Background="Transparent" Foreground="{StaticResource Hexagon.ForegroundBrush}" BorderThickness="0" Text="{Binding MaxNlPerCm}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontWeight="Bold" FontStyle="Italic"></TextBox>
                                                                                     </Grid>
                                                                                 </StackPanel>
                                                                             </DataTemplate>
@@ -835,7 +829,7 @@
                                                                         <Button  Command="{Binding SaveLiquidFactorsCommand}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
                                                                             <StackPanel Orientation="Horizontal">
                                                                                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Harddisk"></materialDesign:PackIcon>
-                                                                                <TextBlock Margin="10 0 0 0">SAVE FACTORS</TextBlock>
+                                                                                <TextBlock Margin="10 0 0 0" Foreground="{StaticResource CheckmarkFill}">SAVE FACTORS</TextBlock>
                                                                             </StackPanel>
                                                                         </Button>
                                                                     </StackPanel>
@@ -850,19 +844,19 @@
                                                         <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>
+                                                                <TextBlock VerticalAlignment="Center" Foreground="{StaticResource AccentSelectedColorBrush}">Duplicate</TextBlock>
                                                             </StackPanel>
                                                         </Button>
                                                         <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>
+                                                                <TextBlock VerticalAlignment="Center" Foreground="{StaticResource AccentSelectedColorBrush}">Remove</TextBlock>
                                                             </StackPanel>
                                                         </Button>
                                                         <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>
+                                                                <TextBlock VerticalAlignment="Center" Foreground="{StaticResource AccentSelectedColorBrush}">New</TextBlock>
                                                             </StackPanel>
                                                         </Button>
                                                     </StackPanel>
@@ -896,6 +890,26 @@
                                                         </Grid>
                                                         <Grid Margin="0 10 10 0">
                                                             <controls:MultiSelectListBox x:Name="listStops" AutomationProperties.AutomationId="{x:Static automation:Developer.BrushStopsListBox}" SelectionMode="Extended" Style="{x:Null}" Background="Transparent" ScrollViewer.CanContentScroll="False" BorderThickness="0" ItemsSource="{Binding BrushStopsCollectionView}" SelectedItem="{Binding SelectedBrushStop}" SelectedItemsList="{Binding SelectedBrushStops,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
+                                                                <ListBox.Template>
+                                                                    <ControlTemplate TargetType="{x:Type ListBox}">
+                                                                        <Border x:Name="Bd" SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}"
+                                                                                BorderThickness="{TemplateBinding BorderThickness}" Padding="1">
+                                                                            <Grid>
+                                                                                <ScrollViewer Padding="{TemplateBinding Padding}" Focusable="false">
+                                                                                    <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                                                                </ScrollViewer>
+                                                                            </Grid>
+                                                                        </Border>
+                                                                        <ControlTemplate.Triggers>
+                                                                            <Trigger Property="IsEnabled" Value="false">
+                                                                                <Setter Property="Background" TargetName="Bd" Value="Transparent" />
+                                                                            </Trigger>
+                                                                            <Trigger Property="IsGrouping" Value="true">
+                                                                                <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+                                                                            </Trigger>
+                                                                        </ControlTemplate.Triggers>
+                                                                    </ControlTemplate>
+                                                                </ListBox.Template>
                                                                 <ListBox.ItemContainerStyle>
                                                                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource basicListBoxItem}">
                                                                         <EventSetter Event="PreviewMouseDown" Handler="OnBrushStopMouseDown"></EventSetter>
@@ -908,8 +922,8 @@
                                                                             <Border BorderThickness="1" CornerRadius="5" Padding="10" dragAndDrop:DragAndDropService.Drop="OnBrushStopBorderDrop">
                                                                                 <Border.Style>
                                                                                     <Style TargetType="Border" BasedOn="{StaticResource brushStopBorder}">
-                                                                                        <Setter Property="BorderBrush" Value="#B5B5B5"></Setter>
-                                                                                        <Setter Property="Background" Value="#70FFFFFF"></Setter>
+                                                                                        <Setter Property="BorderBrush" Value="{StaticResource LightGrayBrush100}"></Setter>
+                                                                                        <Setter Property="Background" Value="{StaticResource TransparentBackgroundBrush600}"></Setter>
                                                                                         <Style.Triggers>
                                                                                             <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,FallbackValue=False}" Value="True">
                                                                                                 <Setter Property="BorderBrush" Value="Gainsboro"></Setter>
@@ -1236,7 +1250,7 @@
                                 <DockPanel>
                                     <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 FontWeight="Bold" Foreground="{StaticResource BlackForegroundBrush}">ESTIMATED DURATION:</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>
@@ -1329,7 +1343,7 @@
                                                     </materialDesign:PackIcon>
                                                 </StackPanel>
 
-                                                <Border BorderBrush="Gainsboro" BorderThickness="1" VerticalAlignment="Bottom" Height="20" Margin="40 0 50 0">
+                                                <Border BorderBrush="{StaticResource BorderBrushGainsboro}" BorderThickness="1" VerticalAlignment="Bottom" Height="20" Margin="40 0 50 0">
 
                                                 </Border>
                                             </Grid>
@@ -1427,7 +1441,7 @@
                                                         <Border Padding="5" CornerRadius="5" BorderThickness="1" Margin="5">
                                                             <Border.Style>
                                                                 <Style TargetType="Border">
-                                                                    <Setter Property="BorderBrush" Value="Silver"></Setter>
+                                                                    <Setter Property="BorderBrush" Value="{StaticResource borderBrush}"></Setter>
                                                                     <Setter Property="Opacity" Value="0.5"></Setter>
                                                                     <Setter Property="Background" Value="Transparent"></Setter>
                                                                     <Style.Triggers>
@@ -1442,7 +1456,7 @@
                                                             <Grid>
                                                                 <StackPanel>
                                                                     <DockPanel>
-                                                                        <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox>
+                                                                        <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}" Foreground="{StaticResource MainWindow.Foreground}"></TextBox>
                                                                         <WrapPanel Orientation="Vertical" Margin="0 5 0 0">
                                                                             <WrapPanel.Resources>
                                                                                 <Style TargetType="TextBlock">
@@ -1465,7 +1479,7 @@
                                                                                                     <Border>
                                                                                                         <Border.Style>
                                                                                                             <Style TargetType="Border">
-                                                                                                                <Setter Property="BorderBrush" Value="Gainsboro"></Setter>
+                                                                                                                <Setter Property="BorderBrush" Value="{StaticResource BorderBrushGainsboro}"></Setter>
                                                                                                                 <Setter Property="BorderThickness" Value="1"></Setter>
                                                                                                                 <Setter Property="Padding" Value="2"></Setter>
                                                                                                                 <Setter Property="Margin" Value="4"></Setter>
@@ -1495,8 +1509,8 @@
                                                                                         <Grid Background="Transparent" Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessParameterDropped" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=editors:ParameterizedEditor},Path=DraggingSurface}">
                                                                                             <ContentControl>
                                                                                                 <StackPanel>
-                                                                                                    <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11"></TextBlock>
-                                                                                                    <mahapps:NumericUpDown FontSize="20" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                                                                                    <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
+                                                                                                    <mahapps:NumericUpDown FontSize="20" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}" Foreground="{StaticResource MainWindow.Foreground}"></mahapps:NumericUpDown>
                                                                                                 </StackPanel>
                                                                                             </ContentControl>
                                                                                         </Grid>
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 2787d73ef..08ba5b699 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
@@ -43,7 +43,7 @@
         <converters:MathOperatorConverter x:Key="MathOperatorConverter" />
 
 
-        <SolidColorBrush x:Key="SideBarBackground" Color="White">
+        <SolidColorBrush x:Key="SideBarBackground" Color="{Binding Path=Color, Source={StaticResource SideBarBackgroundBrush}}">
 
         </SolidColorBrush>
 
@@ -65,7 +65,7 @@
             </Grid.RowDefinitions>
 
             <StackPanel>
-                <Grid Background="{StaticResource DarkGrayBrush}" TextElement.Foreground="Silver">
+                <Grid Background="#1B1B1B" TextElement.Foreground="Silver">
                     <Grid.Style>
                         <Style TargetType="Grid">
                             <Setter Property="LayoutTransform">
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 3073d0b62..e7f16146b 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
@@ -220,7 +220,7 @@
                                 <Setter Property="ContentTemplate">
                                     <Setter.Value>
                                         <DataTemplate>
-                                            <Border BorderBrush="Gray" BorderThickness="1 0 0 0" Background="White">
+                                            <Border BorderBrush="Gray" BorderThickness="1 0 0 0" Background="{StaticResource WhiteBrush}">
                                                 <Grid>
                                                     <ScrollViewer Padding="20" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
                                                        <controls:JobOutlineControl HorizontalAlignment="Left" DataContext="{Binding JobHandler.JobTicket}" VirtualizingStackPanel.IsVirtualizing="True"/>
@@ -237,7 +237,7 @@
 
             </ContentControl>
 
-            <Border VerticalAlignment="Center" HorizontalAlignment="Left" Background="White" Width="30" Height="120" CornerRadius="10 0 0 10" Margin="-28 0 0 0" BorderBrush="Gray" BorderThickness="1 1 0 1">
+            <Border VerticalAlignment="Center" HorizontalAlignment="Left" Background="{StaticResource WhiteBrush}" Width="30" Height="120" CornerRadius="10 0 0 10" Margin="-28 0 0 0" BorderBrush="Gray" BorderThickness="1 1 0 1">
                 <ToggleButton x:Name="toggleOutline" BorderThickness="0" Cursor="Hand" Background="Transparent">
                     <ToggleButton.Style>
                         <Style TargetType="ToggleButton">
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 71ce6f173..9308fce5a 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
@@ -60,7 +60,7 @@
                                     <ComboBox IsEnabled="{Binding IsFree}" ItemsSource="{Binding HardwareVersions}" SelectedItem="{Binding SelectedVersion}" Width="300" FontSize="16" FontWeight="Bold" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Hardware Version">
                                         <ComboBox.ItemTemplate>
                                             <DataTemplate>
-                                                <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="Gray" FontSize="14">v</Run><Run Foreground="Gray" FontSize="14" Text="{Binding Version}"></Run></TextBlock>
+                                                <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14">v</Run><Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14" Text="{Binding Version}"></Run></TextBlock>
                                             </DataTemplate>
                                         </ComboBox.ItemTemplate>
                                     </ComboBox>
@@ -356,28 +356,28 @@
                     <ScrollViewer IsEnabled="{Binding IsFree}" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Margin="0 90 0 10">
                         <Grid>
                             <StackPanel>
-                                <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}" Padding="20 10">
-                                    <StackPanel>
-                                        <TextBlock Text="HARDWARE VERSION" Foreground="Gray" FontWeight="Bold" FontStyle="Italic" FontSize="16"></TextBlock>
+                                <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource WhiteBackgroundBrush}" Padding="20 10">
+                                    <StackPanel >
+                                        <TextBlock Text="HARDWARE VERSION" Foreground="{StaticResource GrayBrush}" FontWeight="Bold" FontStyle="Italic" FontSize="16"></TextBlock>
 
-                                        <TextBlock Margin="0 10 0 0" FontSize="10" Foreground="Gray">Name</TextBlock>
+                                        <TextBlock Margin="0 10 0 0" FontSize="10" Foreground="{StaticResource GrayBrush}">Name</TextBlock>
                                         <TextBox Text="{Binding CurrentVersion.Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
 
-                                        <TextBlock Margin="0 20 0 0" FontSize="10" Foreground="Gray">Version</TextBlock>
-                                        <mahApps:NumericUpDown Minimum="0" BorderThickness="0 0 0 1" HorizontalContentAlignment="Left" Maximum="1000" HasDecimals="True" Value="{Binding CurrentVersion.Version}" />
+                                        <TextBlock Margin="0 20 0 0" FontSize="10" Foreground="{StaticResource GrayBrush}">Version</TextBlock>
+                                        <mahApps:NumericUpDown Minimum="0" BorderThickness="0 0 0 1" HorizontalContentAlignment="Left" Maximum="1000" HasDecimals="True" Value="{Binding CurrentVersion.Version}" Foreground="{StaticResource GrayBrush}"/>
                                     </StackPanel>
                                 </materialDesign:Card>
 
-                                <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}">
-                                    <StackPanel>
+                                <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource WhiteBackgroundBrush}">
+                                    <StackPanel >
                                         <Grid>
-                                            <Expander HorizontalAlignment="Stretch" IsExpanded="True">
+                                            <Expander HorizontalAlignment="Stretch" IsExpanded="True" Background="{DynamicResource Card.Background}">
                                                 <Expander.Header>
-                                                    <TextBlock FontSize="18" Foreground="#595959" FontWeight="Bold" FontStyle="Italic">
+                                                    <TextBlock FontSize="18" Foreground="{StaticResource MainWindow.Foreground}" FontWeight="Bold" FontStyle="Italic">
                                                         <Run Text="{Binding SelectedHardwareObjectTypeName,Mode=OneWay}"></Run>
                                                     </TextBlock>
                                                 </Expander.Header>
-                                                <StackPanel>
+                                                <StackPanel >
                                                     <editors:ParameterizedEditor ParameterizedObject="{Binding SelectedHardwareObject}" Padding="10">
                                                         <editors:ParameterizedEditor.ItemsPanel>
                                                             <ItemsPanelTemplate>
@@ -388,7 +388,7 @@
                                                             <DataTemplate>
                                                                 <DockPanel>
                                                                     <mahApps:NumericUpDown  DockPanel.Dock="Right" Background="Transparent" BorderThickness="0 0 0 0" Value="{Binding Value,UpdateSourceTrigger=PropertyChanged}" HasDecimals="True" HorizontalContentAlignment="Center" Width="100" />
-                                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
+                                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
                                                                 </DockPanel>
                                                             </DataTemplate>
                                                         </editors:ParameterizedEditor.DoubleTemplate>
@@ -396,15 +396,15 @@
                                                             <DataTemplate>
                                                                 <DockPanel>
                                                                     <mahApps:NumericUpDown  DockPanel.Dock="Right" Background="Transparent" BorderThickness="0 0 0 0" Value="{Binding Value,Converter={StaticResource DoubleToIntConverter},UpdateSourceTrigger=PropertyChanged}" HasDecimals="False" HorizontalContentAlignment="Center" Width="100" />
-                                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
+                                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
                                                                 </DockPanel>
                                                             </DataTemplate>
                                                         </editors:ParameterizedEditor.Int32Template>
                                                         <editors:ParameterizedEditor.BooleanTemplate>
                                                             <DataTemplate>
                                                                 <DockPanel Margin="0 5 0 0">
-                                                                    <ToggleButton DockPanel.Dock="Right"  Width="100" IsChecked="{Binding Value}" HorizontalAlignment="Right" />
-                                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
+                                                                    <ToggleButton DockPanel.Dock="Right"  Width="100" IsChecked="{Binding Value}" HorizontalAlignment="Right"  Foreground="{StaticResource MainWindow.Foreground}"/>
+                                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
                                                                 </DockPanel>
                                                             </DataTemplate>
                                                         </editors:ParameterizedEditor.BooleanTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging_wuxohuiz_wpftmp.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging_wuxohuiz_wpftmp.csproj
new file mode 100644
index 000000000..e1d05fb78
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging_wuxohuiz_wpftmp.csproj
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1674F726-0E66-414F-B9FD-C6F20D7F07C7}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <RootNamespace>Tango.MachineStudio.Logging</RootNamespace>
+    <AssemblyName>Tango.MachineStudio.Logging</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="ControlledObservableCollection.cs" />
+    <Compile Include="Controls\TimelineScrollViewer.cs" />
+    <Compile Include="Controls\TimeRuler.cs" />
+    <Compile Include="Converters\DateIsInListToBooleanConverter.cs" />
+    <Compile Include="Converters\EventsToTimeRulerTicksConverter.cs" />
+    <Compile Include="Converters\LogItemToMessageConverter.cs" />
+    <Compile Include="Converters\MachineEventToXConverter.cs" />
+    <Compile Include="Converters\SecondsToWidthConverter.cs" />
+    <Compile Include="Converters\StringToFirstLineConverter.cs" />
+    <Compile Include="Converters\TimeSpanToXConverter.cs" />
+    <Compile Include="Helpers\TimelineHelper.cs" />
+    <Compile Include="LoggingModule.cs" />
+    <Compile Include="Navigation\LoggingNavigationManager.cs" />
+    <Compile Include="Navigation\LoggingNavigationView.cs" />
+    <Compile Include="ViewModelLocator.cs" />
+    <Compile Include="ViewModels\EmbeddedLogsViewVM.cs" />
+    <Compile Include="ViewModels\ApplicationLogsViewVM.cs" />
+    <Compile Include="ViewModels\EventDetailsViewVM.cs" />
+    <Compile Include="ViewModels\HomeViewVM.cs" />
+    <Compile Include="ViewModels\EventsViewVM.cs" />
+    <Compile Include="ViewModels\LogDetailsViewVM.cs" />
+    <Compile Include="ViewModels\TimelineEventGroup.cs" />
+    <Compile Include="ViewModels\TimelineViewVM.cs" />
+    <Compile Include="Views\EmbeddedLogDetailsView.xaml.cs">
+      <DependentUpon>EmbeddedLogDetailsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\EmbeddedLogsView.xaml.cs">
+      <DependentUpon>EmbeddedLogsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ApplicationLogDetailsView.xaml.cs">
+      <DependentUpon>ApplicationLogDetailsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\EventDetailsView.xaml.cs">
+      <DependentUpon>EventDetailsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ApplicationLogsView.xaml.cs">
+      <DependentUpon>ApplicationLogsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\EventsView.xaml.cs">
+      <DependentUpon>EventsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MainView.xaml.cs">
+      <DependentUpon>MainView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\TimelineView.xaml.cs">
+      <DependentUpon>TimelineView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\TimelineWrapperView.xaml.cs">
+      <DependentUpon>TimelineWrapperView.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\SideChains\Tango.AutoComplete\Tango.AutoComplete.csproj">
+      <Project>{bb2abb74-ba58-4812-83aa-ec8171f42df4}</Project>
+      <Name>Tango.AutoComplete</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
+      <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
+      <Name>Tango.BL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Core\Tango.Core.csproj">
+      <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
+      <Name>Tango.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Integration\Tango.Integration.csproj">
+      <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project>
+      <Name>Tango.Integration</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Logging\Tango.Logging.csproj">
+      <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project>
+      <Name>Tango.Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.PMR\Tango.PMR.csproj">
+      <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project>
+      <Name>Tango.PMR</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Settings\Tango.Settings.csproj">
+      <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project>
+      <Name>Tango.Settings</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.SharedUI\Tango.SharedUI.csproj">
+      <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project>
+      <Name>Tango.SharedUI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Transport\Tango.Transport.csproj">
+      <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project>
+      <Name>Tango.Transport</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Tango.MachineStudio.Common\Tango.MachineStudio.Common.csproj">
+      <Project>{cb0b0aa2-bb24-4bca-a720-45e397684e12}</Project>
+      <Name>Tango.MachineStudio.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
+  <ItemGroup>
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Microsoft.CSharp.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\mscorlib.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\PresentationCore.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\PresentationFramework.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.ComponentModel.DataAnnotations.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Core.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Data.DataSetExtensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Data.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Net.Http.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Xaml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Xml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Xml.Linq.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\SideChains\Tango.AutoComplete\bin\Debug\Tango.AutoComplete.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\Build\Core\Debug\Tango.BL.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\Build\Core\Debug\Tango.Core.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\Build\Core\Debug\Tango.Integration.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\Build\Core\Debug\Tango.Logging.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\Build\Machine Studio\Debug\Tango.MachineStudio.Common.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\Build\Core\Debug\Tango.PMR.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\Build\Core\Debug\Tango.Settings.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\Build\Core\Debug\Tango.SharedUI.dll" />
+    <ReferencePath Include="C:\TFS\Software\Visual_Studio\Build\Core\Debug\Tango.Transport.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\WindowsBase.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Collections.Concurrent.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Collections.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ComponentModel.Annotations.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ComponentModel.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ComponentModel.EventBasedAsync.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Diagnostics.Contracts.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Diagnostics.Debug.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Diagnostics.Tools.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Diagnostics.Tracing.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Dynamic.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Globalization.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.IO.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Linq.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Linq.Expressions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Linq.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Linq.Queryable.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Net.NetworkInformation.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Net.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Net.Requests.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Net.WebHeaderCollection.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ObjectModel.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Emit.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Emit.ILGeneration.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Emit.Lightweight.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Reflection.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Resources.ResourceManager.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.Handles.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.InteropServices.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.InteropServices.WindowsRuntime.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.Numerics.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.Serialization.Json.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.Serialization.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Runtime.Serialization.Xml.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Security.Principal.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Duplex.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Http.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.NetTcp.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Primitives.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.ServiceModel.Security.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Text.Encoding.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Text.Encoding.Extensions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Text.RegularExpressions.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Threading.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Threading.Tasks.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Threading.Tasks.Parallel.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Threading.Timer.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Xml.ReaderWriter.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Xml.XDocument.dll" />
+    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\Facades\System.Xml.XmlSerializer.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="C:\TFS\Software\Visual_Studio\MachineStudio\Modules\Tango.MachineStudio.Logging\obj\Debug\Views\EmbeddedLogDetailsView.g.cs" />
+    <Compile Include="C:\TFS\Software\Visual_Studio\MachineStudio\Modules\Tango.MachineStudio.Logging\obj\Debug\Views\EmbeddedLogsView.g.cs" />
+    <Compile Include="C:\TFS\Software\Visual_Studio\MachineStudio\Modules\Tango.MachineStudio.Logging\obj\Debug\Views\ApplicationLogDetailsView.g.cs" />
+    <Compile Include="C:\TFS\Software\Visual_Studio\MachineStudio\Modules\Tango.MachineStudio.Logging\obj\Debug\Views\EventDetailsView.g.cs" />
+    <Compile Include="C:\TFS\Software\Visual_Studio\MachineStudio\Modules\Tango.MachineStudio.Logging\obj\Debug\Views\ApplicationLogsView.g.cs" />
+    <Compile Include="C:\TFS\Software\Visual_Studio\MachineStudio\Modules\Tango.MachineStudio.Logging\obj\Debug\Views\EventsView.g.cs" />
+    <Compile Include="C:\TFS\Software\Visual_Studio\MachineStudio\Modules\Tango.MachineStudio.Logging\obj\Debug\Views\HomeView.g.cs" />
+    <Compile Include="C:\TFS\Software\Visual_Studio\MachineStudio\Modules\Tango.MachineStudio.Logging\obj\Debug\Views\MainView.g.cs" />
+    <Compile Include="C:\TFS\Software\Visual_Studio\MachineStudio\Modules\Tango.MachineStudio.Logging\obj\Debug\Views\TimelineView.g.cs" />
+    <Compile Include="C:\TFS\Software\Visual_Studio\MachineStudio\Modules\Tango.MachineStudio.Logging\obj\Debug\Views\TimelineWrapperView.g.cs" />
+    <Compile Include="C:\TFS\Software\Visual_Studio\MachineStudio\Modules\Tango.MachineStudio.Logging\obj\Debug\GeneratedInternalTypeHelper.g.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
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 d124ac3a1..27d5b900a 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
@@ -11,7 +11,7 @@
              xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.MachineStudio.Logging.Views"
              mc:Ignorable="d" 
-             Height="500" Width="800" Background="White" d:DataContext="{d:DesignInstance Type=vm:LogDetailsViewVM, IsDesignTimeCreatable=False}">
+             Height="500" Width="800" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:LogDetailsViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <converters:DateTimeUTCToStringConverter x:Key="DateTimeUTCToStringConverter" />
@@ -34,7 +34,7 @@
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding Log.Category}" Value="Info">
                                     <Setter Property="Kind" Value="Information"></Setter>
-                                    <Setter Property="Foreground" Value="DimGray"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource DimGrayBrush}"></Setter>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Log.Category}" Value="Warning">
                                     <Setter Property="Kind" Value="Alert"></Setter>
@@ -72,7 +72,7 @@
                         </controls:TableGrid>
                     </Grid>
 
-                    <Border Padding="5" BorderThickness="1" BorderBrush="Gainsboro">
+                    <Border Padding="5" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}">
                         <TextBox BorderThickness="0" Text="{Binding Log,Converter={StaticResource LogItemToMessageConverter}}" Style="{x:Null}" TextWrapping="Wrap" IsReadOnly="True" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Background="Transparent" />
                     </Border>
                 </DockPanel>
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 28864e93a..4c291d0df 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
@@ -62,13 +62,7 @@
                                 <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
                             </StackPanel>
                         </Button>
-                        <Border Margin="10" Padding="5" BorderBrush="DimGray" BorderThickness="1">
-                            <Border.Background>
-                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                    <GradientStop Color="White"/>
-                                    <GradientStop Color="#FFEAEAEA" Offset="1"/>
-                                </LinearGradientBrush>
-                            </Border.Background>
+                        <Border Margin="10" Padding="5" BorderBrush="DimGray" BorderThickness="1" Background="{StaticResource Logging.Background}">
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon Kind="Calendar" Width="24" Height="24" VerticalAlignment="Bottom" Margin="0 0 0 5" />
                                 <DatePicker x:Name="datePicker" DisplayDateStart="{Binding MinDate}" DisplayDateEnd="{Binding MaxDate}" CalendarStyle="{StaticResource HighlightDatePickerStyle}" SelectedDate="{Binding SelectedDate}" materialDesign:HintAssist.Hint="Pick Date" Margin="10 0 0 5" Width="200" VerticalAlignment="Bottom" FontSize="16">
@@ -130,7 +124,7 @@
                 </Grid>
             </Border>
 
-            <Grid Grid.Row="1" Background="#B3FFFFFF">
+            <Grid Grid.Row="1" Background="{StaticResource TransparentBackgroundBrush400}">
                 <Grid Margin="10">
                     <Grid.ColumnDefinitions>
 
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 4864a55a7..e79fd0ad2 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
@@ -10,7 +10,7 @@
              xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.MachineStudio.Logging.Views"
              mc:Ignorable="d" 
-             Height="500" Width="800" Background="White" d:DataContext="{d:DesignInstance Type=vm:LogDetailsViewVM, IsDesignTimeCreatable=False}">
+             Height="500" Width="800" Background="{StaticResource MainWindow.Background}" d:DataContext="{d:DesignInstance Type=vm:LogDetailsViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <converters:DateTimeUTCToStringConverter x:Key="DateTimeUTCToStringConverter" />
@@ -72,7 +72,7 @@
                         </controls:TableGrid>
                     </Grid>
 
-                    <Border Padding="5" BorderThickness="1" BorderBrush="Gainsboro">
+                    <Border Padding="5" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}">
                         <TextBox BorderThickness="0" Text="{Binding Log.Message}" Style="{x:Null}" TextWrapping="Wrap" IsReadOnly="True" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Background="Transparent" />
                     </Border>
                 </DockPanel>
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 4e5ba43d3..7ec4177bd 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
@@ -62,13 +62,7 @@
                                 <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
                             </StackPanel>
                         </Button>
-                        <Border Margin="10" Padding="5" BorderBrush="DimGray" BorderThickness="1">
-                            <Border.Background>
-                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                    <GradientStop Color="White"/>
-                                    <GradientStop Color="#FFEAEAEA" Offset="1"/>
-                                </LinearGradientBrush>
-                            </Border.Background>
+                        <Border Margin="10" Padding="5" BorderBrush="DimGray" BorderThickness="1" Background="{StaticResource Logging.Background}">
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon Kind="Calendar" Width="24" Height="24" VerticalAlignment="Bottom" Margin="0 0 0 5" />
                                 <DatePicker x:Name="datePicker" DisplayDateStart="{Binding MinDate}" DisplayDateEnd="{Binding MaxDate}" CalendarStyle="{StaticResource HighlightDatePickerStyle}" SelectedDate="{Binding SelectedDate}" materialDesign:HintAssist.Hint="Pick Date" Margin="10 0 0 5" Width="200" VerticalAlignment="Bottom" FontSize="16">
@@ -103,7 +97,7 @@
                 </Grid>
             </Border>
 
-            <Grid Grid.Row="1" Background="#B3FFFFFF">
+            <Grid Grid.Row="1" Background="{StaticResource TransparentBackgroundBrush400}">
                 <Grid Margin="10">
                     <Grid.ColumnDefinitions>
 
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 8e0dc5fd1..d9a806a2a 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
@@ -10,7 +10,7 @@
              xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.MachineStudio.Logging.Views"
              mc:Ignorable="d" 
-             Height="500" Width="800" Background="White" d:DataContext="{d:DesignInstance Type=vm:EventDetailsViewVM, IsDesignTimeCreatable=False}">
+             Height="500" Width="800" Background="{StaticResource MainWindow.Background}" d:DataContext="{d:DesignInstance Type=vm:EventDetailsViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <converters:DateTimeUTCToStringConverter x:Key="DateTimeUTCToStringConverter" />
@@ -32,7 +32,7 @@
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding Event.Category}" Value="Info">
                                     <Setter Property="Kind" Value="Information"></Setter>
-                                    <Setter Property="Foreground" Value="DimGray"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource DimGrayBrush}"></Setter>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Event.Category}" Value="Warning">
                                     <Setter Property="Kind" Value="Alert"></Setter>
@@ -79,7 +79,7 @@
                         </controls:TableGrid>
                     </UniformGrid>
 
-                    <Border Padding="5" BorderThickness="1" BorderBrush="Gainsboro">
+                    <Border Padding="5" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}">
                         <TextBox BorderThickness="0" Text="{Binding Event.Description}" Style="{x:Null}" TextWrapping="Wrap" IsReadOnly="True" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Background="Transparent" />
                     </Border>
                 </DockPanel>
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 5e16461a6..5be54a721 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
@@ -62,24 +62,19 @@
                                 <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
                             </StackPanel>
                         </Button>
-                        
-                        <Border Margin="10" Padding="5" BorderBrush="DimGray" BorderThickness="1">
-                            <Border.Background>
-                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                    <GradientStop Color="White"/>
-                                    <GradientStop Color="#FFEAEAEA" Offset="1"/>
-                                </LinearGradientBrush>
-                            </Border.Background>
+
+                        <Border Margin="10" Padding="5" BorderBrush="DimGray" BorderThickness="1" Background="{StaticResource Logging.Background}">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="../Images/machine-trans.png" RenderOptions.BitmapScalingMode="Fant"></Image>
                                 <StackPanel Orientation="Horizontal" Width="300" Margin="20 0 0 5" VerticalAlignment="Bottom">
                                     <materialDesign:PackIcon Kind="BarcodeScan" VerticalAlignment="Center" Width="24" Height="24" />
-                                    <autoComplete:AutoCompleteTextBox HorizontalContentAlignment="Stretch" Width="300" Margin="10 0 0 0" FontSize="16" Provider="{StaticResource MachinesProvider}" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}" materialDesign:HintAssist.Hint="Serial Number / Name" DisplayMember="SerialNumber">
+                                    <autoComplete:AutoCompleteTextBox HorizontalContentAlignment="Stretch" Width="300" Margin="10 0 0 0" FontSize="16" Provider="{StaticResource MachinesProvider}" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}" materialDesign:HintAssist.Hint="Serial Number / Name" DisplayMember="SerialNumber"
+                                                                      Foreground="{StaticResource MainWindow.Foreground}">
                                         <autoComplete:AutoCompleteTextBox.ItemTemplate>
                                             <DataTemplate>
-                                                <Border Padding="5">
+                                                <Border Padding="5" >
                                                     <DockPanel LastChildFill="False" Width="250">
-                                                        <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
+                                                        <StackPanel Orientation="Horizontal" DockPanel.Dock="Left"  >
                                                             <Image Source="/Images/machine-trans.png" Width="24" RenderOptions.BitmapScalingMode="Fant" />
                                                             <TextBlock Margin="10 0 0 0" FontWeight="SemiBold" Text="{Binding SerialNumber}" VerticalAlignment="Center"></TextBlock>
                                                         </StackPanel>
@@ -92,13 +87,7 @@
                                 </StackPanel>
                             </StackPanel>
                         </Border>
-                        <Border Margin="10" Padding="5" BorderBrush="DimGray" BorderThickness="1">
-                            <Border.Background>
-                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                    <GradientStop Color="White"/>
-                                    <GradientStop Color="#FFEAEAEA" Offset="1"/>
-                                </LinearGradientBrush>
-                            </Border.Background>
+                        <Border Margin="10" Padding="5" BorderBrush="DimGray" BorderThickness="1" Background="{StaticResource Logging.Background}">
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon Kind="Calendar" Width="24" Height="24" VerticalAlignment="Bottom" Margin="0 0 0 5" />
                                 <DatePicker x:Name="datePicker" DisplayDateStart="{Binding MinDate}" DisplayDateEnd="{Binding MaxDate}" CalendarStyle="{StaticResource HighlightDatePickerStyle}" SelectedDate="{Binding SelectedDate}" materialDesign:HintAssist.Hint="Pick Date" Margin="10 0 0 5" Width="200" VerticalAlignment="Bottom" FontSize="16">
@@ -111,7 +100,7 @@
                 </Grid>
             </Border>
 
-            <Grid Grid.Row="1" Background="#B3FFFFFF">
+            <Grid Grid.Row="1" Background="{StaticResource TransparentBackgroundBrush400}">
                 <Grid Margin="10">
                     <Grid.ColumnDefinitions>
 
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 041650d7f..1059a06a7 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
@@ -13,22 +13,14 @@
     <UserControl.Resources>
         <Style TargetType="Border" x:Key="LogBorder">
             <Setter Property="Padding" Value="50"></Setter>
-            <Setter Property="Background">
-                <Setter.Value>
-                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                        <GradientStop Color="#35FFFFFF"/>
-                        <GradientStop Color="White" Offset="1"/>
-
-                    </LinearGradientBrush>
-                </Setter.Value>
-            </Setter>
+            <Setter Property="Background" Value="{DynamicResource LogBorder.Background}"/>
             <Setter Property="CornerRadius" Value="20"></Setter>
             <Setter Property="Width" Value="450"></Setter>
             <Setter Property="Height" Value="400"></Setter>
-            <Setter Property="TextElement.Foreground" Value="{StaticResource DarkGrayBrush}"></Setter>
+            <Setter Property="TextElement.Foreground" Value="{DynamicResource DarkGrayBrush}"></Setter>
             <Setter Property="TextElement.FontSize" Value="25"></Setter>
             <Setter Property="BorderThickness" Value="1"></Setter>
-            <Setter Property="BorderBrush" Value="#D6D6D6"></Setter>
+            <Setter Property="BorderBrush" Value="{DynamicResource LightGrayBrush200}"></Setter>
             <Setter Property="Cursor" Value="Hand"></Setter>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
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 fceed1ce8..9eb099a9e 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
@@ -13,7 +13,7 @@
              xmlns:localControls="clr-namespace:Tango.MachineStudio.Logging.Controls"
              xmlns:local="clr-namespace:Tango.MachineStudio.Logging.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920" Background="White" d:DataContext="{d:DesignInstance Type=vm:TimelineViewVM, IsDesignTimeCreatable=False}" MouseWheel="UserControl_MouseWheel">
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="{StaticResource MainWindow.Background}" d:DataContext="{d:DesignInstance Type=vm:TimelineViewVM, IsDesignTimeCreatable=False}" MouseWheel="UserControl_MouseWheel">
 
     <UserControl.Resources>
         <localConverters:TimeSpanToXConverter x:Key="TimeSpanToXConverter" />
@@ -50,7 +50,7 @@
 
     <Grid>
         <Grid>
-            <Grid Grid.Row="1">
+            <!--<Grid Grid.Row="1">-->
                 <Grid.RowDefinitions>
                     <RowDefinition Height="30"/>
                     <RowDefinition Height="1*"/>
@@ -61,129 +61,129 @@
                 </Grid.ColumnDefinitions>
 
                 <Grid Grid.Column="1" ClipToBounds="True">
-                    <localControls:TimeRuler HorizontalAlignment="Left" FontSize="14" HorizontalOffset="{Binding ElementName=scrollViewer,Path=HorizontalOffset}" Background="White" BorderBrush="{StaticResource AccentColorBrush}" BorderThickness="1" Foreground="{StaticResource AccentColorBrush}" Height="30" x:Name="ruler" Width="{Binding RelativeSource={RelativeSource AncestorType=Grid},Path=ActualWidth}" RenderWidth="{Binding RelativeSource={RelativeSource AncestorType=Grid},Path=ActualWidth}" Zoom="{Binding TimelineScaleFactor}"></localControls:TimeRuler>
+                <localControls:TimeRuler HorizontalAlignment="Left" FontSize="14" HorizontalOffset="{Binding ElementName=scrollViewer,Path=HorizontalOffset}" Background="{StaticResource MainWindow.Background}" BorderBrush="{StaticResource AccentColorBrush}" BorderThickness="1" Foreground="{StaticResource AccentColorBrush}" Height="30" x:Name="ruler" Width="{Binding RelativeSource={RelativeSource AncestorType=Grid},Path=ActualWidth}" RenderWidth="{Binding RelativeSource={RelativeSource AncestorType=Grid},Path=ActualWidth}" Zoom="{Binding TimelineScaleFactor}"></localControls:TimeRuler>
                 </Grid>
 
-                <Grid Background="White">
+            <Grid Background="{StaticResource MainWindow.Background}">
 
                 </Grid>
 
-                <ScrollViewer x:Name="scroll_channels" Grid.Column="0" Grid.Row="1" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
-                    <ItemsControl ItemsSource="{Binding TimelineEventGroups}" Margin="0 0 0 0" Background="#FCFCFC"  VerticalAlignment="Top">
+            <ScrollViewer x:Name="scroll_channels" Grid.Column="0" Grid.Row="1" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                <ItemsControl ItemsSource="{Binding TimelineEventGroups}" Margin="0 0 0 0" Background="#FCFCFC"  VerticalAlignment="Top">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel />
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate DataType="{x:Type vm:TimelineEventGroup}">
+                            <Border BorderThickness="1 0.5 1 0.5" BorderBrush="{StaticResource AccentColorBrush}" Margin="2 0 0 0" Padding="5" Height="{Binding Height,Mode=OneWay}">
+                                <TextBlock Text="{Binding Name}" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="22" TextWrapping="Wrap" TextAlignment="Center" FontWeight="SemiBold" Foreground="{StaticResource AccentColorBrush}"></TextBlock>
+                            </Border>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+
+            <localControls:TimelineScrollViewer x:Name="scrollViewer" Grid.Column="1" Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" ScrollChanged="scrollViewer_ScrollChanged">
+                <Grid HorizontalAlignment="Left">
+                    <ItemsControl ItemsSource="{Binding TimelineEventGroups}" HorizontalAlignment="Left" MinWidth="{Binding RelativeSource={RelativeSource AncestorType=localControls:TimelineScrollViewer},Path=ActualWidth}">
+                        <ItemsControl.Width>
+                            <MultiBinding Converter="{StaticResource TimeSpanToXConverter}" ConverterParameter="300">
+                                <Binding Path="TimelineMaxTime" />
+                                <Binding Path="TimelineScaleFactor" />
+                            </MultiBinding>
+                        </ItemsControl.Width>
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <StackPanel />
+                                <UniformGrid Columns="1" />
                             </ItemsPanelTemplate>
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.ItemTemplate>
                             <DataTemplate DataType="{x:Type vm:TimelineEventGroup}">
-                                <Border BorderThickness="1 0.5 1 0.5" BorderBrush="{StaticResource AccentColorBrush}" Margin="2 0 0 0" Padding="5" Height="{Binding Height,Mode=OneWay}">
-                                    <TextBlock Text="{Binding Name}" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="22" TextWrapping="Wrap" TextAlignment="Center" FontWeight="SemiBold" Foreground="{StaticResource AccentColorBrush}"></TextBlock>
+                                <Border BorderThickness="0 0 0 1" BorderBrush="#98DEFF" Margin="0 0 0 0">
+                                    <ItemsControl ItemsSource="{Binding Events}" SizeChanged="ItemsControl_SizeChanged">
+                                        <ItemsControl.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <StackPanel IsItemsHost="True"></StackPanel>
+                                            </ItemsPanelTemplate>
+                                        </ItemsControl.ItemsPanel>
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate DataType="{x:Type entities:MachinesEvent}">
+                                                <Canvas Margin="0 0 0 0" MinHeight="20">
+                                                    <Grid Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas},Path=ActualHeight}">
+                                                        <Canvas.Left>
+                                                            <MultiBinding Converter="{StaticResource MachineEventToXConverter}">
+                                                                <Binding Path="." />
+                                                                <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.TimelineEventGroups" />
+                                                                <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.TimelineScaleFactor" />
+                                                            </MultiBinding>
+                                                        </Canvas.Left>
+                                                        <Border BorderBrush="#4E4E4E" BorderThickness="1" Padding="2" MinWidth="50" Cursor="Hand">
+                                                            <i:Interaction.Triggers>
+                                                                <i:EventTrigger EventName="PreviewMouseUp">
+                                                                    <i:InvokeCommandAction Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.EventSelectedCommand}" CommandParameter="{Binding}" />
+                                                                </i:EventTrigger>
+                                                            </i:Interaction.Triggers>
+                                                            <Border.Style>
+                                                                <Style TargetType="Border">
+                                                                    <Style.Triggers>
+                                                                        <DataTrigger Binding="{Binding Category}" Value="Info">
+                                                                            <Setter Property="Background" Value="{StaticResource infoBrush}"></Setter>
+                                                                        </DataTrigger>
+                                                                        <DataTrigger Binding="{Binding Category}" Value="Warning">
+                                                                            <Setter Property="Background" Value="{StaticResource warningBrush}"></Setter>
+                                                                        </DataTrigger>
+                                                                        <DataTrigger Binding="{Binding Category}" Value="Error">
+                                                                            <Setter Property="Background" Value="{StaticResource errorBrush}"></Setter>
+                                                                        </DataTrigger>
+                                                                        <DataTrigger Binding="{Binding Category}" Value="Crtitical">
+                                                                            <Setter Property="Background" Value="{StaticResource criticalBrush}"></Setter>
+                                                                        </DataTrigger>
+                                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                                            <Setter Property="Opacity" Value="0.7"></Setter>
+                                                                        </Trigger>
+                                                                    </Style.Triggers>
+                                                                </Style>
+                                                            </Border.Style>
+                                                            <StackPanel Orientation="Horizontal">
+                                                                <TextBlock FontWeight="SemiBold" Text="{Binding EventType.Name}" Height="14" FontSize="11"></TextBlock>
+                                                                <TextBlock Margin="10 0 0 0" Text="{Binding Description,Converter={StaticResource StringToFirstLineConverter}}" Height="14" FontSize="11"></TextBlock>
+                                                            </StackPanel>
+                                                        </Border>
+                                                    </Grid>
+                                                </Canvas>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
                                 </Border>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
-                </ScrollViewer>
 
-                <localControls:TimelineScrollViewer x:Name="scrollViewer" Grid.Column="1" Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" ScrollChanged="scrollViewer_ScrollChanged">
-                    <Grid HorizontalAlignment="Left">
-                        <ItemsControl ItemsSource="{Binding TimelineEventGroups}" HorizontalAlignment="Left" MinWidth="{Binding RelativeSource={RelativeSource AncestorType=localControls:TimelineScrollViewer},Path=ActualWidth}">
-                            <ItemsControl.Width>
-                                <MultiBinding Converter="{StaticResource TimeSpanToXConverter}" ConverterParameter="300">
-                                    <Binding Path="TimelineMaxTime" />
+                    <Canvas Visibility="{Binding EnableTimeMarker,Converter={StaticResource BooleanToVisibilityConverter}}" MinWidth="{Binding RelativeSource={RelativeSource AncestorType=localControls:TimelineScrollViewer},Path=ActualWidth}" ClipToBounds="False" IsHitTestVisible="False">
+                        <Grid Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas},Path=ActualHeight}" ClipToBounds="False">
+                            <Canvas.Left>
+                                <MultiBinding Converter="{StaticResource TimeSpanToXConverter}">
+                                    <Binding Path="CurrentPosition" />
                                     <Binding Path="TimelineScaleFactor" />
                                 </MultiBinding>
-                            </ItemsControl.Width>
-                            <ItemsControl.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <UniformGrid Columns="1" />
-                                </ItemsPanelTemplate>
-                            </ItemsControl.ItemsPanel>
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate DataType="{x:Type vm:TimelineEventGroup}">
-                                    <Border BorderThickness="0 0 0 1" BorderBrush="#98DEFF" Margin="0 0 0 0">
-                                        <ItemsControl ItemsSource="{Binding Events}" SizeChanged="ItemsControl_SizeChanged">
-                                            <ItemsControl.ItemsPanel>
-                                                <ItemsPanelTemplate>
-                                                    <StackPanel IsItemsHost="True"></StackPanel>
-                                                </ItemsPanelTemplate>
-                                            </ItemsControl.ItemsPanel>
-                                            <ItemsControl.ItemTemplate>
-                                                <DataTemplate DataType="{x:Type entities:MachinesEvent}">
-                                                    <Canvas Margin="0 0 0 0" MinHeight="20">
-                                                        <Grid Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas},Path=ActualHeight}">
-                                                            <Canvas.Left>
-                                                                <MultiBinding Converter="{StaticResource MachineEventToXConverter}">
-                                                                    <Binding Path="." />
-                                                                    <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.TimelineEventGroups" />
-                                                                    <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.TimelineScaleFactor" />
-                                                                </MultiBinding>
-                                                            </Canvas.Left>
-                                                            <Border BorderBrush="#4E4E4E" BorderThickness="1" Padding="2" MinWidth="50" Cursor="Hand">
-                                                                <i:Interaction.Triggers>
-                                                                    <i:EventTrigger EventName="PreviewMouseUp">
-                                                                        <i:InvokeCommandAction Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.EventSelectedCommand}" CommandParameter="{Binding}" />
-                                                                    </i:EventTrigger>
-                                                                </i:Interaction.Triggers>
-                                                                <Border.Style>
-                                                                    <Style TargetType="Border">
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding Category}" Value="Info">
-                                                                                <Setter Property="Background" Value="{StaticResource infoBrush}"></Setter>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding Category}" Value="Warning">
-                                                                                <Setter Property="Background" Value="{StaticResource warningBrush}"></Setter>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding Category}" Value="Error">
-                                                                                <Setter Property="Background" Value="{StaticResource errorBrush}"></Setter>
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding Category}" Value="Crtitical">
-                                                                                <Setter Property="Background" Value="{StaticResource criticalBrush}"></Setter>
-                                                                            </DataTrigger>
-                                                                            <Trigger Property="IsMouseOver" Value="True">
-                                                                                <Setter Property="Opacity" Value="0.7"></Setter>
-                                                                            </Trigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </Border.Style>
-                                                                <StackPanel Orientation="Horizontal">
-                                                                    <TextBlock FontWeight="SemiBold" Text="{Binding EventType.Name}" Height="14" FontSize="11"></TextBlock>
-                                                                    <TextBlock Margin="10 0 0 0" Text="{Binding Description,Converter={StaticResource StringToFirstLineConverter}}" Height="14" FontSize="11"></TextBlock>
-                                                                </StackPanel>
-                                                            </Border>
-                                                        </Grid>
-                                                    </Canvas>
-                                                </DataTemplate>
-                                            </ItemsControl.ItemTemplate>
-                                        </ItemsControl>
-                                    </Border>
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                        </ItemsControl>
-
-                        <Canvas Visibility="{Binding EnableTimeMarker,Converter={StaticResource BooleanToVisibilityConverter}}" MinWidth="{Binding RelativeSource={RelativeSource AncestorType=localControls:TimelineScrollViewer},Path=ActualWidth}" ClipToBounds="False" IsHitTestVisible="False">
-                            <Grid Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas},Path=ActualHeight}" ClipToBounds="False">
-                                <Canvas.Left>
-                                    <MultiBinding Converter="{StaticResource TimeSpanToXConverter}">
-                                        <Binding Path="CurrentPosition" />
-                                        <Binding Path="TimelineScaleFactor" />
-                                    </MultiBinding>
-                                </Canvas.Left>
+                            </Canvas.Left>
 
-                                <Rectangle Stroke="DodgerBlue" StrokeThickness="1" HorizontalAlignment="Left" VerticalAlignment="Stretch" />
-                                <Polygon Fill="DodgerBlue" Points="0,0 16,0 8,15 0,0" Margin="-8 -5 0 0" VerticalAlignment="Top" />
-                            </Grid>
-                        </Canvas>
-                    </Grid>
-                </localControls:TimelineScrollViewer>
+                            <Rectangle Stroke="DodgerBlue" StrokeThickness="1" HorizontalAlignment="Left" VerticalAlignment="Stretch" />
+                            <Polygon Fill="DodgerBlue" Points="0,0 16,0 8,15 0,0" Margin="-8 -5 0 0" VerticalAlignment="Top" />
+                        </Grid>
+                    </Canvas>
+                </Grid>
+            </localControls:TimelineScrollViewer>
 
-                <Border Grid.Row="1" Grid.Column="1"  HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="20" Padding="10" Background="#7ECECECE" CornerRadius="5">
+            <Border Grid.Row="1" Grid.Column="1"  HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="20" Padding="10" Background="#7ECECECE" CornerRadius="5">
                     <Grid>
                         <materialDesign:PackIcon Kind="MagnifyPlus" Margin="0 -35 0 0" Width="20" Height="20" Foreground="Gray" />
                         <Slider Minimum="0.5" Maximum="100" Value="{Binding TimelineScaleFactor}" Orientation="Vertical" Height="120"/>
                     </Grid>
                 </Border>
             </Grid>
-        </Grid>
+        <!--</Grid>-->
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml
index 97eceaa7d..b13ffb87b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml
@@ -109,7 +109,7 @@
                                     </Border>
                                 </Grid>
 
-                                <TextBlock Canvas.Left="532" FontStyle="Italic" Foreground="Gray" Canvas.Top="-22">Hardware Version</TextBlock>
+                                <TextBlock Canvas.Left="532" FontStyle="Italic" Foreground="{StaticResource GrayBrush}" Canvas.Top="-22">Hardware Version</TextBlock>
                                 <Grid Width="97" Height="90" Canvas.Left="431" Canvas.Top="-13">
                                     <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
                                     <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
@@ -284,7 +284,7 @@
                                 <Grid Width="61" IsHitTestVisible="True" SnapsToDevicePixels="True" ClipToBounds="True" Height="42" Canvas.Left="85" Canvas.Top="385">
                                     <StackPanel Orientation="Horizontal">
                                         <Image Source="../Images/embedded.png" Width="10" VerticalAlignment="Center" Margin="1" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                        <TextBlock VerticalAlignment="Center" Padding="1" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding ActiveMachine.Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding ActiveMachine.Configuration.EmbeddedFirmwareVersion.Version}"/></TextBlock>
+                                        <TextBlock VerticalAlignment="Center" Padding="1" Foreground="{StaticResource BorderBrushGainsboro}"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding ActiveMachine.Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding ActiveMachine.Configuration.EmbeddedFirmwareVersion.Version}"/></TextBlock>
                                     </StackPanel>
                                 </Grid>
 
@@ -337,7 +337,7 @@
 
                                     <StackPanel>
                                         <Image Source="../Images/tablet.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                        <TextBlock Padding="2 0 2 0" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
+                                        <TextBlock Padding="2 0 2 0" Foreground="{StaticResource BorderBrushGainsboro}"  IsHitTestVisible="False" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
                                         <Run Text="{Binding ActiveMachine.Configuration.ApplicationDisplayPanelVersion.Name}"></Run>
                                         <Run Text="{Binding ActiveMachine.Configuration.ApplicationDisplayPanelVersion.Version}"></Run>
                                         </TextBlock>
@@ -346,7 +346,7 @@
 
                                     <StackPanel Grid.Row="1" >
                                         <Image Source="../Images/application-firmware.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                        <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
+                                        <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="{StaticResource BorderBrushGainsboro}" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
                                         <Run Text="{Binding ActiveMachine.Configuration.ApplicationFirmwareVersion.Name}"></Run>
                                         <Run Text="{Binding ActiveMachine.Configuration.ApplicationFirmwareVersion.Version}"></Run>
                                         </TextBlock>
@@ -354,7 +354,7 @@
 
                                     <StackPanel Grid.Row="2" >
                                         <Image Source="../Images/android.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                        <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
+                                        <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="{StaticResource BorderBrushGainsboro}" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
                                         <Run Text="{Binding ActiveMachine.Configuration.ApplicationOsVersion.Name}"></Run>
                                         <Run Text="{Binding ActiveMachine.Configuration.ApplicationOsVersion.Version}"></Run>
                                         </TextBlock>
@@ -367,9 +367,9 @@
 
 
                 <Grid>
-                    <TextBlock Margin="10" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Top" Foreground="Gray" FontSize="16">IDS PACKS</TextBlock>
+                    <TextBlock Margin="10" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Top" Foreground="{StaticResource GrayBrush}" FontSize="16">IDS PACKS</TextBlock>
                     <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                        <ItemsControl ItemsSource="{Binding ActiveMachine.Configuration.IdsPacks}" FontSize="10" Foreground="DimGray" Margin="10 30 10 10">
+                        <ItemsControl ItemsSource="{Binding ActiveMachine.Configuration.IdsPacks}" FontSize="10" Foreground="{StaticResource DimGrayBrush}" Margin="10 30 10 10">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel>
@@ -404,7 +404,7 @@
                         </ItemsControl>
                     </ScrollViewer>
 
-                    <Rectangle HorizontalAlignment="Right" Margin="0 20 0 20" Stroke="Gainsboro" StrokeThickness="1" StrokeDashArray="5 5 5 5"></Rectangle>
+                    <Rectangle HorizontalAlignment="Right" Margin="0 20 0 20" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1" StrokeDashArray="5 5 5 5"></Rectangle>
                 </Grid>
             </Grid>
 
@@ -442,7 +442,7 @@
                                                                 </StackPanel>
                                                             </StackPanel>
 
-                                                            <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                            <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                         </Grid>
                                                     </DataTemplate>
                                                 </ListBox.ItemTemplate>
@@ -465,11 +465,11 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/tank.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -495,7 +495,7 @@
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -517,8 +517,8 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/liquid.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
                                                                 <Rectangle Height="5" Width="170">
                                                                     <Rectangle.Fill>
                                                                         <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
@@ -527,7 +527,7 @@
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -549,11 +549,11 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/formula.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -575,12 +575,12 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/tablet.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -602,12 +602,12 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/android.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -629,12 +629,12 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/application-firmware.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -656,12 +656,12 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/embedded.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -683,12 +683,12 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/hardware.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
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 8c9fe7179..6a8b7c9b0 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
@@ -27,7 +27,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">
+                <Border Grid.Column="1" Margin="100 70" CornerRadius="5" Background="{StaticResource TransparentBackgroundBrush600}" Padding="10" BorderBrush="{StaticResource borderBrush}" BorderThickness="1">
                     <Grid TextElement.Foreground="{StaticResource GrayBrush280}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
@@ -42,19 +42,19 @@
                             <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
 
                             <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
-                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Organization</TextBlock>
-                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Default RML</TextBlock>
-                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedItem="{Binding ActiveMachine.DefaultRml}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedItem="{Binding ActiveMachine.DefaultRml}" DisplayMemberPath="Name"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Loaded RML</TextBlock>
-                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedValue="{Binding ActiveMachine.LoadedRmlGuid}" SelectedValuePath="Guid" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedValue="{Binding ActiveMachine.LoadedRmlGuid}" SelectedValuePath="Guid" DisplayMemberPath="Name"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Default Color Space</TextBlock>
-                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.ColorSpaces}" SelectedItem="{Binding ActiveMachine.DefaultColorSpace}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.ColorSpaces}" SelectedItem="{Binding ActiveMachine.DefaultColorSpace}" DisplayMemberPath="Name"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Default Segment Length</TextBlock>
                             <mahapps:NumericUpDown HideUpDownButtons="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="1000" Value="{Binding ActiveMachine.DefaultSegmentLength}" HasDecimals="False"></mahapps:NumericUpDown>
@@ -68,7 +68,7 @@
                             <TextBlock FontWeight="SemiBold">Device COM Port</TextBlock>
                             <TextBox Text="{Binding ActiveMachine.DeviceComPort}"></TextBox>
                         </controls:TableGrid>
-                        <Rectangle Grid.Column="1" StrokeThickness="1" Stroke="Silver" HorizontalAlignment="Center" Margin="50 50" />
+                        <Rectangle Grid.Column="1" StrokeThickness="1" Stroke="{StaticResource borderBrush}" HorizontalAlignment="Center" Margin="50 50" />
                         <controls:TableGrid RowHeight="50" Margin="10" Grid.Column="2">
                             <TextBlock FontWeight="SemiBold">Auto Login</TextBlock>
                             <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AutoLogin}"></ToggleButton>
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 41dc0554c..466e6f458 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
@@ -60,7 +60,7 @@
                 </StackPanel>
             </Grid>
             <Grid IsEnabled="{Binding IsFree}">
-                <controls:DoubleClickDataGrid Style="{StaticResource {x:Type DataGrid}}" DoubleClickCommand="{Binding EditMachineCommand}" Margin="0 0 0 10" SelectionMode="Single" SelectionUnit="FullRow" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding MachinesAdapter.Machines}" SelectedItem="{Binding SelectedMachine}">
+                <controls:DoubleClickDataGrid Style="{StaticResource {x:Type DataGrid}}" DoubleClickCommand="{Binding EditMachineCommand}" Margin="0 0 0 10" SelectionMode="Single" SelectionUnit="FullRow" BorderBrush="{StaticResource borderBrush}" IsReadOnly="True" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding MachinesAdapter.Machines}" SelectedItem="{Binding SelectedMachine}">
                     <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.MachineDesigner/Views/SpoolsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml
index 3641492df..3663f72f8 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
@@ -46,7 +46,7 @@
                         </StackPanel>
                     </Grid>
                     <Grid>
-                        <DataGrid Margin="0 0 0 10" SelectionUnit="FullRow" BorderBrush="Silver" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding ActiveMachine.Spools}" SelectedItem="{Binding SelectedSpool}">
+                        <DataGrid Margin="0 0 0 10" SelectionUnit="FullRow" BorderBrush="{StaticResource borderBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding ActiveMachine.Spools}" SelectedItem="{Binding SelectedSpool}">
                             <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.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index 1a13358c1..fd1c5d9a8 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
@@ -27,7 +27,7 @@
             <Grid DockPanel.Dock="Top">
                 <StackPanel Orientation="Horizontal">
                     <Button Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Command="{Binding BackToRmlsCommand}">
-                        <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 DarkGrayBrush200}" ToolTip="Back to RML list" />
                     </Button>
                     <TextBlock Text="{Binding ActiveRML.Name}" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="34"></TextBlock>
                 </StackPanel>
@@ -67,9 +67,9 @@
 
                                     <TextBlock Text="White Point:" ></TextBlock>
                                     <UniformGrid Columns="3">
-                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointL}" HorizontalContentAlignment="Left" />
-                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointA}" HorizontalContentAlignment="Left" />
-                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointB}" HorizontalContentAlignment="Left" />
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointL}" HorizontalContentAlignment="Left" BorderBrush="{StaticResource MainWindow.Foreground}" Foreground="{StaticResource MainWindow.Foreground}"/>
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointA}" HorizontalContentAlignment="Left" BorderBrush="{StaticResource MainWindow.Foreground}" Foreground="{StaticResource MainWindow.Foreground}"/>
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointB}" HorizontalContentAlignment="Left" BorderBrush="{StaticResource MainWindow.Foreground}" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </UniformGrid>
 
                                     <TextBlock Text="Purpose:" ></TextBlock>
@@ -132,7 +132,7 @@
 
                     <Grid>
                         <DockPanel>
-                            <Border DockPanel.Dock="Top" Background="#E9FFFFFF" Margin="20 0" Padding="5" CornerRadius="5">
+                            <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
                                 <Border.Effect>
                                     <DropShadowEffect Opacity="0.4" />
                                 </Border.Effect>
@@ -169,7 +169,7 @@
                                 </StackPanel>
                             </Grid>
 
-                            <Border DockPanel.Dock="Top" Background="#E9FFFFFF" Margin="20 0" Padding="5" CornerRadius="5">
+                            <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
                                 <Border.Effect>
                                     <DropShadowEffect Opacity="0.4" />
                                 </Border.Effect>
@@ -196,7 +196,7 @@
                                                     </Button>
 
                                                     <Grid Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessTableDropped">
-                                                        <Border Padding="5" BorderThickness="1" Margin="20 5 0 5" BorderBrush="{StaticResource DarkGrayBrush}" Background="#B9FFFFFF">
+                                                        <Border Padding="5" BorderThickness="1" Margin="20 5 0 5" BorderBrush="{StaticResource DarkGrayBrush}" Background="{StaticResource TransparentBackgroundBrush100}">
                                                             <Grid>
                                                                 <DockPanel Width="300">
                                                                     <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox>
@@ -249,7 +249,7 @@
                                     </Grid.RowDefinitions>
                                     <Grid  Margin="0 0 0 0">
                                         <DockPanel>
-                                            <Border DockPanel.Dock="Top" Background="#E9FFFFFF" Margin="20 0" Padding="5" CornerRadius="5">
+                                        <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
                                                 <Border.Effect>
                                                     <DropShadowEffect Opacity="0.4" />
                                                 </Border.Effect>
@@ -278,7 +278,7 @@
                                                             </Button>
 
                                                             <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 MainWindow.Foreground}" Text="{Binding LiquidType.Name}"></TextBlock>
                                                                 <Grid Width="58" Height="48" Margin="0 5 0 0">
                                                                     <shapes:Hexagon StrokeThickness="1" Stroke="Gray">
                                                                         <shapes:Hexagon.Fill>
@@ -289,7 +289,7 @@
                                                                         </shapes:Hexagon.Fill>
                                                                     </shapes:Hexagon>
 
-                                                                    <TextBox Style="{x:Null}" Background="Transparent" Foreground="Black" BorderThickness="0" Text="{Binding MaxNlPerCm}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  FontStyle="Italic"></TextBox>
+                                                                    <TextBox Style="{x:Null}" Background="Transparent" Foreground="{StaticResource Hexagon.ForegroundBrush}" BorderThickness="0" Text="{Binding MaxNlPerCm}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  FontStyle="Italic"></TextBox>
                                                                 </Grid>
                                                             </StackPanel>
                                                         </Grid>
@@ -303,15 +303,15 @@
                                     <Grid Grid.Row="2">
                                         <DockPanel>
 
-                                            <Border DockPanel.Dock="Top" Background="#E9FFFFFF" Margin="20 0" Padding="5" CornerRadius="5">
+                                        <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
                                                 <Border.Effect>
                                                     <DropShadowEffect Opacity="0.4" />
                                                 </Border.Effect>
                                                 <Grid>
                                                     <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">CALIBRATION DATA</TextBlock>
-                                                    <Button ToolTip="Create excel file template" FontSize="11" Foreground="#202020" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" VerticalAlignment="Bottom" Padding="0" Command="{Binding CreateCalibrationDataExcelTemplateCommand}" Margin="0 0 5 0">
+                                                <Button ToolTip="Create excel file template" FontSize="11" Foreground="{StaticResource DarkGrayBrush200}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" VerticalAlignment="Bottom" Padding="0" Command="{Binding CreateCalibrationDataExcelTemplateCommand}" Margin="0 0 5 0">
                                                     <StackPanel Orientation="Horizontal">
-                                                        <materialDesign:PackIcon Kind="FileExcel" Foreground="DimGray" Width="16" Height="26" />
+                                                        <materialDesign:PackIcon Kind="FileExcel" Foreground="{StaticResource DimGrayBrush}" Width="16" Height="26" />
                                                         <TextBlock VerticalAlignment="Center" Margin="5 0 0 0">Create Empty Excel Template</TextBlock>
                                                     </StackPanel>
                                                 </Button>
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 64fbc357d..ec1e1a78a 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
@@ -83,7 +83,7 @@
                                                         </shapes:Hexagon.Fill>
                                                     </shapes:Hexagon>
 
-                                                    <TextBlock FontSize="8" Width="40" TextTrimming="CharacterEllipsis" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" Background="Transparent" Foreground="Black" Text="{Binding LiquidType.Name}" FontStyle="Italic"></TextBlock>
+                                                    <TextBlock FontSize="8" Width="40" TextTrimming="CharacterEllipsis" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" Background="Transparent" Foreground="{StaticResource Hexagon.ForegroundBrush}" Text="{Binding LiquidType.Name}" FontStyle="Italic"></TextBlock>
                                                 </Grid>
                                             </DataTemplate>
                                         </ItemsControl.ItemTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/MainView.xaml
index 69708f517..55804c7b3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/MainView.xaml
@@ -30,19 +30,22 @@
         </StackPanel>
 
         <UniformGrid Columns="3" Margin="50 20 50 50" Rows="2" Grid.Row="1">
-            <Border BorderBrush="#181818" Padding="5" BorderThickness="1" CornerRadius="5" Margin="10">
+            <Border BorderBrush="{StaticResource Statistics.BorderBrush}" Padding="5" BorderThickness="1" CornerRadius="5" Margin="10">
                 <DockPanel>
                     <TextBlock DockPanel.Dock="Top" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" Padding="10" Text="{Binding TimelineJobStatusSeries.Title}"></TextBlock>
                     <lvc:CartesianChart Series="{Binding TimelineJobStatusSeries.SeriesCollection}" LegendLocation="Bottom" SeriesColors="{Binding TimelineJobStatusSeries.SeriesColors}">
+                        <lvc:CartesianChart.DataTooltip>
+                            <lvc:DefaultTooltip BulletSize="20" Background="{StaticResource TransparentBackgroundBrush450}" Foreground="{StaticResource Dialog.Foreground}"/>
+                        </lvc:CartesianChart.DataTooltip>
                         <lvc:CartesianChart.AxisX>
-                            <lvc:Axis Title="{Binding TimelineJobStatusSeries.LabelsTitle}" Labels="{Binding TimelineJobStatusSeries.Labels}" Foreground="#202020">
+                            <lvc:Axis Title="{Binding TimelineJobStatusSeries.LabelsTitle}" Labels="{Binding TimelineJobStatusSeries.Labels}" Foreground="{StaticResource DarkGrayBrush200}">
                                 <lvc:Axis.Separator>
                                     <lvc:Separator Stroke="#A5A5A5" />
                                 </lvc:Axis.Separator>
                             </lvc:Axis>
                         </lvc:CartesianChart.AxisX>
                         <lvc:CartesianChart.AxisY>
-                            <lvc:Axis Title="{Binding TimelineJobStatusSeries.ChartTitle}" MinValue="0" Foreground="#202020" >
+                            <lvc:Axis Title="{Binding TimelineJobStatusSeries.ChartTitle}" MinValue="0" Foreground="{StaticResource DarkGrayBrush200}" >
                                 <lvc:Axis.Separator>
                                     <lvc:Separator Stroke="#B0B0B0" />
                                 </lvc:Axis.Separator>
@@ -52,11 +55,17 @@
                 </DockPanel>
             </Border>
 
-            <Border BorderBrush="#181818" Padding="5" BorderThickness="1" CornerRadius="5" Margin="10">
+            <Border BorderBrush="{StaticResource Statistics.BorderBrush}" Padding="5" BorderThickness="1" CornerRadius="5" Margin="10">
                 <DockPanel>
                     <TextBlock DockPanel.Dock="Top" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" Padding="10" Text="{Binding PieJobFailedReasons.Title}"></TextBlock>
                     <UniformGrid Columns="2">
-                        <lvc:PieChart DataHover="PieChart_DataHover" Series="{Binding PieJobFailedReasons.SeriesCollection}" LegendLocation="None" SeriesColors="{Binding PieJobFailedReasons.SeriesColors}">
+                        <lvc:PieChart DataHover="PieChart_DataHover" Series="{Binding PieJobFailedReasons.SeriesCollection}" LegendLocation="None" SeriesColors="{Binding PieJobFailedReasons.SeriesColors}" Background="Transparent">
+                            <lvc:PieChart.Resources>
+                                <Style TargetType="lvc:PieSeries">
+                                    <Setter Property="Stroke" Value="#99F9F9F9"></Setter>
+                                    <Setter Property="StrokeThickness" Value="2"/>
+                                </Style>
+                            </lvc:PieChart.Resources>
                             <lvc:PieChart.DataTooltip>
                                 <tooltips:PieChartTooltipControl Visibility="Hidden" />
                             </lvc:PieChart.DataTooltip>
@@ -67,24 +76,32 @@
                 </DockPanel>
             </Border>
 
-            <Border BorderBrush="#181818" Padding="5" BorderThickness="1" CornerRadius="5" Margin="10">
+            <Border BorderBrush="{StaticResource Statistics.BorderBrush}" Padding="5" BorderThickness="1" CornerRadius="5" Margin="10">
                 <DockPanel>
                     <TextBlock DockPanel.Dock="Top" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" Padding="10" Text="{Binding PrintPerWeekSeries.Title}"></TextBlock>
-                    <lvc:CartesianChart Series="{Binding PrintPerWeekSeries.SeriesCollection}" LegendLocation="Bottom" SeriesColors="{Binding PrintPerWeekSeries.SeriesColors}">
+                    <lvc:CartesianChart Series="{Binding PrintPerWeekSeries.SeriesCollection}" LegendLocation="Bottom" SeriesColors="{Binding PrintPerWeekSeries.SeriesColors}" >
+                        <lvc:CartesianChart.Resources>
+                            <Style TargetType="lvc:ColumnSeries">
+                                <Setter Property="Foreground" Value="{StaticResource DarkGrayBrush200}"></Setter>
+                            </Style>
+                        </lvc:CartesianChart.Resources>
                         <lvc:CartesianChart.AxisX>
-                            <lvc:Axis Title="{Binding PrintPerWeekSeries.LabelsTitle}" Labels="{Binding PrintPerWeekSeries.Labels}" Foreground="#202020">
+                            <lvc:Axis Title="{Binding PrintPerWeekSeries.LabelsTitle}" Labels="{Binding PrintPerWeekSeries.Labels}" Foreground="{StaticResource DarkGrayBrush200}">
                                 <lvc:Axis.Separator>
                                     <lvc:Separator Stroke="#A5A5A5" />
                                 </lvc:Axis.Separator>
                             </lvc:Axis>
                         </lvc:CartesianChart.AxisX>
                         <lvc:CartesianChart.AxisY>
-                            <lvc:Axis Title="{Binding PrintPerWeekSeries.ChartTitle}" MinValue="0" Foreground="#202020" >
+                            <lvc:Axis Title="{Binding PrintPerWeekSeries.ChartTitle}" MinValue="0" Foreground="{StaticResource DarkGrayBrush200}" >
                                 <lvc:Axis.Separator>
-                                    <lvc:Separator Stroke="#B0B0B0" />
+                                    <lvc:Separator Stroke="#6F6F6F" />
                                 </lvc:Axis.Separator>
                             </lvc:Axis>
                         </lvc:CartesianChart.AxisY>
+                        <lvc:CartesianChart.DataTooltip>
+                            <lvc:DefaultTooltip BulletSize="20" Background="{StaticResource TransparentBackgroundBrush450}" Foreground="{StaticResource Dialog.Foreground}"/>
+                        </lvc:CartesianChart.DataTooltip>
                     </lvc:CartesianChart>
                 </DockPanel>
             </Border>
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 e6a18ddde..a8daa4540 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="{StaticResource DarkGrayBrush}" Foreground="Gainsboro" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="{StaticResource DarkGrayBrush}" Foreground="{StaticResource BorderBrushGainsboro}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
 
     <UserControl.Resources>
         <ResourceDictionary>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/JobRunnerTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/JobRunnerTemplate.xaml
index b6bfefd8c..1936a90d2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/JobRunnerTemplate.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/JobRunnerTemplate.xaml
@@ -52,7 +52,7 @@
                 <controls:TableGrid RowHeight="40">
 
                     <TextBlock>Length</TextBlock>
-                    <mahApps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="1" Maximum="1000" Value="{Binding Segment.Length}"></mahApps:NumericUpDown>
+                    <mahApps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="Gray" Margin="0 5 0 0" Minimum="1" Maximum="1000" Value="{Binding Segment.Length}"></mahApps:NumericUpDown>
 
                     <TextBlock>Winding Method</TextBlock>
                     <ComboBox ItemsSource="{Binding Adapter.WindingMethods}" SelectedValue="{Binding Job.WindingMethod}" DisplayMemberPath="Name"></ComboBox>
@@ -64,10 +64,10 @@
                     <ToggleButton IsChecked="{Binding Job.EnableInterSegment}" HorizontalAlignment="Right" />
 
                     <TextBlock>Inter Segment Length</TextBlock>
-                    <mahApps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="1" Maximum="1000" Value="{Binding Job.InterSegmentLength}"></mahApps:NumericUpDown>
+                    <mahApps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="Gray" Margin="0 5 0 0" Minimum="1" Maximum="1000" Value="{Binding Job.InterSegmentLength}"></mahApps:NumericUpDown>
 
                     <TextBlock>Number of Units</TextBlock>
-                    <mahApps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="1" Maximum="1000" Value="{Binding Job.NumberOfUnits}"></mahApps:NumericUpDown>
+                    <mahApps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="Gray" Margin="0 5 0 0" Minimum="1" Maximum="1000" Value="{Binding Job.NumberOfUnits}"></mahApps:NumericUpDown>
 
                     <TextBlock>Enable Lubrication</TextBlock>
                     <ToggleButton IsChecked="{Binding Job.EnableLubrication}" HorizontalAlignment="Right" />
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 7da979a00..82052f02f 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
@@ -49,11 +49,11 @@
                         <UniformGrid Columns="2" Margin="0 5 0 0" IsEnabled="{Binding UseMinMax}">
                             <StackPanel Margin="0 0 5 0">
                                 <TextBlock>Minimum</TextBlock>
-                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="-1000000" Maximum="1000000" Value="{Binding Min,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="Gray" Margin="0 5 0 0" Minimum="-1000000" Maximum="1000000" Value="{Binding Min,Mode=TwoWay}"></mahapps:NumericUpDown>
                             </StackPanel>
                             <StackPanel Margin="5 0 0 0">
                                 <TextBlock>Maximum</TextBlock>
-                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="{Binding Min}" Maximum="1000000" Value="{Binding Max,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="Gray" Margin="0 5 0 0" Minimum="{Binding Min}" Maximum="1000000" Value="{Binding Max,Mode=TwoWay}"></mahapps:NumericUpDown>
                             </StackPanel>
                         </UniformGrid>
                         <Button Margin="0 10 0 0" Command="{Binding ResetMinMaxToDefaultCommand}" Style="{StaticResource MaterialDesignFlatButton}">Set To Default</Button>
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 3830ecc3e..037ae0693 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
@@ -49,11 +49,11 @@
                         <UniformGrid Columns="2" Margin="0 5 0 0" IsEnabled="{Binding UseMinMax}">
                             <StackPanel Margin="0 0 5 0">
                                 <TextBlock>Minimum</TextBlock>
-                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="-1000000" Maximum="1000000" Value="{Binding Min,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Margin="0 5 0 0" Minimum="-1000000" Maximum="1000000" Value="{Binding Min,Mode=TwoWay}"></mahapps:NumericUpDown>
                             </StackPanel>
                             <StackPanel Margin="5 0 0 0">
                                 <TextBlock>Maximum</TextBlock>
-                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="{Binding Min}" Maximum="1000000" Value="{Binding Max,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Margin="0 5 0 0" Minimum="{Binding Min}" Maximum="1000000" Value="{Binding Max,Mode=TwoWay}"></mahapps:NumericUpDown>
                             </StackPanel>
                         </UniformGrid>
                         <Button Margin="0 10 0 0" Command="{Binding ResetMinMaxToDefaultCommand}" Style="{StaticResource MaterialDesignFlatButton}">Set To Default</Button>
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 1cb7876cf..5eb72e65b 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
@@ -26,7 +26,7 @@
             </StackPanel>
 
             <Grid Margin="60 20 30 20">
-                <Border BorderThickness="1" BorderBrush="Gainsboro" Padding="5" CornerRadius="5">
+                <Border BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}" Padding="5" CornerRadius="5">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
                     <ItemsControl ItemsSource="{Binding Tabs}">
                         <ItemsControl.ItemTemplate>
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 2d180a8a2..63d22d365 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
@@ -77,40 +77,40 @@
                             <ContextMenu DataContext="{Binding Path=PlacementTarget, RelativeSource={RelativeSource Self}}">
                                 <MenuItem Header="Cut (Ctrl+X)" Command="{Binding CutCommand}" MinWidth="210">
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="Cut" Width="16" />
+                                        <fa:ImageAwesome Icon="Cut" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
                                 <MenuItem Header="Copy (Ctrl+C)" Command="{Binding CopyCommand}">
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="Copy" Width="16" />
+                                        <fa:ImageAwesome Icon="Copy" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="Paste (Ctrl+V)" Command="{Binding PasteCommand}">
+                                <MenuItem Header="Paste (Ctrl+V)" Command="{Binding PasteCommand}" >
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="Paste" Width="16" />
+                                        <fa:ImageAwesome Icon="Paste" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
                                 <Separator/>
                                 <MenuItem Header="Undo (Ctrl+Z)" Command="{Binding UndoCommand}">
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="Undo" Width="16" />
+                                        <fa:ImageAwesome Icon="Undo" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
                                 <MenuItem Header="Redo (Ctrl+Y)" Command="{Binding RedoCommand}">
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="RotateRight" Width="16"></fa:ImageAwesome>
+                                        <fa:ImageAwesome Icon="RotateRight" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
                                 <Separator/>
                                 <MenuItem Header="Delete (DELETE)" Command="{Binding DeleteCommand}">
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="Recycle" Width="16" />
+                                        <fa:ImageAwesome Icon="Recycle" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
                                 <Separator/>
                                 <MenuItem Header="Select All (Ctrl+A)" Command="{Binding SelectAllCommand}">
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="Th" Width="16" />
+                                        <fa:ImageAwesome Icon="Th" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
                             </ContextMenu>
@@ -140,105 +140,105 @@
                     <MenuItem Header="File">
                         <MenuItem Command="{Binding NewProjectCommand}" MinWidth="180" Header="New" VerticalContentAlignment="Center">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="File" Width="16" />
+                                <fa:ImageAwesome Icon="File" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator/>
                         <MenuItem Command="{Binding OpenProjectCommand}" MinWidth="180" Header="Open" VerticalContentAlignment="Center">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="FolderOpen" Width="16" />
+                                <fa:ImageAwesome Icon="FolderOpen" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem MinWidth="180" Header="Import" VerticalContentAlignment="Center">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="ArrowRight" Width="16" />
+                                <fa:ImageAwesome Icon="ArrowRight" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
 
                             <MenuItem Header="Import Project Tabs" VerticalContentAlignment="Center" Command="{Binding ImportProjectTabsCommand}">
                                 <MenuItem.Icon>
-                                    <fa:ImageAwesome Icon="Table" Width="16" />
+                                    <fa:ImageAwesome Icon="Table" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                 </MenuItem.Icon>
                             </MenuItem>
                         </MenuItem>
                         <Separator/>
                         <MenuItem Header="Save" Command="{Binding SaveProjectCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Save" Width="16" />
+                                <fa:ImageAwesome Icon="Save" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Save as" Command="{Binding SaveAsProjectCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Save" Width="16" />
+                                <fa:ImageAwesome Icon="Save" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
                     <MenuItem Header="Edit">
                         <MenuItem Header="Cut (Ctrl+X)" Command="{Binding SelectedTab.Editor.CutCommand}" MinWidth="210">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Cut" Width="16" />
+                                <fa:ImageAwesome Icon="Cut" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Copy (Ctrl+C)" Command="{Binding SelectedTab.Editor.CopyCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Copy" Width="16" />
+                                <fa:ImageAwesome Icon="Copy" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Paste (Ctrl+V)" Command="{Binding SelectedTab.Editor.PasteCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Paste" Width="16" />
+                                <fa:ImageAwesome Icon="Paste" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator/>
                         <MenuItem Header="Undo (Ctrl+Z)" Command="{Binding SelectedTab.Editor.UndoCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Undo" Width="16" />
+                                <fa:ImageAwesome Icon="Undo" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Redo (Ctrl+Y)" Command="{Binding SelectedTab.Editor.RedoCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="RotateRight" Width="16"></fa:ImageAwesome>
+                                <fa:ImageAwesome Icon="RotateRight" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator/>
                         <MenuItem Header="Delete (DELETE)" Command="{Binding SelectedTab.Editor.DeleteCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Recycle" Width="16" />
+                                <fa:ImageAwesome Icon="Recycle" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator/>
                         <MenuItem Header="Select All (Ctrl+A)" Command="{Binding SelectedTab.Editor.SelectAllCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Th" Width="16" />
+                                <fa:ImageAwesome Icon="Th" Width="16" Foreground="{StaticResource MainWindow.Foreground}" />
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
                     <MenuItem Header="View">
                         <MenuItem Header="Zoom In" Command="{Binding SelectedTab.Editor.ZoomCommand}" CommandParameter="0.1">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="SearchPlus" Width="16" />
+                                <fa:ImageAwesome Icon="SearchPlus" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Zoom Out" Command="{Binding SelectedTab.Editor.ZoomCommand}" CommandParameter="-0.1">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="SearchMinus" Width="16" />
+                                <fa:ImageAwesome Icon="SearchMinus" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator/>
                         <MenuItem Header="Reset Zoom" Command="{Binding SelectedTab.Editor.ResetZoomCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Search" Width="16" />
+                                <fa:ImageAwesome Icon="Search" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
                     <MenuItem Header="Tools">
                         <MenuItem Header="Upload partial hardware configuration" Command="{Binding UploadPartialHardwareConfigurationCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Upload" Width="16" />
+                                <fa:ImageAwesome Icon="Upload" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Reset all graphs" Command="{Binding ResetGraphsCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Refresh" Width="16" />
+                                <fa:ImageAwesome Icon="Refresh" Width="16" Foreground="{StaticResource MainWindow.Foreground}" />
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
@@ -464,11 +464,11 @@
                                             <UniformGrid Columns="2" Margin="0 5 0 0">
                                                 <StackPanel Margin="0 0 5 0">
                                                     <TextBlock>Left</TextBlock>
-                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="0" Maximum="{Binding SelectedTab.Editor.EditorWidth}" Value="{Binding SelectedTab.Editor.SelectedElement.Left}"></mahapps:NumericUpDown>
+                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Margin="0 5 0 0" Minimum="0" Maximum="{Binding SelectedTab.Editor.EditorWidth}" Value="{Binding SelectedTab.Editor.SelectedElement.Left}"></mahapps:NumericUpDown>
                                                 </StackPanel>
                                                 <StackPanel Margin="5 0 0 0">
                                                     <TextBlock>Top</TextBlock>
-                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="0" Maximum="{Binding SelectedTab.Editor.EditorHeight}" Value="{Binding SelectedTab.Editor.SelectedElement.Top}"></mahapps:NumericUpDown>
+                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Margin="0 5 0 0" Minimum="0" Maximum="{Binding SelectedTab.Editor.EditorHeight}" Value="{Binding SelectedTab.Editor.SelectedElement.Top}"></mahapps:NumericUpDown>
                                                 </StackPanel>
                                             </UniformGrid>
 
@@ -476,11 +476,11 @@
                                             <UniformGrid Columns="2" Margin="0 20 0 0">
                                                 <StackPanel Margin="0 0 5 0">
                                                     <TextBlock>Width</TextBlock>
-                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="10" Maximum="{Binding SelectedTab.Editor.EditorWidth}" Value="{Binding SelectedTab.Editor.SelectedElement.Width}"></mahapps:NumericUpDown>
+                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Margin="0 5 0 0" Minimum="10" Maximum="{Binding SelectedTab.Editor.EditorWidth}" Value="{Binding SelectedTab.Editor.SelectedElement.Width}"></mahapps:NumericUpDown>
                                                 </StackPanel>
                                                 <StackPanel Margin="5 0 0 0">
                                                     <TextBlock>Height</TextBlock>
-                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="10" Maximum="{Binding SelectedTab.Editor.EditorHeight}" Value="{Binding SelectedTab.Editor.SelectedElement.Height}"></mahapps:NumericUpDown>
+                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Margin="0 5 0 0" Minimum="10" Maximum="{Binding SelectedTab.Editor.EditorHeight}" Value="{Binding SelectedTab.Editor.SelectedElement.Height}"></mahapps:NumericUpDown>
                                                 </StackPanel>
                                             </UniformGrid>
 
@@ -491,7 +491,7 @@
                                                     <ColumnDefinition Width="20*"></ColumnDefinition>
                                                 </Grid.ColumnDefinitions>
                                                 <TextBlock VerticalAlignment="Center" Margin="0 0 10 0" HorizontalAlignment="Left">Angle</TextBlock>
-                                                <mahapps:NumericUpDown Grid.Column="1" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Maximum="360" Minimum="-360" HasDecimals="False" Margin="0 5 0 0" Value="{Binding SelectedTab.Editor.SelectedElement.Angle}"></mahapps:NumericUpDown>
+                                                <mahapps:NumericUpDown Grid.Column="1" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Maximum="360" Minimum="-360" HasDecimals="False" Margin="0 5 0 0" Value="{Binding SelectedTab.Editor.SelectedElement.Angle}"></mahapps:NumericUpDown>
                                             </Grid>
                                         </StackPanel>
                                     </GroupBox>
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 f8045d7a6..d5a5d41d7 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="{StaticResource GrayBrush}" BorderThickness="0 0 1 0">
+            <Border Background="{StaticResource TransparentBackgroundBrush420}" BorderBrush="{StaticResource GrayBrush}" BorderThickness="0 0 1 0">
                 <Grid Margin="10 20 10 10">
                     <StackPanel HorizontalAlignment="Center">
 
@@ -39,7 +39,7 @@
 
                         <TextBlock FontSize="14" FontWeight="SemiBold">ADDRESS</TextBlock>
 
-                        <Border BorderBrush="Gray" BorderThickness="1" Width="300" HorizontalAlignment="Left" Padding="5" Margin="0 10 0 0" Background="#A9FFFFFF" Height="300">
+                        <Border BorderBrush="Gray" BorderThickness="1" Width="300" HorizontalAlignment="Left" Padding="5" Margin="0 10 0 0" Background="{StaticResource TransparentBackgroundBrush420}" Height="300">
                             <DockPanel>
                                 <DockPanel DockPanel.Dock="Top">
                                     <materialDesign:PackIcon Kind="Magnify" DockPanel.Dock="Left" Width="24" Height="24" />
@@ -51,7 +51,7 @@
 
                         <TextBlock FontSize="14" FontWeight="SemiBold" Margin="0 40 0 0">CONTACT</TextBlock>
 
-                        <Border BorderBrush="Gray" BorderThickness="1" Width="300" HorizontalAlignment="Left" Padding="5" Margin="0 10 0 0" Background="#A9FFFFFF" Height="250">
+                        <Border BorderBrush="Gray" BorderThickness="1" Width="300" HorizontalAlignment="Left" Padding="5" Margin="0 10 0 0" Background="{StaticResource TransparentBackgroundBrush420}" Height="250">
                             <local:ContactView DataContext="{Binding ManagedOrganization.Contact}" />
                         </Border>
 
@@ -107,7 +107,7 @@
                         </StackPanel>
                     </Grid>
                     <Grid>
-                        <DataGrid Margin="0 0 0 10" ItemsSource="{Binding ManagedOrganization.Users}" SelectedItem="{Binding SelectedUser}"  d:DataContext="{d:DesignInstance Type=entities:User, IsDesignTimeCreatable=False}" BorderBrush="Silver" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True">
+                        <DataGrid Margin="0 0 0 10" ItemsSource="{Binding ManagedOrganization.Users}" SelectedItem="{Binding SelectedUser}"  d:DataContext="{d:DesignInstance Type=entities:User, IsDesignTimeCreatable=False}" BorderBrush="{StaticResource borderBrush}" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True">
                             <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.UsersAndRoles/Views/OrganizationSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationSelectionView.xaml
index 3e71836d3..814e60d93 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
@@ -46,7 +46,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 Organizations}" SelectedItem="{Binding SelectedOrganization}">
+                <DataGrid Margin="0 0 0 10" BorderBrush="{StaticResource borderBrush}" IsReadOnly="True" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Organizations}" SelectedItem="{Binding SelectedOrganization}">
                     <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.UsersAndRoles/Views/UserManagementView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml
index 7e38447d8..bb003f525 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
@@ -47,19 +47,19 @@
                                 <StackPanel Orientation="Horizontal" Margin="0 20 0 0" HorizontalAlignment="Right">
                                     <StackPanel>
                                         <TextBlock FontSize="16" FontWeight="SemiBold">LOGIN</TextBlock>
-                                        <Border Width="300" BorderThickness="1" BorderBrush="Gray" Margin="0 5 0 0" Padding="15 5" Height="150" Background="#8EFFFFFF">
+                                        <Border Width="300" BorderThickness="1" BorderBrush="Gray" Margin="0 5 0 0" Padding="15 5" Height="150" Background="{StaticResource TransparentBackgroundBrush500}">
                                             <local:UserView FontSize="10" DataContext="{Binding ManagedUser}" />
                                         </Border>
                                     </StackPanel>
                                     <StackPanel Margin="10 0 0 0">
                                         <TextBlock FontSize="16" FontWeight="SemiBold">CONTACT</TextBlock>
-                                        <Border Width="300" BorderThickness="1" BorderBrush="Gray" Margin="0 5 0 0" Padding="15 5" Height="250" Background="#8EFFFFFF">
+                                        <Border Width="300" BorderThickness="1" BorderBrush="Gray" Margin="0 5 0 0" Padding="15 5" Height="250" Background="{StaticResource TransparentBackgroundBrush500}">
                                             <local:ContactView FontSize="10" DataContext="{Binding ManagedUser.Contact}" />
                                         </Border>
                                     </StackPanel>
                                     <StackPanel Margin="10 0 0 0">
                                         <TextBlock FontSize="16" FontWeight="SemiBold">ADDRESS</TextBlock>
-                                        <Border Width="300" BorderThickness="1" BorderBrush="Gray" Margin="0 5 0 0" Padding="15 5" Height="300" Background="#8EFFFFFF">
+                                        <Border Width="300" BorderThickness="1" BorderBrush="Gray" Margin="0 5 0 0" Padding="15 5" Height="300" Background="{StaticResource TransparentBackgroundBrush500}">
                                             <DockPanel>
                                                 <DockPanel DockPanel.Dock="Top">
                                                     <materialDesign:PackIcon Kind="Magnify" DockPanel.Dock="Left" Width="24" Height="24" />
@@ -84,9 +84,9 @@
                     <Grid>
                         <DockPanel Margin="0 20 0 0">
                             <TextBlock DockPanel.Dock="Top" FontSize="16" FontWeight="SemiBold">ROLES</TextBlock>
-                            <Grid Margin="0 5 0 0" Style="{StaticResource droppableGrid}" dragAndDrop:DragAndDropService.Drop="OnDropRole" Background="#7BFFFFFF">
+                            <Grid Margin="0 5 0 0" Style="{StaticResource droppableGrid}" dragAndDrop:DragAndDropService.Drop="OnDropRole" Background="{StaticResource TransparentBackgroundBrush420}">
                                 <TextBlock HorizontalAlignment="Center" VerticalAlignment="Top" Foreground="Silver" FontSize="20">DRAG &amp; DROP ROLES</TextBlock>
-                                <Border BorderBrush="Gray" BorderThickness="1" Padding="10">
+                                <Border BorderBrush="{StaticResource borderBrush}" BorderThickness="1" Padding="10">
                                     <ListBox ItemsSource="{Binding ManagedUserRoles}" ItemContainerStyle="{StaticResource basicListBoxItem}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled">
                                         <ListBox.ItemsPanel>
                                             <ItemsPanelTemplate>
@@ -97,7 +97,7 @@
                                             <DataTemplate DataType="{x:Type entities:Role}">
                                                 <Grid>
                                                     <Grid.ToolTip>
-                                                        <StackPanel>
+                                                        <StackPanel Background="Transparent">
                                                             <TextBlock Text="{Binding Description}" FontSize="10" Margin="0 0 0 10"></TextBlock>
                                                             <ItemsControl ItemsSource="{Binding RolesPermissions}">
                                                                 <ItemsControl.ItemTemplate>
@@ -113,10 +113,10 @@
                                                             </ItemsControl>
                                                         </StackPanel>
                                                     </Grid.ToolTip>
-                                                    <Border Margin="5" CornerRadius="5" Width="100" Height="100" BorderThickness="1" Padding="2">
+                                                    <Border Margin="5" CornerRadius="5" Width="100" Height="100" BorderThickness="1" Padding="2" Background="{StaticResource UserRoles.Background}">
                                                         <Border.Style>
                                                             <Style TargetType="Border">
-                                                                <Setter Property="BorderBrush" Value="Silver"></Setter>
+                                                                <Setter Property="BorderBrush" Value="{StaticResource borderBrush}"></Setter>
                                                                 <Style.Triggers>
                                                                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
                                                                         <Setter Property="BorderBrush" Value="{StaticResource AccentColorBrush}"></Setter>
@@ -124,12 +124,6 @@
                                                                 </Style.Triggers>
                                                             </Style>
                                                         </Border.Style>
-                                                        <Border.Background>
-                                                            <LinearGradientBrush>
-                                                                <GradientStop Color="White"/>
-                                                                <GradientStop Color="#FFD6D6D6" Offset="1"/>
-                                                            </LinearGradientBrush>
-                                                        </Border.Background>
                                                         <Grid>
                                                             <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
                                                                 <Image Source="../Images/roles.png" Width="32" RenderOptions.BitmapScalingMode="Fant"></Image>
@@ -162,7 +156,7 @@
                 </DockPanel>
             </Grid>
 
-            <Grid Grid.Column="1" Background="White">
+            <Grid Grid.Column="1" Background="{StaticResource WhiteBackgroundBrush}">
                 <DockPanel Margin="10">
                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
                         <Image Source="../Images/roles.png" Width="70" RenderOptions.BitmapScalingMode="Fant"></Image>
@@ -175,14 +169,18 @@
                                 <DataTemplate>
                                     <Grid Background="Transparent" IsHitTestVisible="True" Style="{StaticResource draggableGrid}" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
                                         <Grid.ToolTip>
-                                            <StackPanel>
+                                            <StackPanel Background="Transparent">
                                                 <TextBlock Text="{Binding Description}" FontSize="10" Margin="0 0 0 10"></TextBlock>
                                                 <ItemsControl ItemsSource="{Binding RolesPermissions}">
                                                     <ItemsControl.ItemTemplate>
                                                         <DataTemplate>
-                                                            <StackPanel Orientation="Horizontal">
+                                                            <StackPanel Orientation="Horizontal"
+                                                                        Background="Transparent">
                                                                 <materialDesign:PackIcon Kind="Security" Width="12" />
-                                                                <TextBlock Margin="5 0 0 0" FontSize="10" Text="{Binding Permission.Name}"></TextBlock>
+                                                                <TextBlock Margin="5 0 0 0"
+                                                                           FontSize="10"
+                                                                           Text="{Binding Permission.Name}"
+                                                                           ></TextBlock>
                                                             </StackPanel>
                                                         </DataTemplate>
                                                     </ItemsControl.ItemTemplate>
@@ -190,13 +188,7 @@
                                             </StackPanel>
                                         </Grid.ToolTip>
                                         <DockPanel>
-                                            <Border DockPanel.Dock="Left" Width="100" Height="100" IsHitTestVisible="False" BorderBrush="Silver" BorderThickness="1" CornerRadius="5" Margin="5" Padding="2">
-                                                <Border.Background>
-                                                    <LinearGradientBrush>
-                                                        <GradientStop Color="White"/>
-                                                        <GradientStop Color="#FFD6D6D6" Offset="1"/>
-                                                    </LinearGradientBrush>
-                                                </Border.Background>
+                                            <Border DockPanel.Dock="Left" Width="100" Height="100" IsHitTestVisible="False" BorderBrush="{StaticResource borderBrush}" BorderThickness="1" CornerRadius="5" Margin="5" Padding="2" Background="{StaticResource UserRoles.Background}">
                                                 <Grid>
                                                     <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
                                                         <Image Source="../Images/roles.png" Width="32" RenderOptions.BitmapScalingMode="Fant"></Image>
@@ -205,8 +197,11 @@
                                                 </Grid>
                                             </Border>
 
-                                            <Grid MaxHeight="85" HorizontalAlignment="Left" Margin="20 0 0 0">
-                                                <ItemsControl ItemsSource="{Binding RolesPermissions}">
+                                            <Grid MaxHeight="85"
+                                                  HorizontalAlignment="Left"
+                                                  Margin="20 0 0 0"
+                                                  Width="200">
+                                                <ItemsControl ItemsSource="{Binding RolesPermissions}" Foreground="{StaticResource MainWindow.Foreground}">
                                                     <ItemsControl.ItemTemplate>
                                                         <DataTemplate>
                                                             <StackPanel Orientation="Horizontal">
@@ -217,13 +212,7 @@
                                                     </ItemsControl.ItemTemplate>
                                                 </ItemsControl>
 
-                                                <Grid>
-                                                    <Grid.Background>
-                                                        <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                                            <GradientStop/>
-                                                            <GradientStop Color="White" Offset="1"/>
-                                                        </LinearGradientBrush>
-                                                    </Grid.Background>
+                                                <Grid Background="{StaticResource UserRoles.GridBackground}">
                                                 </Grid>
                                             </Grid>
                                         </DockPanel>
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 7f135efbc..cd218f663 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml
@@ -39,7 +39,7 @@
 
                 <Grid Grid.Row="1">
                     <shapes:Hexagon Stroke="{StaticResource DarkGrayBrush}" StrokeThickness="1" Margin="5" />
-                    <TextBlock TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" FontStyle="Italic" FontSize="10">
+                    <TextBlock TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" FontStyle="Italic" FontSize="10" Foreground="{StaticResource Hexagon.ForegroundBrush}">
                         <Run Text="&#916;"></Run>
                         <Run Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Resolution,FallbackValue=1}"></Run>
                     </TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineView.xaml
index 6f352f35c..013dca6ce 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineView.xaml
@@ -39,7 +39,7 @@
                         <Border BorderBrush="#6C6C6C" BorderThickness="1" IsHitTestVisible="False">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="../Images/hardware.png" Width="10" VerticalAlignment="Center" Margin="5" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                <TextBlock Padding="2 0 2 0" VerticalAlignment="Center" TextAlignment="Center" Foreground="Gainsboro" IsHitTestVisible="False" FontSize="6" TextWrapping="Wrap">
+                                <TextBlock Padding="2 0 2 0" VerticalAlignment="Center" TextAlignment="Center" Foreground="{StaticResource BorderBrushGainsboro}" IsHitTestVisible="False" FontSize="6" TextWrapping="Wrap">
                                             <Run Text="{Binding Configuration.HardwareVersion.Name}"></Run>
                                             <Run Text="{Binding Configuration.HardwareVersion.Version}"></Run>
                                 </TextBlock>
@@ -174,7 +174,7 @@
                                     </Style.Triggers>
                                 </Style>
                             </Grid.Style>
-                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold" Foreground="Gainsboro">NO IDS PACKS</TextBlock>
+                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold" Foreground="{StaticResource BorderBrushGainsboro}">NO IDS PACKS</TextBlock>
                         </Grid>
 
                         <Rectangle VerticalAlignment="Bottom" Stroke="DimGray" StrokeThickness="1">
@@ -195,7 +195,7 @@
 
                         <StackPanel Orientation="Horizontal">
                             <Image Source="../Images/embedded.png" Width="10" VerticalAlignment="Center" Margin="1" RenderOptions.BitmapScalingMode="Fant"></Image>
-                            <TextBlock VerticalAlignment="Center" Padding="1" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Version}"/></TextBlock>
+                            <TextBlock VerticalAlignment="Center" Padding="1" Foreground="{StaticResource BorderBrushGainsboro}"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Version}"/></TextBlock>
                         </StackPanel>
                     </Grid>
 
@@ -238,7 +238,7 @@
 
                         <StackPanel>
                             <Image Source="../Images/tablet.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                            <TextBlock Padding="2 0 2 0" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
+                            <TextBlock Padding="2 0 2 0" Foreground="{StaticResource BorderBrushGainsboro}"  IsHitTestVisible="False" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
                                         <Run Text="{Binding Configuration.ApplicationDisplayPanelVersion.Name}"></Run>
                                         <Run Text="{Binding Configuration.ApplicationDisplayPanelVersion.Version}"></Run>
                             </TextBlock>
@@ -247,7 +247,7 @@
 
                         <StackPanel Grid.Row="3" >
                             <Image Source="../Images/application-firmware.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                            <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
+                            <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="{StaticResource BorderBrushGainsboro}" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
                                         <Run Text="{Binding Configuration.ApplicationFirmwareVersion.Name}"></Run>
                                         <Run Text="{Binding Configuration.ApplicationFirmwareVersion.Version}"></Run>
                             </TextBlock>
@@ -255,7 +255,7 @@
 
                         <StackPanel Grid.Row="1" >
                             <Image Source="../Images/android.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                            <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
+                            <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="{StaticResource BorderBrushGainsboro}" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
                                         <Run Text="{Binding Configuration.ApplicationOsVersion.Name}"></Run>
                                         <Run Text="{Binding Configuration.ApplicationOsVersion.Version}"></Run>
                             </TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 0433ff7be..2920c8dd9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -135,6 +135,11 @@ namespace Tango.MachineStudio.Common
             return DeploymentSlot.ToAddress();
         }
 
+        /// <summary>
+        /// Gets or sets the working theme.
+        /// </summary>
+        public MachineStudioTheme Theme { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MachineStudio"/> class.
         /// </summary>
@@ -149,6 +154,7 @@ namespace Tango.MachineStudio.Common
             JobUploadStrategy = JobUploadStrategy.JobDescriptionFile;
             MaximumCacheTime = TimeSpan.FromMinutes(5);
             CachingMode = ObservablesContextInMemoryCachingMode.None;
+            Theme = MachineStudioTheme.Light;
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioTheme.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioTheme.cs
new file mode 100644
index 000000000..16dda143b
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioTheme.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.MachineStudio.Common
+{
+    public enum MachineStudioTheme
+    {
+        Light,
+        Dark
+    }
+}
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 03c6649d6..0bf472a2e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
@@ -24,11 +24,12 @@
         </ResourceDictionary>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml">
         </ResourceDictionary>
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml">
-        </ResourceDictionary>
-        <!--Material Design-->
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml">
+
+        <!--<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml">
         </ResourceDictionary>
+        --><!--Material Design--><!--
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml">
+        </ResourceDictionary>-->
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml">
         </ResourceDictionary>
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/materialdesigncolor.lightblue.xaml">
@@ -139,9 +140,9 @@
                                    AllowsTransparency="True"
                                    PopupAnimation="Slide"
                                    Focusable="False">
-                                    <Border Background="White"
+                                    <Border Background="{DynamicResource AutoCompleteTextBox.Popup.Background}" x:Name="PopupBorder"
                                         BorderThickness="1"
-                                        BorderBrush="#BDBDBD"
+                                        BorderBrush="{DynamicResource AutoCompleteTextBox.Popup.BorderBrush}"
                                         CornerRadius="0"
                                         Padding="2">
                                         <Grid>
@@ -286,7 +287,7 @@
                                                                 </Style>
                                                             </Ellipse.Style>
                                                         </Ellipse>
-                                                        <TextBlock FontSize="8" Text="{Binding Name}" VerticalAlignment="Center" Foreground="Gainsboro" FontWeight="DemiBold" HorizontalAlignment="Center"></TextBlock>
+                                                        <TextBlock FontSize="8" Text="{Binding Name}" VerticalAlignment="Center" Foreground="{DynamicResource BorderBrushGainsboro}" FontWeight="DemiBold" HorizontalAlignment="Center"></TextBlock>
                                                     </Grid>
                                                 </Grid>
                                             </ControlTemplate>
@@ -477,7 +478,7 @@
                         </LinearGradientBrush>
                     </Setter.Value>
                 </Setter>
-                <Setter Property="TextElement.Foreground" Value="Gainsboro"></Setter>
+                <Setter Property="TextElement.Foreground" Value="{DynamicResource BorderBrushGainsboro}"></Setter>
 
                 <Style.Triggers>
                     <EventTrigger RoutedEvent="PreviewMouseDown">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs
index 6b1a86741..d422df26c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using Tango.Settings;
 
 namespace Tango.MachineStudio.Common.Resources
 {
@@ -34,6 +35,11 @@ namespace Tango.MachineStudio.Common.Resources
             set
             {
                 _sourceUri = value;
+                var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
+                //add current theme
+                MachineStudioTheme wTheme = settings.Theme;
+                if ((wTheme == MachineStudioTheme.Dark && value.LocalPath.Contains("Light")) || (wTheme == MachineStudioTheme.Light && value.LocalPath.Contains("Dark")))
+                    return;
 
                 if (!_sharedDictionaries.ContainsKey(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 c368a499c..62f2dc984 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="MachineStudioTheme.cs" />
     <Compile Include="Resources\SharedResourceDictionary.cs" />
     <Compile Include="Web\LoginRequest.cs" />
     <Compile Include="Web\LoginResponse.cs" />
@@ -186,6 +187,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\DarkThemeColors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml
new file mode 100644
index 000000000..ad8f0f09b
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml
@@ -0,0 +1,301 @@
+<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"
+                   xmlns:system="clr-namespace:System;assembly=mscorlib">
+    <ResourceDictionary.MergedDictionaries>
+
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml"/>
+
+
+        <ResourceDictionary>
+            <system:Double x:Key = "HomeImageOpacity">0.7</system:Double>
+            <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="#181818" />
+            <SolidColorBrush x:Key="WhiteBrush"  Color="#E6252525" />
+            <SolidColorBrush x:Key="WhiteBrush50" Color="#FF101010" />
+
+            <!--<SolidColorBrush x:Key="WhiteBrush100" Color="#ECECEC"/>-->
+            <SolidColorBrush x:Key="WhiteBrush100"  Color="#212121" />
+            <SolidColorBrush x:Key="LightGrayBrush"  Color="#A5A4A4" />
+            <SolidColorBrush x:Key="LightGrayBrush100" Color="#5C5C5C" />
+            <SolidColorBrush x:Key="LightGrayBrush150"  Color="#CBCBCB" />
+            <SolidColorBrush x:Key="LightGrayBrush200" Color="#D9D9D9" />
+
+            <!-- used for regular text color -->
+            <SolidColorBrush x:Key="BlackForegroundBrush"  Color="#BBBBBB" />
+            <SolidColorBrush x:Key="DarkGrayBrush"  Color="#E4E1E1" />
+            <SolidColorBrush x:Key="DarkGrayBrush100"  Color="#F7F4F4" />
+            <SolidColorBrush x:Key="DarkGrayBrush200"  Color="#E1E1E1" />
+            <SolidColorBrush x:Key="GrayBrush300" Color="#C8C8C8" />
+            <!--used for Foreground Storage-->
+            <SolidColorBrush x:Key="GrayBrush310"  Color="#D9D7D7" />
+            <SolidColorBrush x:Key="GrayBrush280"  Color="#BBBBBB" />
+            <SolidColorBrush x:Key="GrayBrush290"  Color="#BDBDBD" />
+            <!-- used for text color-->
+            <SolidColorBrush x:Key="GrayBrush250"  Color="#BDBDBD" />
+            <SolidColorBrush x:Key="GrayBrush200" Color="#616161" />
+            <SolidColorBrush x:Key="GrayBrush50" Color="#7A7A7A" />
+            <SolidColorBrush x:Key="GrayBrush" Color="#BBBBBB" />
+            <SolidColorBrush x:Key="DimGrayBrush"  Color="#A0A0A0" />
+            <SolidColorBrush x:Key="SideBarBackgroundBrush" Color="#252525" />
+            <SolidColorBrush x:Key="JobFieldForeground"  Color="#FFF0F0F0" />
+            <SolidColorBrush x:Key="HomePageForeground" Color="#BBBBBB"/>
+            <!--used for border brush-->
+            <SolidColorBrush x:Key="BorderBrushGainsboro"
+                             Color="#5C5C5C" />
+
+            <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="#96252525" />
+            <SolidColorBrush x:Key="TransparentBackgroundBrush100"  Color="#B9252525" />
+            <SolidColorBrush x:Key="TransparentBackgroundBrush200"  Color="#E6252525" />
+            <SolidColorBrush x:Key="TransparentBackgroundBrush300"  Color="#D4252525" />
+            <SolidColorBrush x:Key="Transparent200" Color="#C9313131" />
+            <!--MachineJobSelectionView Grid Background-->
+            <SolidColorBrush x:Key="TransparentBackgroundBrush400"  Color="#B1252525" />
+            <SolidColorBrush x:Key="TransparentBackgroundBrush420"  Color="#A6000000" />
+            <!--Storage.Views.MainView-->
+            <SolidColorBrush x:Key="TransparentBackgroundBrush500" Color="#8B252525" />
+            <!--MachineTechView-->
+            <SolidColorBrush x:Key="TransparentBackgroundBrush450"  Color="#7E252525" />
+            <SolidColorBrush x:Key="TransparentBackgroundBrush600"  Color="#70252525" />
+            <SolidColorBrush x:Key="SelectionFillBrush" Color="#338D8D8D" />
+
+            <!--Dispenser background-->
+            <SolidColorBrush x:Key="TransparentBackgroundBrush700" Color="#68313131" />
+
+            <!--base background and foreground-->
+            <SolidColorBrush x:Key="MainWindow.Background" Color="#181818"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.Foreground" Color="#BBBBBB"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.Header" Color="#383838"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.WindowTitleColorBrush" Color="#202020" />
+            <SolidColorBrush x:Key="Dialog.Background" Color="#383838"></SolidColorBrush>
+            <SolidColorBrush x:Key="Dialog.Foreground" Color="#F1F1F1"></SolidColorBrush>
+            <SolidColorBrush x:Key="Combobox.Background" Color="#252525"></SolidColorBrush>
+            <SolidColorBrush x:Key="Card.Background" Color="#202020"></SolidColorBrush>
+            <SolidColorBrush x:Key="ToggleButton.TrackBaceColor" Color="#717171"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.SubMenuItem.Background" Color="#3A3A3A"></SolidColorBrush>
+            <SolidColorBrush x:Key="Statistics.BorderBrush" Color="#D6D6D6"/>
+            <SolidColorBrush x:Key="Hexagon.ForegroundBrush" Color="White"/>
+            <SolidColorBrush x:Key="AutoCompleteTextBox.Popup.Background" Color="#383838"></SolidColorBrush>
+            <SolidColorBrush x:Key="AutoCompleteTextBox.Popup.BorderBrush" Color="#BBBBBB"></SolidColorBrush>
+            <SolidColorBrush x:Key="ComboBox.Popup.Background" Color="red"></SolidColorBrush>
+
+
+            <!--material design colors-->
+            <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}" />
+            <SolidColorBrush x:Key="AccentColorBrush4" Color="{DynamicResource Primary200}" />
+            <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{DynamicResource Primary700}" />
+            <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{DynamicResource Primary500Foreground}" />
+            <LinearGradientBrush x:Key="ProgressBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
+                <GradientStop Color="{DynamicResource Primary700}" Offset="0" />
+                <GradientStop Color="{DynamicResource Primary300}" Offset="1" />
+            </LinearGradientBrush>
+            <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" />
+
+            <!--Colors-->
+            <Color x:Key="borderColor">#5C5C5C</Color>
+            <Color x:Key="graphGridLinesColor">#5C5C5C</Color>
+            <Color x:Key="graphsMarkerColor">#5C5C5C</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="#FFC6C6C6"></SolidColorBrush>
+            <SolidColorBrush x:Key="MaterialDesignFlatButtonClick"
+                             Color="#C13E3E3E"></SolidColorBrush>
+            <SolidColorBrush x:Key="MaterialDesignBody"
+                             Color="#FFBBBBBB"></SolidColorBrush>
+            <SolidColorBrush x:Key="MaterialDesignSelection"
+                             Color="#FF474747"></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>
+            <LinearGradientBrush StartPoint="0.5,0"
+                                 x:Key="Logging.Background"
+                                 EndPoint="0.5,1">
+                <GradientStop Color="Black" />
+                <GradientStop Color="#FF2B2B2B"
+                              Offset="1" />
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="UserRoles.Background">
+                <GradientStop Color="#181818" />
+                <GradientStop Color="#FF474646"
+                              Offset="1" />
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0.8" EndPoint="0.5,1"  x:Key="UserRoles.GridBackground">
+                <GradientStop/>
+                <GradientStop Color="#55181818" Offset="0"/>
+            </LinearGradientBrush>
+
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="LogBorder.Background">
+                <GradientStop Color="#15DBDBDB"/>
+                <GradientStop Color="Black" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="LoadingBorderGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
+                <GradientStop Color="#383838"/>
+                <GradientStop Color="#777777" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="SelectedSegmentGradientBrush">
+                <GradientStop Color="#FFAAAAAA" Offset="0" />
+                <GradientStop Color="{StaticResource AccentColor}" Offset="1.6" />
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="SegmentGradientBrush">
+                <GradientStop Color="#FEBDBDBD" Offset="0" />
+                <GradientStop Color="#004E4E4E" Offset="0.9" />
+            </LinearGradientBrush>
+
+
+            <Style x:Key="{x:Type ToolTip}" TargetType="ToolTip">
+                <Setter Property="HasDropShadow" Value="True" />
+                <Setter Property="Foreground" Value="{StaticResource MainWindow.Foreground}" />
+                <Setter Property="Opacity"  Value="0.95" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="ToolTip">
+                            <Border Name="Border"
+                                    Background="{StaticResource MainWindow.Background}"
+                                    BorderBrush="{StaticResource MainWindow.Background}"
+                                    BorderThickness="1"
+                                    Width="{TemplateBinding Width}"
+                                    Height="{TemplateBinding Height}">
+                                <ContentPresenter Margin="2" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="HasDropShadow" Value="true">
+                                    <Setter TargetName="Border"  Property="CornerRadius"  Value="0" />
+                                    <Setter TargetName="Border"   Property="SnapsToDevicePixels"  Value="true" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+        </ResourceDictionary>
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
index 90b3b0829..25f72f8d4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
@@ -1,9 +1,14 @@
 <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">
+                    xmlns:local="clr-namespace:Tango.MachineStudio.Common.Themes"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
     <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml"/>
+
         <ResourceDictionary>
-        <SolidColorBrush x:Key="OrangeBrush" Color="#FFA300"/>
+            <system:Double x:Key = "HomeImageOpacity">1</system:Double>
+            <SolidColorBrush x:Key="OrangeBrush" Color="#FFA300"/>
         <SolidColorBrush x:Key="OrangeBrush200" Color="#FFA65F"/>
         <SolidColorBrush x:Key="OrangeBrush250" Color="#E79F20"/>
             <SolidColorBrush x:Key="OrangeCanceledBrush" Color="#EF832B"/>
@@ -44,9 +49,7 @@
         <SolidColorBrush x:Key="LilacBrush100" Color="#682EBE"/>
         <SolidColorBrush x:Key="LilacBrush200" Color="#532990"/>
 
-
-
-            <SolidColorBrush x:Key="WhiteTextBrush" Color="White"/>
+        <SolidColorBrush x:Key="WhiteTextBrush" Color="White"/>
         <SolidColorBrush x:Key="WhiteBackgroundBrush" Color="White"/>
         <SolidColorBrush x:Key="WhiteBrush" Color="#E6FFFFFF"/>
         <SolidColorBrush x:Key="WhiteBrush50" Color="#FFF1F1F1"/>
@@ -73,6 +76,13 @@
         <SolidColorBrush x:Key="GrayBrush50" Color="#7A7A7A"/>
         <SolidColorBrush x:Key="GrayBrush" Color="Gray"/>
         <SolidColorBrush x:Key="DimGrayBrush" Color="DimGray"/>
+            <SolidColorBrush x:Key="SideBarBackgroundBrush" Color="white" />
+            <SolidColorBrush x:Key="JobFieldForeground" Color="#FF494949"/>
+            <SolidColorBrush x:Key="HomePageForeground" Color="#FF494949"/>
+
+            <!--used for border brush-->
+            <SolidColorBrush x:Key="BorderBrushGainsboro" Color="Gainsboro"/>
+         
 
 
             <LinearGradientBrush x:Key="BlueGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
@@ -87,26 +97,49 @@
         <SolidColorBrush x:Key="Transparent200" Color="#C9F6F6F6"/>
          <!--MachineJobSelectionView Grid Background-->
         <SolidColorBrush x:Key="TransparentBackgroundBrush400" Color="#B1FFFFFF"/>
-        <!--Storage.Views.MainView-->
-        <SolidColorBrush x:Key="TransparentBackgroundBrush500" Color="#8BFFFFFF"/>
+            <SolidColorBrush x:Key="TransparentBackgroundBrush420" Color="#A6FFFFFF"/>
             
-        <!--MachineTechView-->
+        <!--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="TransparentBackgroundBrush600" Color="#70FFFFFF"/>
         <SolidColorBrush x:Key="SelectionFillBrush" Color="#338D8D8D"/>
-        
+            <!--Dispenser background-->
+            <SolidColorBrush x:Key="TransparentBackgroundBrush700" Color="#68F6F6F6"/>
+
             <!--base background and foreground-->
-        <SolidColorBrush x:Key="MainWindow.Background" Color="White"></SolidColorBrush>
-        <SolidColorBrush x:Key="MainWindow.Foreground" Color="#FF494949"></SolidColorBrush>
-            
+            <SolidColorBrush x:Key="MainWindow.Background" Color="White"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.Foreground" Color="#FF494949"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.Header" Color="#03A9F4"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.WindowTitleColorBrush" Color="#FF0288d1" />
+            <SolidColorBrush x:Key="Dialog.Background" Color="White"></SolidColorBrush>
+            <SolidColorBrush x:Key="Dialog.Foreground" Color="black"></SolidColorBrush>
+            <SolidColorBrush x:Key="Combobox.Background" Color="Transparent"></SolidColorBrush>
+            <SolidColorBrush x:Key="Card.Background" Color="Transparent"></SolidColorBrush>
+            <SolidColorBrush x:Key="ToggleButton.TrackBaceColor"  Color="Black"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.SubMenuItem.Background" Color="{x:Static SystemColors.MenuColor}"></SolidColorBrush>
+            <SolidColorBrush x:Key="Statistics.BorderBrush" Color="#181818"/>
+            <SolidColorBrush x:Key="Hexagon.ForegroundBrush" Color="black"/>
+            <SolidColorBrush x:Key="AutoCompleteTextBox.Popup.Background" Color="White"></SolidColorBrush>
+            <SolidColorBrush x:Key="AutoCompleteTextBox.Popup.BorderBrush" Color="#BDBDBD"></SolidColorBrush>
+
             <!--material design colors-->
-            <SolidColorBrush x:Key="HighlightBrush" Color="#FF0288d1" />
+            <!--<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" />
+            <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="#FFFFFFFF" />-->
+            <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}" />
+            <SolidColorBrush x:Key="AccentColorBrush4" Color="{DynamicResource Primary200}" />
+            <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{DynamicResource Primary700}" />
+            <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{DynamicResource Primary500Foreground}" />
             <LinearGradientBrush x:Key="ProgressBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
                 <GradientStop Color="#0288d1" Offset="0" />
                 <GradientStop Color="#4fc3f7" Offset="1" />
@@ -153,6 +186,34 @@
                 <GradientStop Color="#DEDEDE" Offset="1"/>
             </LinearGradientBrush>
             <SolidColorBrush Color="#FFECECEC" x:Key="topBarBackgroundBrush"></SolidColorBrush>
-    </ResourceDictionary>
+            <LinearGradientBrush StartPoint="0.5,0" x:Key="Logging.Background" EndPoint="0.5,1">
+                <GradientStop Color="White"/>
+                <GradientStop Color="#FFEAEAEA" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="UserRoles.Background" >
+                <GradientStop Color="White"/>
+                <GradientStop Color="#FFD6D6D6" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="UserRoles.GridBackground">
+                <GradientStop/>
+                <GradientStop Color="White" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="LogBorder.Background">
+                <GradientStop Color="#35FFFFFF"/>
+                <GradientStop Color="White" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="LoadingBorderGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
+                <GradientStop Color="#03A9F4"/>
+                <GradientStop Color="#0081BB" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="SelectedSegmentGradientBrush">
+                <GradientStop Color="White" Offset="0" />
+                <GradientStop Color="{StaticResource AccentColor}" Offset="2" />
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="SegmentGradientBrush">
+                <GradientStop Color="#00EEEEEE" Offset="0" />
+                <GradientStop Color="#FFB5B5B5" Offset="1" />
+            </LinearGradientBrush>
+        </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 11ab79afd..618035112 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml
@@ -12,6 +12,7 @@
                 <!-- 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"/>
+                <resources:SharedResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Themes/DarkThemeColors.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/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
index 2e2b1a014..edcc4ba39 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -64,12 +64,14 @@ namespace Tango.MachineStudio.UI
             LogManager.Log("Application Started...");
 
             LogManager.LogReferencedAssemblies();
+            var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
+            //add current theme
+            MachineStudioTheme wTheme = settings.Theme;
 
             base.OnStartup(e);
 
             LogManager.Categories.Clear();
 
-            var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
 
             if (settings.LoggingCategories.Count == 0)
             {
@@ -104,7 +106,9 @@ namespace Tango.MachineStudio.UI
             {
                 LogManager.Log("EF Caching is disabled");
             }
+
         }
+        
 
         #region Global Exception Trapping
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
index 810114144..eecbcf8ad 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
@@ -9,7 +9,7 @@
         xmlns:sharedControls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
         mc:Ignorable="d"
         Title="Tango" Height="800" Width="1280"  Foreground="{StaticResource MainWindow.Foreground}" 
-                     BorderThickness="1"  BorderBrush="{StaticResource AccentColorBrush}" Background="{DynamicResource MainWindow.Background}">
+                     BorderThickness="1"  BorderBrush="{StaticResource AccentColorBrush}" Background="{DynamicResource MainWindow.Background}" WindowTitleBrush="{StaticResource MainWindow.WindowTitleColorBrush}">
 
     <Grid x:Name="main_grid">
         <Grid.Background>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml
index 2eb1080cb..41405f7fb 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml
@@ -10,7 +10,7 @@
         Title="Machine Studio" MinHeight="220" SizeToContent="WidthAndHeight" MinWidth="600" AllowsTransparency="True" WindowStyle="None" WindowStartupLocation="CenterOwner" Background="Transparent" ShowInTaskbar="False">
     <Grid>
         <Grid>
-            <Border Background="White" CornerRadius="10" Padding="10" Margin="20">
+            <Border Background="{StaticResource Dialog.Background}" CornerRadius="10" Padding="10" Margin="20">
                 <Border.Effect>
                     <DropShadowEffect ShadowDepth="0" BlurRadius="10"></DropShadowEffect>
                 </Border.Effect>
@@ -18,7 +18,7 @@
                 <Grid>
                     <ContentPresenter x:Name="presenter" Content="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=InnerContent}"></ContentPresenter>
 
-                    <Button Command="{Binding CloseCommand}" HorizontalAlignment="Right" VerticalAlignment="Top" Width="20" Height="20" Margin="0 -6 -4 0" Padding="0" Style="{StaticResource MaterialDesignFlatButton}" Foreground="Black">
+                    <Button Command="{Binding CloseCommand}" HorizontalAlignment="Right" VerticalAlignment="Top" Width="20" Height="20" Margin="0 -6 -4 0" Padding="0" Style="{StaticResource MaterialDesignFlatButton}" Foreground="{StaticResource Dialog.Foreground}">
                         <materialDesign:PackIcon Kind="Close" Width="16" Height="16"></materialDesign:PackIcon>
                     </Button>
                 </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/MessageBoxWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/MessageBoxWindow.xaml
index 8f9512236..e037e3630 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/MessageBoxWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/MessageBoxWindow.xaml
@@ -15,7 +15,7 @@
     </Window.Resources>
 
     <Grid>
-        <Border Background="White" CornerRadius="10" Padding="10" Margin="20">
+        <Border Background="{StaticResource Dialog.Background}" CornerRadius="10" Padding="10" Margin="20">
             <Border.Effect>
                 <DropShadowEffect ShadowDepth="0" BlurRadius="10"></DropShadowEffect>
             </Border.Effect>
@@ -30,8 +30,8 @@
                 </StackPanel>
                 <Grid>
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Margin="0 30 0 0">
-                        <materialDesign:PackIcon Kind="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=IconKind}" VerticalAlignment="Top" Width="50" Height="50" Foreground="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=IconColor}" />
-                        <TextBlock Padding="0 10 0 0" TextWrapping="Wrap" Margin="10 0 0 0" VerticalAlignment="Top" FontSize="14" Text="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=Message}" Width="400"></TextBlock>
+                        <materialDesign:PackIcon Kind="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=IconKind}" VerticalAlignment="Top" Width="50" Height="50" Foreground="{StaticResource Dialog.Foreground}" />
+                        <TextBlock Padding="0 10 0 0" TextWrapping="Wrap" Margin="10 0 0 0" VerticalAlignment="Top" FontSize="14" Text="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=Message}" Width="400" Foreground="{StaticResource Dialog.Foreground}"></TextBlock>
                     </StackPanel>
                 </Grid>
             </DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/TextInputBoxWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/TextInputBoxWindow.xaml
index 5e27071ec..5cc3d719b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/TextInputBoxWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/TextInputBoxWindow.xaml
@@ -15,7 +15,7 @@
     </Window.Resources>
 
     <Grid>
-        <Border Background="White" CornerRadius="10" Padding="10" Margin="20">
+        <Border Background="{StaticResource Dialog.Background}" CornerRadius="10" Padding="10" Margin="20">
             <Border.Effect>
                 <DropShadowEffect ShadowDepth="0" BlurRadius="10"></DropShadowEffect>
             </Border.Effect>
@@ -32,10 +32,10 @@
                     <StackPanel VerticalAlignment="Top" Margin="0 30 0 0">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=IconKind}" VerticalAlignment="Top" Width="50" Height="50" Foreground="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=IconColor}" />
-                            <TextBlock Padding="0 10 0 0" TextWrapping="Wrap" Margin="10 0 0 0" VerticalAlignment="Top" FontSize="14" Text="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=Message}" Width="400"></TextBlock>
+                            <TextBlock Padding="0 10 0 0" TextWrapping="Wrap" Margin="10 0 0 0" VerticalAlignment="Top" FontSize="14" Text="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=Message}" Width="400" Foreground="{StaticResource TransparentBackgroundBrush}"></TextBlock>
                         </StackPanel>
 
-                        <TextBox x:Name="txtText" Margin="60 0 20 0" materialDesign:HintAssist.Hint="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=Hint}" Text="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=Response,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                        <TextBox x:Name="txtText" Margin="60 0 20 0" materialDesign:HintAssist.Hint="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=Hint}" Text="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=Response,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{StaticResource Dialog.Foreground}"></TextBox>
                     </StackPanel>
                 </Grid>
             </DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index b2faf346e..31ba4e57d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -5,6 +5,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -174,6 +175,11 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// </summary>
         public RelayCommand AboutCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the about command.
+        /// </summary>
+        public RelayCommand<MachineStudioTheme> ChangeAppThemeCommand { get; set; }
+
         private IAuthenticationProvider _authenticationProvider;
         /// <summary>
         /// Gets or sets the authentication provider.
@@ -336,6 +342,8 @@ namespace Tango.MachineStudio.UI.ViewModels
             TangoMessenger.Default.Register<Messages.ForcedUpdateMessage>((x) => DisableCheckForUpdates = true);
 
             AboutCommand = new RelayCommand(ShowAboutDialog);
+
+            ChangeAppThemeCommand = new RelayCommand<MachineStudioTheme>(ChangeTheme);
         }
 
         private void MachineEventsStateProvider_EventsResolved(object sender, IEnumerable<MachinesEvent> e)
@@ -926,5 +934,15 @@ namespace Tango.MachineStudio.UI.ViewModels
                 IsApplicationReady = true;
             }
         }
+
+        private void ChangeTheme(MachineStudioTheme theme)
+        {
+            var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
+            //add current theme
+            settings.Theme = theme;
+            settings.Save();
+
+            _notificationProvider.ShowInfo("Changes will be applies after application restart.");
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
index bf9a52b98..a5ffe9964 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
@@ -10,7 +10,7 @@
              xmlns:bl="clr-namespace:Tango.BL;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300" Width="600" Height="700" Background="White" d:DataContext="{d:DesignInstance Type=vm:AboutViewVM, IsDesignTimeCreatable=False}" DataContext="{Binding AboutViewVM, Source={StaticResource Locator}}">
+             d:DesignHeight="300" d:DesignWidth="300" Width="600" Height="700" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:AboutViewVM, IsDesignTimeCreatable=False}" DataContext="{Binding AboutViewVM, Source={StaticResource Locator}}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <converters:VersionToShortVersionConverter x:Key="VersionToShortVersionConverter" />
@@ -61,23 +61,23 @@
                             <TextBlock Text="{Binding MachineStudioSettings.MachineServiceAddress}"></TextBlock>
                             <TextBlock FontWeight="SemiBold">Data Source:</TextBlock>
                             <TextBlock><Run Text="{Binding DataSource.Address,Mode=OneWay}"></Run>
-                                <Run>(</Run><Run Foreground="Gray" Text="{Binding DataSource.Catalog,Mode=OneWay}"></Run><Run>)</Run>
+                                <Run>(</Run><Run Foreground="{StaticResource GrayBrush}" Text="{Binding DataSource.Catalog,Mode=OneWay}"></Run><Run>)</Run>
                             </TextBlock>
                             <TextBlock FontWeight="SemiBold">Caching Mode:</TextBlock>
                             <DockPanel>
                                 <ComboBox Width="150" DockPanel.Dock="Left" ItemsSource="{Binding Source={x:Type bl:ObservablesContextInMemoryCachingMode},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding MachineStudioSettings.CachingMode}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
-                                <TextBlock Margin="20 0 0 0" Foreground="Gray" VerticalAlignment="Center">(Requires restart)</TextBlock>
+                                <TextBlock Margin="20 0 0 0" Foreground="{StaticResource GrayBrush}" VerticalAlignment="Center">(Requires restart)</TextBlock>
                             </DockPanel>
                             <TextBlock FontWeight="SemiBold">Job Upload Strategy:</TextBlock>
                             <DockPanel>
                                 <ComboBox Width="150" DockPanel.Dock="Left" ItemsSource="{Binding Source={x:Type pmrPrinting:JobUploadStrategy},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding MachineStudioSettings.JobUploadStrategy}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
-                                <TextBlock Margin="20 0 0 0" Foreground="Gray" VerticalAlignment="Center">(Requires restart)</TextBlock>
+                                <TextBlock Margin="20 0 0 0" Foreground="{StaticResource GrayBrush}" VerticalAlignment="Center">(Requires restart)</TextBlock>
                             </DockPanel>
                         </controls:TableGrid>
 
                         <DockPanel Margin="0 0 0 0">
                             <TextBlock DockPanel.Dock="Top" FontWeight="SemiBold">Change Log:</TextBlock>
-                            <TextBox Margin="0 5 0 0" Style="{x:Null}" IsReadOnly="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" TextWrapping="Wrap" AcceptsReturn="True" Foreground="DimGray" Text="{Binding ApplicationManager.ChangeLog,Mode=OneWay}">
+                            <TextBox Margin="0 5 0 0" Style="{x:Null}" IsReadOnly="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" TextWrapping="Wrap" AcceptsReturn="True" Foreground="{StaticResource DimGrayBrush}" Text="{Binding ApplicationManager.ChangeLog,Mode=OneWay}">
 
                             </TextBox>
                         </DockPanel>
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 8dfb04f1f..1734a9c94 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
@@ -12,7 +12,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
-              d:DesignHeight="300" d:DesignWidth="300" Width="640" Height="500" Background="White" DataContext="{Binding ConnectedMachineViewVM, Source={StaticResource Locator}}">
+              d:DesignHeight="300" d:DesignWidth="300" Width="640" Height="500" Background="{StaticResource Dialog.Background}" DataContext="{Binding ConnectedMachineViewVM, Source={StaticResource Locator}}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></converters:BooleanToVisibilityConverter>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectionLostView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectionLostView.xaml
index ded02ab47..b2fa2b3e3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectionLostView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectionLostView.xaml
@@ -7,7 +7,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
-             Width="559" Height="266" Background="White" d:DataContext="{d:DesignInstance Type=vm:ConnectionLostViewVM, IsDesignTimeCreatable=False}">
+             Width="559" Height="266" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:ConnectionLostViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
     <Grid>
         <Grid>
             <Grid.RowDefinitions>
@@ -43,7 +43,7 @@
                         </TextBlock>
 
                         <TextBlock Margin="0 20 0 0" FontWeight="SemiBold">Reason:</TextBlock>
-                        <TextBlock Foreground="Gray" Margin="0 2 0 0" Text="{Binding Exception}" Height="75" TextWrapping="Wrap" TextTrimming="CharacterEllipsis">
+                        <TextBlock Foreground="{StaticResource GrayBrush}" Margin="0 2 0 0" Text="{Binding Exception}" Height="75" TextWrapping="Wrap" TextTrimming="CharacterEllipsis">
 
                         </TextBlock>
                     </StackPanel>
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 9af5c6b06..233f8e4cb 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
@@ -9,7 +9,7 @@
              xmlns:vm="clr-namespace:Tango.MachineStudio.UI.ViewModels"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300" Width="800" Height="400" Background="White" d:DataContext="{d:DesignInstance Type=vm:FirmwareUpgradeViewVM, IsDesignTimeCreatable=False}">
+             d:DesignHeight="300" d:DesignWidth="300" Width="800" Height="400" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:FirmwareUpgradeViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
@@ -39,7 +39,7 @@
                         <Image Source="/Images/firmware_upgrade.png" Height="100" />
                         <TextBlock VerticalAlignment="Center" FontSize="30" FontWeight="SemiBold" Margin="20 0 0 0">FIRMWARE UPGRADE</TextBlock>
                     </StackPanel>
-                    <Rectangle Stroke="Gainsboro"  StrokeDashArray="5 5 5 5" Margin="20 10" />
+                    <Rectangle Stroke="{StaticResource BorderBrushGainsboro}"  StrokeDashArray="5 5 5 5" Margin="20 10" />
                 </StackPanel>
             </Grid>
 
@@ -61,7 +61,7 @@
                                 <StackPanel>
                                     <DockPanel Margin="0 30 0 0" Width="600" HorizontalAlignment="Left">
                                         <Button DockPanel.Dock="Right" Margin="10 0 0 0" Command="{Binding SelectCommand}">SELECT</Button>
-                                        <TextBox Style="{x:Null}" VerticalContentAlignment="Center" BorderBrush="{StaticResource AccentColorBrush}" Padding="5 0" Foreground="DimGray" IsReadOnly="True" Text="{Binding SelectedFile,Mode=OneWay}"></TextBox>
+                                        <TextBox Style="{x:Null}" VerticalContentAlignment="Center" BorderBrush="{StaticResource AccentColorBrush}" Padding="5 0" Foreground="{StaticResource DimGrayBrush}" IsReadOnly="True" Text="{Binding SelectedFile,Mode=OneWay}"></TextBox>
                                     </DockPanel>
 
                                     <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
@@ -86,7 +86,7 @@
                     <Grid>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                             <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>
+                            <TextBlock Margin="0 40 0 0" HorizontalAlignment="Center" Foreground="{StaticResource GrayBrush}" 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="{StaticResource RedBrush100}" BorderBrush="{StaticResource RedBrush100}" Margin="0 40 0 0" Height="35" Command="{Binding AbortCommand}">ABORT</Button>
                         </StackPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
index 6e804c61d..df1c1b831 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
@@ -27,7 +27,7 @@
         </Grid>
 
 
-        <TextBlock Foreground="Gray" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="40" FontSize="20" FontWeight="SemiBold" FontStyle="Italic">
+        <TextBlock Foreground="{StaticResource GrayBrush}" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="40" FontSize="20" FontWeight="SemiBold" FontStyle="Italic">
                         <Run>v</Run>
                         <Run Text="{Binding ApplicationManager.Version,Converter={StaticResource VersionToShortVersionConverter},Mode=OneWay,ConverterParameter='3'}"></Run>
         </TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
index d39b1226c..69ce4c855 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
@@ -10,7 +10,7 @@
              xmlns:emulations="clr-namespace:Tango.Emulations.ExternalBridge;assembly=Tango.Emulations"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300" Width="630" Height="400" Background="White" DataContext="{Binding MachineConnectionViewVM, Source={StaticResource Locator}}">
+             d:DesignHeight="300" d:DesignWidth="300" Width="630" Height="400" Background="{StaticResource Dialog.Background}" DataContext="{Binding MachineConnectionViewVM, Source={StaticResource Locator}}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></converters:BooleanToVisibilityConverter>
@@ -53,7 +53,7 @@
                     </Grid>
 
                     <Grid Grid.Row="1">
-                        <ListBox ItemsSource="{Binding Scanner.AvailableMachines}" SelectedItem="{Binding SelectedMachine}" Margin="0 0 0 7" BorderThickness="1" BorderBrush="Gainsboro" HorizontalContentAlignment="Stretch">
+                        <ListBox ItemsSource="{Binding Scanner.AvailableMachines}" SelectedItem="{Binding SelectedMachine}" Margin="0 0 0 7" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}" HorizontalContentAlignment="Stretch">
                             <ListBox.Resources>
                                 <DataTemplate DataType="{x:Type integration:ExternalBridgeTcpClient}">
                                     <DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineLoginView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineLoginView.xaml
index 14967686f..7d0b2e25c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineLoginView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineLoginView.xaml
@@ -9,7 +9,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="200" d:DesignWidth="550" Background="White" DataContext="{Binding MachineLoginViewVM, Source={StaticResource Locator}}">
+             d:DesignHeight="200" d:DesignWidth="550" Background="{StaticResource MainWindow.Background}" DataContext="{Binding MachineLoginViewVM, Source={StaticResource Locator}}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineSerialView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineSerialView.xaml
index b988d0a76..eea90c7b9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineSerialView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineSerialView.xaml
@@ -8,7 +8,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:vm="clr-namespace:Tango.MachineStudio.UI.ViewModels"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
-             mc:Ignorable="d" Width="559" Height="266" Background="White" d:DataContext="{d:DesignInstance Type=vm:MachineSerialViewVM, IsDesignTimeCreatable=False}">
+             mc:Ignorable="d" Width="559" Height="266" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:MachineSerialViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <autoCompleteMachine:MachinesProvider x:Key="MachinesProvider" />
@@ -54,7 +54,7 @@
                                                     <Image Source="/Images/machine-trans.png" Width="24" RenderOptions.BitmapScalingMode="Fant" />
                                                     <TextBlock Margin="10 0 0 0" FontWeight="SemiBold" Text="{Binding SerialNumber}" VerticalAlignment="Center"></TextBlock>
                                                 </StackPanel>
-                                                <TextBlock DockPanel.Dock="Right" HorizontalAlignment="Right" Text="{Binding Name}" Foreground="Gray" VerticalAlignment="Center"></TextBlock>
+                                                <TextBlock DockPanel.Dock="Right" HorizontalAlignment="Right" Text="{Binding Name}" Foreground="{StaticResource GrayBrush}" VerticalAlignment="Center"></TextBlock>
                                             </DockPanel>
                                         </Border>
                                     </DataTemplate>
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 57b8335c5..5513b65ac 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -9,6 +9,7 @@
              xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:common="clr-namespace:Tango.MachineStudio.Common;assembly=Tango.MachineStudio.Common"
              xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
@@ -43,7 +44,7 @@
 
         <materialDesign:DrawerHost IsLeftDrawerOpen="{Binding Source={x:Reference MenuToggleButton}, Path=IsChecked}">
             <materialDesign:DrawerHost.LeftDrawerContent>
-                <DockPanel LastChildFill="False">
+                <DockPanel LastChildFill="False" TextElement.Foreground="{StaticResource MainWindow.Foreground}" >
                     <StackPanel MinWidth="300" DockPanel.Dock="Top">
                         <Grid>
                             <ToggleButton Style="{StaticResource MaterialDesignHamburgerToggleButton}" 
@@ -90,8 +91,8 @@
                             </ListBoxItem>
                         </StackPanel>
                         <StackPanel Margin="10 10 0 0">
-                            <TextBlock Foreground="Silver" FontSize="16" FontWeight="Bold" FontStyle="Italic">MODULES</TextBlock>
-                            <Separator Background="Gainsboro" />
+                            <TextBlock Foreground="{StaticResource borderBrush}" FontSize="16" FontWeight="Bold" FontStyle="Italic">MODULES</TextBlock>
+                            <Separator Background="{StaticResource BorderBrushGainsboro}" />
                         </StackPanel>
                         <ListBox ItemsSource="{Binding StudioModuleLoader.UserModules}" HorizontalContentAlignment="Stretch" FontSize="14">
                             <ListBox.ItemContainerStyle>
@@ -125,7 +126,7 @@
                     </StackPanel>
 
                     <StackPanel DockPanel.Dock="Bottom">
-                        <Separator Margin="0 10 0 0" Background="Gainsboro" />
+                        <Separator Margin="0 10 0 0" Background="{StaticResource BorderBrushGainsboro}" />
                         <ListBoxItem>
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="PreviewMouseUp">
@@ -142,11 +143,11 @@
             </materialDesign:DrawerHost.LeftDrawerContent>
             <DockPanel>
                 <materialDesign:ColorZone Padding="16" materialDesign:ShadowAssist.ShadowDepth="Depth2"
-                                            Mode="PrimaryMid" DockPanel.Dock="Top">
+                                            Mode="PrimaryMid" DockPanel.Dock="Top" Background="{StaticResource MainWindow.Header}">
                     <DockPanel>
                         <ToggleButton Style="{StaticResource MaterialDesignHamburgerToggleButton}" IsChecked="{Binding IsMenuOpened}"
                                         x:Name="MenuToggleButton"/>
-                        <materialDesign:PopupBox DockPanel.Dock="Right" PlacementMode="BottomAndAlignRightEdges" StaysOpen="False">
+                        <materialDesign:PopupBox DockPanel.Dock="Right" PlacementMode="BottomAndAlignRightEdges" StaysOpen="False" >
                             <StackPanel>
                                 <Button Command="{Binding ConnectCommand}">
                                     <StackPanel Orientation="Horizontal">
@@ -202,13 +203,22 @@
                                     </Button>
                                     <Separator/>
                                 </StackPanel>
+                                <Separator/>
+                                <MenuItem x:Name="menuTheme" Header="Theme" MouseEnter="MenuItem_MouseEnter">
+                                    <MenuItem Header="Light" Command="{Binding ChangeAppThemeCommand}" CommandParameter="{x:Static common:MachineStudioTheme.Light}" Background="{StaticResource MainWindow.SubMenuItem.Background}"></MenuItem>
+                                    <MenuItem Header="Dark" Command="{Binding ChangeAppThemeCommand}" CommandParameter="{x:Static common:MachineStudioTheme.Dark}" Background="{StaticResource MainWindow.SubMenuItem.Background}"></MenuItem>
+                                </MenuItem>
+                                <Separator/>
                                 <Button Command="{Binding AboutCommand}">
                                     <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Kind="Information" Width="24" Height="24" />
-                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">About</TextBlock>
+                                        <materialDesign:PackIcon Kind="Information"
+                                                                 Width="24"
+                                                                 Height="24" />
+                                        <TextBlock Margin="5 0 0 0"
+                                                   VerticalAlignment="Center">About</TextBlock>
                                     </StackPanel>
                                 </Button>
-                                <Separator/>
+                                <Separator />
                                 <Button Command="{Binding ExitCommand}">
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon Kind="CloseCircleOutline" Width="24" Height="24" />
@@ -404,7 +414,7 @@
                                         <RowDefinition Height="*"/>
                                     </Grid.RowDefinitions>
                                     <Grid>
-                                        <StackPanel Margin="30 20" HorizontalAlignment="Left">
+                                        <StackPanel Margin="30 20" HorizontalAlignment="Left" TextElement.Foreground="#9A9A9A">
                                             <TextBlock FontSize="35">Welcome to Machine Studio</TextBlock>
                                             <TextBlock HorizontalAlignment="Left" Margin="350 5 0 0" FontStyle="Italic" FontSize="16">The below modules are displayed according to your user roles and permissions.</TextBlock>
                                         </StackPanel>
@@ -421,21 +431,21 @@
 
                                                 <ItemsControl.ItemTemplate>
                                                     <DataTemplate>
-                                                        <materialDesign:Card Width="300" Margin="10" Height="400" Visibility="{Binding InNewWindow,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                                        <materialDesign:Card Background="{StaticResource WhiteBackgroundBrush}" Foreground="{StaticResource JobFieldForeground}" Width="300" Margin="10" Height="400" Visibility="{Binding InNewWindow,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                                             <Grid>
                                                                 <Grid.RowDefinitions>
                                                                     <RowDefinition Height="180" />
                                                                     <RowDefinition Height="*" />
                                                                     <RowDefinition Height="Auto" />
                                                                 </Grid.RowDefinitions>
-                                                                <Image Source="{Binding Image,Mode=OneWay}" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant" />
-                                                                <Rectangle VerticalAlignment="Bottom" Stroke="Silver"></Rectangle>
+                                                                <Image Opacity="{StaticResource HomeImageOpacity}" Source="{Binding Image,Mode=OneWay}" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant" />
+                                                                <Rectangle VerticalAlignment="Bottom" Stroke="{StaticResource borderBrush}"></Rectangle>
                                                                 <Button Tag="{Binding}" AutomationProperties.AutomationId="{Binding Name}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.StartModuleCommand}" CommandParameter="{Binding}" Grid.Row="0" Margin="0,0,20,-35" HorizontalAlignment="Right" Width="70" Height="70" VerticalAlignment="Bottom" Style="{StaticResource MaterialDesignFloatingActionMiniButton}" ToolTip="Start this module">
                                                                     <materialDesign:PackIcon Kind="Play" Width="30" Height="30" />
                                                                 </Button>
                                                                 <StackPanel Grid.Row="1" Margin="8,24,8,0">
-                                                                    <TextBlock FontWeight="Bold" FontSize="20" Text="{Binding Name,Mode=OneWay}"></TextBlock>
-                                                                    <TextBlock VerticalAlignment="Center" Margin="0 5 0 0" FontSize="14" TextWrapping="Wrap" Text="{Binding Description,Mode=OneWay}"></TextBlock>
+                                                                    <TextBlock FontWeight="Bold" FontSize="20" Text="{Binding Name,Mode=OneWay}" Foreground="{StaticResource HomePageForeground}"></TextBlock>
+                                                                    <TextBlock VerticalAlignment="Center" Margin="0 5 0 0" FontSize="14" TextWrapping="Wrap" Text="{Binding Description,Mode=OneWay}" Foreground="{StaticResource HomePageForeground}"></TextBlock>
                                                                 </StackPanel>
                                                                 <StackPanel Grid.Row="2" Margin="8" HorizontalAlignment="Right" Orientation="Horizontal">
                                                                     <materialDesign:PopupBox Padding="2,0,2,0" Style="{StaticResource MaterialDesignToolPopupBox}">
@@ -470,7 +480,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="Background" Value="{StaticResource LoadingBorderGradientBrush}"/>
                                 <Setter Property="RenderTransform">
                                     <Setter.Value>
                                         <ScaleTransform ScaleX="1" ScaleY="0"></ScaleTransform>
@@ -518,7 +528,7 @@
                     </Border>
 
                     <Grid HorizontalAlignment="Right" VerticalAlignment="Top" Margin="10" Visibility="{Binding IsMachineErrorsOpened,Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <Border Width="350" Background="{StaticResource WhiteBrush50}" BorderBrush="White" CornerRadius="5" Padding="5">
+                        <Border Width="350" Background="{StaticResource WhiteBrush50}" BorderBrush="{StaticResource WhiteBackgroundBrush}" CornerRadius="5" Padding="5">
                             <Border.Effect>
                                 <DropShadowEffect ShadowDepth="0" BlurRadius="10" />
                             </Border.Effect>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs
index ca8d7066c..eb76bf4ec 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs
@@ -96,5 +96,10 @@ namespace Tango.MachineStudio.UI.Views
                 });
             });
         }
+
+        private void MenuItem_MouseEnter(object sender, MouseEventArgs e)
+        {
+            menuTheme.IsSubmenuOpen = true;
+        }
     }
 }
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 a209df34a..ef9667b6d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
@@ -12,7 +12,7 @@
              xmlns:tfs="clr-namespace:Tango.TFS;assembly=Tango.TFS"
              xmlns:tfss="clr-namespace:Tango.MachineStudio.UI.TFS"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
-             mc:Ignorable="d" Width="530" Height="720" Background="White" d:DataContext="{d:DesignInstance Type=vm:ReportIssueViewVM, IsDesignTimeCreatable=False}">
+             mc:Ignorable="d" Width="530" Height="720" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:ReportIssueViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
@@ -57,7 +57,7 @@
                                         <ControlTemplate TargetType="ToggleButton">
                                             <Grid Background="Transparent">
                                                 <Popup Height="200" AllowsTransparency="True" Width="{TemplateBinding ActualWidth}" PopupAnimation="Slide" IsOpen="{Binding IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
-                                                    <Border Background="White" Margin="0 2 0 0" BorderBrush="Silver" BorderThickness="1" CornerRadius="3">
+                                                    <Border Background="{StaticResource MainWindow.Background}" Margin="0 2 0 0" BorderBrush="{StaticResource borderBrush}" BorderThickness="1" CornerRadius="3">
                                                         <TreeView Loaded="TreeView_Loaded" ItemsSource="{Binding Project.Areas}" SelectedItemChanged="TreeView_SelectedItemChanged">
                                                             <TreeView.ItemTemplate>
                                                                 <HierarchicalDataTemplate ItemsSource="{Binding SubAreas}">
@@ -96,11 +96,11 @@
                                             <Border CornerRadius="5" Margin="0 5 5 5" Padding="5" BorderThickness="1" BorderBrush="DimGray">
                                                 <Border.Style>
                                                     <Style TargetType="Border">
-                                                        <Setter Property="Background" Value="Silver"></Setter>
+                                                        <Setter Property="Background" Value="{StaticResource borderBrush}"></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 MainWindow.Foreground}"></Setter>
                                                             </DataTrigger>
                                                         </Style.Triggers>
                                                     </Style>
@@ -132,7 +132,7 @@
                             </DockPanel>
 
                             <Grid Margin="30 0 0 0">
-                                <TextBox Margin="0 5 0 0" Style="{x:Null}" BorderBrush="Silver" AcceptsReturn="True" TextWrapping="Wrap" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Text="{Binding WorkItem.StepsToReproduce}"></TextBox>
+                                <TextBox Margin="0 5 0 0" Style="{x:Null}" BorderBrush="{StaticResource borderBrush}" AcceptsReturn="True" TextWrapping="Wrap" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Text="{Binding WorkItem.StepsToReproduce}"></TextBox>
                             </Grid>
                         </DockPanel>
                     </Grid>
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 d1ff75fc7..92317a5d5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
@@ -12,7 +12,7 @@
              xmlns:tfs="clr-namespace:Tango.TFS;assembly=Tango.TFS"
              xmlns:tfss="clr-namespace:Tango.MachineStudio.UI.TFS"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
-             mc:Ignorable="d" Width="530" Height="580" Background="White" d:DataContext="{d:DesignInstance Type=vm:ResolvedIssuesViewVM, IsDesignTimeCreatable=False}">
+             mc:Ignorable="d" Width="530" Height="580" Background="{StaticResource MainWindow.Background}" d:DataContext="{d:DesignInstance Type=vm:ResolvedIssuesViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
     <Grid>
         <Grid IsEnabled="{Binding IsAvailable}">
             <Grid.RowDefinitions>
@@ -39,7 +39,7 @@
                 <ListBox x:Name="list" ItemsSource="{Binding TFSClient.ResolvedWorkItems}" HorizontalContentAlignment="Stretch">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
-                            <Border BorderBrush="#E6E6E6" BorderThickness="0 0 0 1" Padding="5">
+                            <Border BorderBrush="{StaticResource WhiteBrush100}" BorderThickness="0 0 0 1" Padding="5">
                                 <DockPanel>
                                     <StackPanel DockPanel.Dock="Right" HorizontalAlignment="Right" Orientation="Horizontal">
                                         <Button Background="{StaticResource RedBrush400}" BorderBrush="{StaticResource RedBrush400}" Padding="0" Width="90" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DeclineCommand}" CommandParameter="{Binding}">
@@ -60,7 +60,7 @@
                                         <Image Source="/Images/bug.png" Width="24" RenderOptions.BitmapScalingMode="Fant"></Image>
                                         <StackPanel Margin="5 0 0 0" ToolTip="{Binding Comment}">
                                             <TextBlock Text="{Binding Title}" FontWeight="SemiBold" TextTrimming="CharacterEllipsis"></TextBlock>
-                                            <TextBlock Text="{Binding Comment,TargetNullValue='Comment',FallbackValue='Comment'}" TextWrapping="Wrap" Foreground="Gray" FontSize="10"></TextBlock>
+                                            <TextBlock Text="{Binding Comment,TargetNullValue='Comment',FallbackValue='Comment'}" TextWrapping="Wrap" Foreground="{StaticResource GrayBrush}" FontSize="10"></TextBlock>
                                         </StackPanel>
                                     </StackPanel>
                                 </DockPanel>
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 a1c58aab2..25fe4af5d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml
@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         WindowStyle="None" ResizeMode="NoResize" Topmost="True" AllowsTransparency="True" WindowStartupLocation="CenterScreen" Width="800" Height="600" Background="Transparent" d:DataContext="{d:DesignInstance Type=local:ExceptionWindow, IsDesignTimeCreatable=False}">
     <Grid>
-        <Border BorderThickness="1" BorderBrush="DodgerBlue" Background="White" Margin="10" CornerRadius="10">
+        <Border BorderThickness="1" BorderBrush="DodgerBlue" Background="{StaticResource Dialog.Background}" Margin="10" CornerRadius="10">
             <Border.Effect>
                 <DropShadowEffect ShadowDepth="0" BlurRadius="10" />
             </Border.Effect>
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 d53cb934e..47b36070a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml
@@ -51,7 +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="Background" Value="{StaticResource BlueGradientBrush}"/>
                                         <Setter Property="RenderTransform">
                                             <Setter.Value>
                                                 <ScaleTransform ScaleX="1" ScaleY="0"></ScaleTransform>
@@ -77,12 +77,12 @@
                                         </Style.Triggers>
                                     </Style>
                                 </Border.Style>
-                                <Border.Background>
+                                <!--<Border.Background>
                                     <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
                                         <GradientStop Color="#FF03A9F4"/>
                                         <GradientStop Color="#0081BB" Offset="1"/>
                                     </LinearGradientBrush>
-                                </Border.Background>
+                                </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/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index d72e75011..efc5f8179 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>
diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml
index 2887dff9b..9a42045fc 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml
@@ -9,6 +9,7 @@
 
     <converters:MathConverter Operation="Divide" x:Key="DivisionMathConverter" />
     <converters:PointValueConverter x:Key="PointValueConverter" />
+    <Color x:Key="ToggleButton.TrackBaceColor">Black</Color>
 
     <Style x:Key="FocusVisual">
 		<Setter Property="Control.Template">
@@ -331,7 +332,7 @@
                         </VisualStateManager.VisualStateGroups>
                         <Grid>
 							<Rectangle x:Name="Track"
-                                       Fill="Black" HorizontalAlignment="Left" Height="15" Margin="4.211,5,4.211,0" Stroke="{x:Null}" VerticalAlignment="Top" Width="40" RadiusY="7.5" RadiusX="7.5" Opacity="0.26"/>
+                                       Fill="{DynamicResource ToggleButton.TrackBaceColor}" HorizontalAlignment="Left" Height="15" Margin="4.211,5,4.211,0" Stroke="{x:Null}" VerticalAlignment="Top" Width="40" RadiusY="7.5" RadiusX="7.5" Opacity="0.26"/>
                             
                             <Grid x:Name="ThumbHolder"
                                   HorizontalAlignment="Left" VerticalAlignment="Top">
@@ -399,7 +400,7 @@
 							<Setter TargetName="Thumb" Property="Fill" Value="#BDBDBD" />
 							<Setter TargetName="Track" Property="Fill">
 								<Setter.Value>
-									<SolidColorBrush Color="Black" Opacity=".12" />
+                                    <SolidColorBrush Color="{Binding Source={DynamicResource ToggleButton.TrackBaceColor},Path=Color}" Opacity=".12" />
 								</Setter.Value>
 							</Setter>
 						</Trigger>
-- 
cgit v1.3.1


From a37c02835c63913b593e0f79b381848e5392bd45 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 29 Aug 2019 17:26:40 +0300
Subject: Implemented new SimpleDataGrid for Touch PPC. Implemented new PPC
 logging module. Redesigned RmlView on MachineStudio.

---
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     | 206 +++++++++++----------
 .../Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs |   2 +
 .../Converters/LogItemMessageToOneLineConverter.cs |  39 ++++
 .../Converters/LogItemToStringConverter.cs         |  23 +++
 .../Dialogs/LogItemDetailsView.xaml                |  78 ++++++++
 .../Dialogs/LogItemDetailsView.xaml.cs             |  28 +++
 .../Dialogs/LogItemDetailsViewVM.cs                |  20 ++
 .../Tango.PPC.Technician.csproj                    |  10 +
 .../ViewModels/LoggingViewVM.cs                    |  24 ++-
 .../Tango.PPC.Technician/Views/LoggingView.xaml    | 150 ++++++++-------
 .../PPC/Tango.PPC.Common/Resources/Merged.xaml     |   1 +
 .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest    |   2 +-
 .../Tango.Touch/Controls/TouchDataGridRow.cs       |   2 +-
 .../Tango.Touch/Controls/TouchScrollViewer.cs      |  52 +++---
 .../Tango.Touch/Controls/TouchScrollViewer.xaml    |  10 +-
 .../Tango.Touch/Controls/TouchSimpleDataGrid.cs    |  18 ++
 .../Tango.Touch/Controls/TouchSimpleDataGrid.xaml  |  77 ++++++++
 .../Visual_Studio/Tango.Touch/Tango.Touch.csproj   |   7 +-
 .../Visual_Studio/Tango.Touch/Themes/Generic.xaml  |   1 +
 19 files changed, 546 insertions(+), 204 deletions(-)
 create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Converters/LogItemMessageToOneLineConverter.cs
 create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Converters/LogItemToStringConverter.cs
 create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/LogItemDetailsView.xaml
 create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/LogItemDetailsView.xaml.cs
 create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/LogItemDetailsViewVM.cs
 create mode 100644 Software/Visual_Studio/Tango.Touch/Controls/TouchSimpleDataGrid.cs
 create mode 100644 Software/Visual_Studio/Tango.Touch/Controls/TouchSimpleDataGrid.xaml

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

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 fd1c5d9a8..333cf9394 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
@@ -131,110 +131,120 @@
                     </Grid.RowDefinitions>
 
                     <Grid>
-                        <DockPanel>
-                            <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
-                                <Border.Effect>
-                                    <DropShadowEffect Opacity="0.4" />
-                                </Border.Effect>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*" />
+                                <ColumnDefinition Width="510" />
+                            </Grid.ColumnDefinitions>
+
+                            <DockPanel>
+                                <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
+                                    <Border.Effect>
+                                        <DropShadowEffect Opacity="0.4" />
+                                    </Border.Effect>
+                                    <Grid>
+                                        <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">ACTIVE PROCESS GROUP</TextBlock>
+                                        <Button ToolTip="Add new table" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Width="30" HorizontalAlignment="Right" Padding="0" Command="{Binding AddProcessParametersTableCommand}">
+                                            <materialDesign:PackIcon Kind="Plus" Foreground="#0AC30A" Width="24" Height="24" />
+                                        </Button>
+                                    </Grid>
+                                </Border>
                                 <Grid>
-                                    <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">COLOR CONVERSION TABLE (CCT)</TextBlock>
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 20">
+                                        <ItemsControl ItemsSource="{Binding ActiveProcessParametersTableView}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" />
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                            <ItemsControl.ItemTemplate>
+                                                <DataTemplate>
+                                                    <DockPanel>
+                                                        <Button DockPanel.Dock="Right" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" VerticalAlignment="Bottom" ToolTip="Remove table" Width="30" Margin="10 0 0 10" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RemoveProcessParametersTableCommand}" CommandParameter="{Binding}">
+                                                            <materialDesign:PackIcon Kind="Delete" Width="24" Height="24" Foreground="#FF7D7D" />
+                                                        </Button>
+
+                                                        <Grid Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessTableDropped">
+                                                            <Border Padding="5" BorderThickness="1" Margin="20 5 0 5" BorderBrush="{StaticResource DarkGrayBrush}" Background="{StaticResource TransparentBackgroundBrush100}">
+                                                                <Grid>
+                                                                    <DockPanel Width="300">
+                                                                        <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox>
+
+                                                                        <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Padding="5">
+                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}">
+                                                                                <editors:ParameterizedEditor.ItemsPanel>
+                                                                                    <ItemsPanelTemplate>
+                                                                                        <StackPanel IsItemsHost="True" />
+                                                                                    </ItemsPanelTemplate>
+                                                                                </editors:ParameterizedEditor.ItemsPanel>
+                                                                                <editors:ParameterizedEditor.DoubleTemplate>
+                                                                                    <DataTemplate>
+                                                                                        <DockPanel>
+                                                                                            <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11"></TextBlock>
+                                                                                            <mahapps:NumericUpDown HorizontalAlignment="Right" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Right" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                                                                        </DockPanel>
+                                                                                    </DataTemplate>
+                                                                                </editors:ParameterizedEditor.DoubleTemplate>
+                                                                            </editors:ParameterizedEditor>
+                                                                        </ScrollViewer>
+                                                                    </DockPanel>
+                                                                </Grid>
+                                                            </Border>
+
+                                                            <dragAndDrop:DragThumb Background="Transparent" Cursor="SizeAll" ToolTip="Drag and drop" Margin="0 3 -1 0" HorizontalAlignment="Right" VerticalAlignment="Top">
+                                                                <materialDesign:PackIcon HorizontalAlignment="Right" VerticalAlignment="Top" IsHitTestVisible="False" Kind="Drag" Width="32" Height="32" Background="Transparent" />
+                                                            </dragAndDrop:DragThumb>
+                                                        </Grid>
+                                                    </DockPanel>
+                                                </DataTemplate>
+                                            </ItemsControl.ItemTemplate>
+                                        </ItemsControl>
+                                    </StackPanel>
+
+                                    <dragAndDrop:DraggingSurface x:Name="draggingSurface" ClipToBounds="True" />
                                 </Grid>
-                            </Border>
-                            <Grid DockPanel.Dock="Top" Margin="20 10">
-                                <StackPanel HorizontalAlignment="Left" Margin="20 0 0 0">
+                            </DockPanel>
+
+                            <DockPanel Grid.Column="1">
+                                <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
+                                    <Border.Effect>
+                                        <DropShadowEffect Opacity="0.4" />
+                                    </Border.Effect>
                                     <Grid>
-                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                            <materialDesign:PackIcon Kind="ArrowLeftBoldHexagonOutline" VerticalAlignment="Center" Width="40" Height="40" />
-                                            <Image Source="../Images/data-table.png" Height="80" Opacity="0.8"></Image>
-                                            <StackPanel VerticalAlignment="Center" Width="300" Margin="10 0 0 0">
-
-                                                <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding ActiveRML.Cct.FileName}" HorizontalContentAlignment="Center"></TextBox>
-                                                <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
-                                                    <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
-                                                        <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
-                                                            <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
-                                                            <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
-                                                        </StackPanel>
-                                                    </Button>
-                                                    <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportForwardDataCommand}">
-                                                        <StackPanel Orientation="Horizontal">
-                                                            <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
-                                                            <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
-                                                        </StackPanel>
-                                                    </Button>
-                                                </UniformGrid>
-                                            </StackPanel>
-                                        </StackPanel>
+                                        <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">COLOR CONVERSION TABLE (CCT)</TextBlock>
                                     </Grid>
-                                </StackPanel>
-                            </Grid>
-
-                            <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
-                                <Border.Effect>
-                                    <DropShadowEffect Opacity="0.4" />
-                                </Border.Effect>
-                                <Grid>
-                                    <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">ACTIVE PROCESS GROUP</TextBlock>
-                                    <Button ToolTip="Add new table" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Width="30" HorizontalAlignment="Right" Padding="0" Command="{Binding AddProcessParametersTableCommand}">
-                                        <materialDesign:PackIcon Kind="Plus" Foreground="#0AC30A" Width="24" Height="24" />
-                                    </Button>
+                                </Border>
+                                <Grid DockPanel.Dock="Top" Background="#35B5B5B5" Margin="24 0">
+                                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                                        <Grid>
+                                            <StackPanel Orientation="Horizontal">
+                                                <materialDesign:PackIcon Kind="ArrowLeftBoldHexagonOutline" VerticalAlignment="Center" Width="40" Height="40" />
+                                                <Image Source="../Images/data-table.png" Height="80" Opacity="0.8"></Image>
+                                                <StackPanel VerticalAlignment="Center" Width="300" Margin="10 0 0 0">
+
+                                                    <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding ActiveRML.Cct.FileName}" HorizontalContentAlignment="Center"></TextBox>
+                                                    <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
+                                                        <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
+                                                            <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
+                                                                <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
+                                                                <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
+                                                            </StackPanel>
+                                                        </Button>
+                                                        <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportForwardDataCommand}">
+                                                            <StackPanel Orientation="Horizontal">
+                                                                <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
+                                                                <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
+                                                            </StackPanel>
+                                                        </Button>
+                                                    </UniformGrid>
+                                                </StackPanel>
+                                            </StackPanel>
+                                        </Grid>
+                                    </StackPanel>
                                 </Grid>
-                            </Border>
-                            <Grid>
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 20">
-                                    <ItemsControl ItemsSource="{Binding ActiveProcessParametersTableView}">
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" />
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-                                        <ItemsControl.ItemTemplate>
-                                            <DataTemplate>
-                                                <DockPanel>
-                                                    <Button DockPanel.Dock="Right" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" VerticalAlignment="Bottom" ToolTip="Remove table" Width="30" Margin="10 0 0 10" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RemoveProcessParametersTableCommand}" CommandParameter="{Binding}">
-                                                        <materialDesign:PackIcon Kind="Delete" Width="24" Height="24" Foreground="#FF7D7D" />
-                                                    </Button>
+                            </DockPanel>
+                        </Grid>
 
-                                                    <Grid Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessTableDropped">
-                                                        <Border Padding="5" BorderThickness="1" Margin="20 5 0 5" BorderBrush="{StaticResource DarkGrayBrush}" Background="{StaticResource TransparentBackgroundBrush100}">
-                                                            <Grid>
-                                                                <DockPanel Width="300">
-                                                                    <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox>
-
-                                                                    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Padding="5">
-                                                                        <editors:ParameterizedEditor ParameterizedObject="{Binding}">
-                                                                            <editors:ParameterizedEditor.ItemsPanel>
-                                                                                <ItemsPanelTemplate>
-                                                                                    <StackPanel IsItemsHost="True" />
-                                                                                </ItemsPanelTemplate>
-                                                                            </editors:ParameterizedEditor.ItemsPanel>
-                                                                            <editors:ParameterizedEditor.DoubleTemplate>
-                                                                                <DataTemplate>
-                                                                                    <DockPanel>
-                                                                                        <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11"></TextBlock>
-                                                                                        <mahapps:NumericUpDown HorizontalAlignment="Right" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Right" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown>
-                                                                                    </DockPanel>
-                                                                                </DataTemplate>
-                                                                            </editors:ParameterizedEditor.DoubleTemplate>
-                                                                        </editors:ParameterizedEditor>
-                                                                    </ScrollViewer>
-                                                                </DockPanel>
-                                                            </Grid>
-                                                        </Border>
-
-                                                        <dragAndDrop:DragThumb Background="Transparent" Cursor="SizeAll" ToolTip="Drag and drop" Margin="0 3 -1 0" HorizontalAlignment="Right" VerticalAlignment="Top">
-                                                        <materialDesign:PackIcon HorizontalAlignment="Right" VerticalAlignment="Top" IsHitTestVisible="False" Kind="Drag" Width="32" Height="32" Background="Transparent" />
-                                                        </dragAndDrop:DragThumb>
-                                                    </Grid>
-                                                </DockPanel>
-                                            </DataTemplate>
-                                        </ItemsControl.ItemTemplate>
-                                    </ItemsControl>
-                                </StackPanel>
-
-                                <dragAndDrop:DraggingSurface x:Name="draggingSurface" ClipToBounds="True" />
-                            </Grid>
-                        </DockPanel>
                     </Grid>
 
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index 2532aeef6..587452f7d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -442,6 +442,8 @@ namespace Tango.PPC.Jobs.ViewModels
 
                     if (_db != null)
                     {
+                        Rmls.ForEach(x => x.Cct = null);
+                        Rmls = null;
                         _db.Dispose();
                         GC.Collect();
                     }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Converters/LogItemMessageToOneLineConverter.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Converters/LogItemMessageToOneLineConverter.cs
new file mode 100644
index 000000000..e42185c52
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Converters/LogItemMessageToOneLineConverter.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Tango.PPC.Technician.Converters
+{
+    public class LogItemMessageToOneLineConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            try
+            {
+                string str = value.ToString();
+                int newLineIndex = str.IndexOf(Environment.NewLine);
+                string firstline = str;
+
+                if (newLineIndex > 0)
+                {
+                    firstline = str.Substring(0, str.IndexOf(Environment.NewLine));
+                }
+
+                return firstline.Ellipsis(System.Convert.ToInt32(parameter));
+            }
+            catch
+            {
+                return value;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Converters/LogItemToStringConverter.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Converters/LogItemToStringConverter.cs
new file mode 100644
index 000000000..d0642ed9b
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Converters/LogItemToStringConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Tango.PPC.Technician.Converters
+{
+    public class LogItemToStringConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value.ToString();
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/LogItemDetailsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/LogItemDetailsView.xaml
new file mode 100644
index 000000000..f74e60bcb
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/LogItemDetailsView.xaml
@@ -0,0 +1,78 @@
+<UserControl x:Class="Tango.PPC.Technician.Dialogs.LogItemDetailsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
+             xmlns:local="clr-namespace:Tango.PPC.Technician.Dialogs"
+             xmlns:converters="clr-namespace:Tango.PPC.Technician.Converters"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             mc:Ignorable="d" 
+             Background="{StaticResource TangoPrimaryBackgroundBrush}" Width="560" Height="700" d:DataContext="{d:DesignInstance Type=local:LogItemDetailsViewVM, IsDesignTimeCreatable=False}">
+
+    <UserControl.Resources>
+        <converters:LogItemToStringConverter x:Key="LogItemToStringConverter" />
+    </UserControl.Resources>
+    
+    <Grid Margin="5">
+        <Grid Grid.RowSpan="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="60"/>
+                <RowDefinition Height="31*"/>
+                <RowDefinition Height="60"/>
+            </Grid.RowDefinitions>
+
+            <StackPanel Orientation="Horizontal">
+                <touch:TouchIcon Width="42" Height="42" VerticalAlignment="Center">
+                    <touch:TouchIcon.Style>
+                        <Style TargetType="touch:TouchIcon">
+                            <Setter Property="Icon" Value="InformationOutline"></Setter>
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Log.Category}" Value="Warning">
+                                    <Setter Property="Icon" Value="ExclamationTriangleSolid"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding Log.Category}" Value="Error">
+                                    <Setter Property="Icon" Value="Alert"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding Log.Category}" Value="Critical">
+                                    <Setter Property="Icon" Value="Alert"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </touch:TouchIcon.Style>
+                </touch:TouchIcon>
+                <TextBlock VerticalAlignment="Center" Text="{Binding Log.Message}" TextWrapping="NoWrap" Height="22" TextTrimming="CharacterEllipsis" Width="500" Margin="10 0 0 0" FontSize="16"></TextBlock>
+            </StackPanel>
+
+            <Grid Grid.Row="1">
+                <DockPanel>
+                    <Grid DockPanel.Dock="Top">
+                        <controls:TableGrid RowHeight="30">
+                            <TextBlock Text="Time Stamp:" FontWeight="SemiBold" />
+                            <TextBlock Text="{Binding Log.TimeStamp,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.fff'}"></TextBlock>
+                            <TextBlock Text="Category:" FontWeight="SemiBold" />
+                            <TextBlock Text="{Binding Log.Category}"></TextBlock>
+                            <TextBlock Text="File:" FontWeight="SemiBold" />
+                            <TextBlock Text="{Binding Log.RelativeCallerFile}"></TextBlock>
+                            <TextBlock Text="Method:" FontWeight="SemiBold" />
+                            <TextBlock Text="{Binding Log.CallerMethodName}"></TextBlock>
+                            <TextBlock Text="Line:" FontWeight="SemiBold" />
+                            <TextBlock Text="{Binding Log.CallerLineNumber}"></TextBlock>
+                        </controls:TableGrid>
+                    </Grid>
+
+                    <Border Padding="5" BorderThickness="1" BorderBrush="{StaticResource TangoLightBorderBrush}">
+                        <TextBox BorderThickness="0" Text="{Binding Log,Converter={StaticResource LogItemToStringConverter}}" Style="{x:Null}" TextWrapping="Wrap" IsReadOnly="True" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden" Background="Transparent" />
+                    </Border>
+                </DockPanel>
+            </Grid>
+
+            <Grid Grid.Row="2">
+                <touch:TouchButton Style="{StaticResource TangoHollowButton}" HorizontalAlignment="Right" Width="170" VerticalAlignment="Bottom" CornerRadius="25" Height="50" Command="{Binding CloseCommand}">CLOSE</touch:TouchButton>
+            </Grid>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/LogItemDetailsView.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/LogItemDetailsView.xaml.cs
new file mode 100644
index 000000000..c8f5ddae1
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/LogItemDetailsView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.PPC.Technician.Dialogs
+{
+    /// <summary>
+    /// Interaction logic for LogItemDetailsView.xaml
+    /// </summary>
+    public partial class LogItemDetailsView : UserControl
+    {
+        public LogItemDetailsView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/LogItemDetailsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/LogItemDetailsViewVM.cs
new file mode 100644
index 000000000..0905a0c54
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/LogItemDetailsViewVM.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Logging;
+using Tango.SharedUI;
+
+namespace Tango.PPC.Technician.Dialogs
+{
+    public class LogItemDetailsViewVM : DialogViewVM
+    {
+        private LogItemBase _log;
+        public LogItemBase Log
+        {
+            get { return _log; }
+            set { _log = value; RaisePropertyChangedAuto(); }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj
index 54683b41e..d135142c4 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj
@@ -67,6 +67,12 @@
     <Compile Include="Controls\DispenserController.xaml.cs">
       <DependentUpon>DispenserController.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Converters\LogItemMessageToOneLineConverter.cs" />
+    <Compile Include="Converters\LogItemToStringConverter.cs" />
+    <Compile Include="Dialogs\LogItemDetailsView.xaml.cs">
+      <DependentUpon>LogItemDetailsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\LogItemDetailsViewVM.cs" />
     <Compile Include="Models\DispenserController.cs" />
     <Compile Include="TechnicianModule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -165,6 +171,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Dialogs\LogItemDetailsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\CatalogView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/LoggingViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/LoggingViewVM.cs
index 643d6ab55..39059542a 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/LoggingViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/LoggingViewVM.cs
@@ -10,17 +10,26 @@ using Tango.Core;
 using Tango.Core.Commands;
 using Tango.Logging;
 using Tango.PPC.Common;
+using Tango.PPC.Technician.Dialogs;
 
 namespace Tango.PPC.Technician.ViewModels
 {
     public class LoggingViewVM : PPCViewModel
     {
+        private const int MAX_LOGS = 1000;
         private List<LogItemBase> paused_logs;
 
         public SynchronizedObservableCollection<LogItemBase> ApplicationLogs { get; set; }
 
         public SynchronizedObservableCollection<LogItemBase> EmbeddedLogs { get; set; }
 
+        private LogItemBase _selectedLog;
+        public LogItemBase SelectedLog
+        {
+            get { return _selectedLog; }
+            set { _selectedLog = value; RaisePropertyChangedAuto(); OnSelectedLogChanged(); }
+        }
+
         private ICollectionView _applicationLogsViewSource;
         public ICollectionView ApplicationLogsViewSource
         {
@@ -92,7 +101,7 @@ namespace Tango.PPC.Technician.ViewModels
 
                 try
                 {
-                    if (ApplicationLogs.Count > 100)
+                    if (ApplicationLogs.Count > MAX_LOGS)
                     {
                         ApplicationLogs.Remove(ApplicationLogs.Last());
                     }
@@ -114,6 +123,19 @@ namespace Tango.PPC.Technician.ViewModels
             paused_logs.Clear();
         }
 
+        private async void OnSelectedLogChanged()
+        {
+            if (SelectedLog != null)
+            {
+                await NotificationProvider.ShowDialog<LogItemDetailsViewVM>(new LogItemDetailsViewVM()
+                {
+                    Log = SelectedLog,
+                });
+
+                SelectedLog = null;
+            }
+        }
+
         public override void OnApplicationStarted()
         {
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/LoggingView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/LoggingView.xaml
index a1cdaf987..1a40e3f40 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/LoggingView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/LoggingView.xaml
@@ -7,10 +7,15 @@
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:vm="clr-namespace:Tango.PPC.Technician.ViewModels"
              xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
+             xmlns:converters="clr-namespace:Tango.PPC.Technician.Converters"
              xmlns:global="clr-namespace:Tango.PPC.Technician"
              mc:Ignorable="d" 
              d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:LoggingViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.LoggingViewVM}">
 
+    <UserControl.Resources>
+        <converters:LogItemMessageToOneLineConverter x:Key="LogItemMessageToOneLineConverter" />
+    </UserControl.Resources>
+
     <Grid Background="{StaticResource TangoMidBackgroundBrush}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -48,82 +53,85 @@
                 </DockPanel>
 
                 <Grid Margin="20">
-                    <ListBox VirtualizingPanel.ScrollUnit="Pixel" VirtualizingPanel.IsVirtualizing="True" Style="{StaticResource BlankListBox}" ItemsSource="{Binding ApplicationLogsViewSource}" SelectionMode="Single">
-                        <ListBox.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <VirtualizingStackPanel />
-                            </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                        <ListBox.ItemContainerStyle>
-                            <Style TargetType="ListBoxItem" BasedOn="{StaticResource BlankListBoxItem}">
-                                <Setter Property="Height" Value="125"></Setter>
+                    <touch:TouchSimpleDataGrid AutoGenerateColumns="False" SelectionMode="Single" SelectionUnit="FullRow" BorderThickness="1" BorderBrush="{StaticResource TangoDarkForegroundBrush}" HeadersVisibility="Column" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True" ItemsSource="{Binding ApplicationLogsViewSource}" SelectedItem="{Binding SelectedLog}" VerticalGridLinesBrush="{x:Null}" HorizontalGridLinesBrush="{StaticResource TangoGrayBrush}" RowHeight="50" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled">
+                        <DataGrid.Resources>
+                            <Style BasedOn="{StaticResource {x:Type DataGridColumnHeader}}" TargetType="{x:Type DataGridColumnHeader}">
+                                <Setter Property="Background" Value="{StaticResource TangoDarkForegroundBrush}" />
+                                <Setter Property="Foreground" Value="{StaticResource TangoLightForegroundBrush}" />
+                                <Setter Property="Padding" Value="5"></Setter>
+                            </Style>
+                        </DataGrid.Resources>
+                        <DataGrid.RowStyle>
+                            <Style TargetType="DataGridRow" BasedOn="{StaticResource {x:Type DataGridRow}}">
                                 <Style.Triggers>
                                     <Trigger Property="IsSelected" Value="True">
-                                        <Setter Property="Height" Value="Auto"></Setter>
+                                        <Setter Property="Background" Value="Transparent"></Setter>
+                                        <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}" />
+                                    </Trigger>
+                                    <Trigger Property="IsFocused" Value="True">
+                                        <Setter Property="Background" Value="Transparent"></Setter>
+                                        <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}" />
                                     </Trigger>
                                 </Style.Triggers>
                             </Style>
-                        </ListBox.ItemContainerStyle>
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <Grid>
-                                <Border Background="{StaticResource TangoPrimaryBackgroundBrush}" BorderThickness="1" Margin="5" Padding="5" CornerRadius="5" IsHitTestVisible="False">
-                                    <Border.Style>
-                                        <Style TargetType="Border">
-                                            <Setter Property="BorderBrush" Value="{StaticResource TangoLightBorderBrush}"></Setter>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding Category}" Value="Warning">
-                                                    <Setter Property="BorderBrush" Value="{StaticResource TangoWarningBrush}"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding Category}" Value="Error">
-                                                    <Setter Property="BorderBrush" Value="{StaticResource TangoErrorBrush}"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding Category}" Value="Critical">
-                                                    <Setter Property="BorderBrush" Value="{StaticResource TangoErrorBrush}"></Setter>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Border.Style>
-                                    <StackPanel>
-                                        <TextBlock>
-                                        <Run>Time:</Run>
-                                        <Run Text="{Binding TimeStamp,Converter={StaticResource DateTimeUTCToStringConverter},Mode=OneWay,ConverterParameter='hh\\:mm\\:ss.ff'}" FontWeight="SemiBold"></Run>
-                                        </TextBlock>
-                                        <TextBlock Margin="0 2 0 0">
-                                        <Run>File:</Run>
-                                        <Run Text="{Binding RelativeCallerFile,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                        </TextBlock>
-                                        <TextBlock Margin="0 2 0 0">
-                                        <Run>Method:</Run>
-                                        <Run Text="{Binding CallerMethodName,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                        </TextBlock>
-                                        <TextBlock Margin="0 2 0 0">
-                                        <Run>Line:</Run>
-                                        <Run Text="{Binding CallerLineNumber,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                        </TextBlock>
-                                        <TextBlock Margin="0 2 0 0" TextTrimming="WordEllipsis" TextWrapping="Wrap">
-                                        <Run>Message:</Run>
-                                        <Run Text="{Binding Message,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                        </TextBlock>
-                                    </StackPanel>
-                                </Border>
-
-                                    <touch:TouchIcon HorizontalAlignment="Right" VerticalAlignment="Top" Margin="15" Width="16" Height="16">
-                                        <touch:TouchIcon.Style>
-                                            <Style TargetType="touch:TouchIcon" BasedOn="{StaticResource {x:Type touch:TouchIcon}}">
-                                                <Setter Property="Icon" Value="ChevronDown"></Setter>
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,IsAsync=True}" Value="True">
-                                                        <Setter Property="Icon" Value="ChevronUp"></Setter>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </touch:TouchIcon.Style>
-                                    </touch:TouchIcon>
-                                </Grid>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
+                        </DataGrid.RowStyle>
+                        <DataGrid.CellStyle>
+                            <Style TargetType="{x:Type DataGridCell}">
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="{x:Type DataGridCell}">
+                                            <Grid Background="{TemplateBinding Background}">
+                                                <ContentPresenter VerticalAlignment="Center" />
+                                            </Grid>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                                <Style.Triggers>
+                                    <Trigger Property="IsSelected" Value="True">
+                                        <Setter Property="Background" Value="Transparent"></Setter>
+                                        <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}" />
+                                    </Trigger>
+                                </Style.Triggers>
+                            </Style>
+                        </DataGrid.CellStyle>
+                        <DataGrid.Columns>
+                            <DataGridTemplateColumn Header="" Width="50">
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <touch:TouchIcon Width="16">
+                                            <touch:TouchIcon.Style>
+                                                <Style TargetType="touch:TouchIcon">
+                                                    <Setter Property="Icon" Value="InformationOutline"></Setter>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding Category}" Value="Warning">
+                                                            <Setter Property="Icon" Value="ExclamationTriangleSolid"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding Category}" Value="Error">
+                                                            <Setter Property="Icon" Value="Alert"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding Category}" Value="Critical">
+                                                            <Setter Property="Icon" Value="Alert"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </touch:TouchIcon.Style>
+                                        </touch:TouchIcon>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
+                            <DataGridTextColumn Header="Time" Width="120" Binding="{Binding TimeStamp,Converter={StaticResource DateTimeUTCToStringConverter},Mode=OneWay,ConverterParameter='hh\\:mm\\:ss.ff'}" />
+                            <DataGridTemplateColumn Header="Message" Width="1*">
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Text="{Binding Message,Converter={StaticResource LogItemMessageToOneLineConverter},ConverterParameter='70',Mode=OneWay}"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
+                        </DataGrid.Columns>
+                    </touch:TouchSimpleDataGrid>
                 </Grid>
             </DockPanel>
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
index 04021d6b6..730066b46 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
@@ -50,6 +50,7 @@
     <converters:IsNullToVisibilityConverter x:Key="IsNullToVisibilityConverter" />
     <converters:StringToLinesConverter x:Key="StringToLinesConverter" />
     <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter" />
+    <converters:StringEllipsisConverter x:Key="StringEllipsisConverter" />
 
     <Style TargetType="FrameworkElement">
         <Setter Property="TextElement.FontFamily" Value="{StaticResource TangoFlexoFontFamily}"></Setter>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index d72e75011..efc5f8179 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>
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchDataGridRow.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchDataGridRow.cs
index 87e3697e8..751b45937 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchDataGridRow.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchDataGridRow.cs
@@ -127,7 +127,7 @@ namespace Tango.Touch.Controls
                 return;
             }
 
-            _grid.ScrollViewer.FixPosition();
+            //_grid.ScrollViewer.FixPosition();
 
             _ripple.CancelRipple(true);
 
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchScrollViewer.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchScrollViewer.cs
index f8f103d2b..c88c11fb0 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchScrollViewer.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchScrollViewer.cs
@@ -18,8 +18,8 @@ namespace Tango.Touch.Controls
 {
     public class TouchScrollViewer : ScrollViewer
     {
-        private double _position;
-        private bool _fixed;
+        //private double _position;
+        //private bool _fixed;
 
         static TouchScrollViewer()
         {
@@ -38,32 +38,32 @@ namespace Tango.Touch.Controls
         //    });
         //}
 
-        public void FixPosition()
-        {
-            _position = VerticalOffset;
-            _fixed = true;
-        }
+        //public void FixPosition()
+        //{
+        //    _position = VerticalOffset;
+        //    _fixed = true;
+        //}
 
-        public void ReleasePosition()
-        {
-            _fixed = false;
-        }
+        //public void ReleasePosition()
+        //{
+        //    _fixed = false;
+        //}
 
-        public TouchScrollViewer()
-        {
-            AddHandler(PreviewTouchUpEvent, new EventHandler<TouchEventArgs>(async (_, __) =>
-            {
-                await Task.Delay(250);
-                ReleasePosition();
-            }), true);
-        }
+        //public TouchScrollViewer()
+        //{
+        //    AddHandler(PreviewTouchUpEvent, new EventHandler<TouchEventArgs>(async (_, __) =>
+        //    {
+        //        await Task.Delay(250);
+        //        ReleasePosition();
+        //    }), true);
+        //}
 
-        protected override void OnScrollChanged(ScrollChangedEventArgs e)
-        {
-            if (_fixed)
-            {
-                ScrollToVerticalOffset(_position);
-            }
-        }
+        //protected override void OnScrollChanged(ScrollChangedEventArgs e)
+        //{
+        //    if (_fixed)
+        //    {
+        //        ScrollToVerticalOffset(_position);
+        //    }
+        //}
     }
 }
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchScrollViewer.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchScrollViewer.xaml
index eea9ddf76..0036683e7 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchScrollViewer.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchScrollViewer.xaml
@@ -12,7 +12,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Height="{TemplateBinding Height}" SnapsToDevicePixels="True" Width="{TemplateBinding Width}" CornerRadius="5" Background="{StaticResource TangoLightBorderBrush}" />
+                    <Border Height="{TemplateBinding Height}" SnapsToDevicePixels="True" Width="{TemplateBinding Width}" CornerRadius="5" Background="#90000000" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -21,15 +21,16 @@
     <Style x:Key="TouchScrollBar" TargetType="{x:Type ScrollBar}">
         <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Background" Value="#33000000"/>
+        <Setter Property="BorderBrush" Value="#33000000"/>
         <Setter Property="Foreground" Value="Gray"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Width" Value="5"/>
+        <Setter Property="MinWidth" Value="5"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ScrollBar}">
-                    <Grid x:Name="Bg" SnapsToDevicePixels="true">
+                    <Grid x:Name="Bg" SnapsToDevicePixels="true" Background="{TemplateBinding Background}">
                         <Border BorderBrush="{TemplateBinding BorderBrush}" HorizontalAlignment="Right" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Row="1"/>
                         <Track x:Name="PART_Track" IsDirectionReversed="true" HorizontalAlignment="Right" Width="5" IsEnabled="{TemplateBinding IsMouseOver}" Grid.Row="1">
                             <Track.Thumb>
@@ -45,7 +46,6 @@
     <Style TargetType="{x:Type local:TouchScrollViewer}">
         <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"></Setter>
         <Setter Property="PanningMode" Value="VerticalOnly"></Setter>
-        <Setter Property="CanContentScroll" Value="False"></Setter>
         <Setter Property="VerticalScrollBarVisibility" Value="Visible"></Setter>
         <Setter Property="Template">
             <Setter.Value>
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchSimpleDataGrid.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchSimpleDataGrid.cs
new file mode 100644
index 000000000..7cc2f3d2a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchSimpleDataGrid.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Tango.Touch.Controls
+{
+    public class TouchSimpleDataGrid : DataGrid
+    {
+        static TouchSimpleDataGrid()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(TouchSimpleDataGrid), new FrameworkPropertyMetadata(typeof(TouchSimpleDataGrid)));
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchSimpleDataGrid.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchSimpleDataGrid.xaml
new file mode 100644
index 000000000..05681fa9c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchSimpleDataGrid.xaml
@@ -0,0 +1,77 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+                    xmlns:local="clr-namespace:Tango.Touch.Controls">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../Resources/Colors.xaml" />
+        <ResourceDictionary Source="../Resources/Fonts.xaml" />
+        <ResourceDictionary Source="../Controls/Shared.xaml" />
+        <ResourceDictionary Source="../Controls/TouchScrollViewer.xaml" />
+
+        <ResourceDictionary>
+            <converters:BooleanInverseConverter x:Key="BooleanInverseConverter" />
+        </ResourceDictionary>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style TargetType="{x:Type local:TouchSimpleDataGrid}" BasedOn="{StaticResource {x:Type DataGrid}}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+        <Setter Property="BorderBrush" Value="#FF688CAF"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalOnly"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:TouchSimpleDataGrid}">
+                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                        <local:TouchScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
+                            <local:TouchScrollViewer.Template>
+                                <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="*"/>
+                                        </Grid.RowDefinitions>
+
+                                        <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.Row="1"/>
+                                        <ScrollBar Opacity="0" Grid.Row="1" x:Name="PART_VerticalScrollBar" Style="{StaticResource TouchScrollBar}" HorizontalAlignment="Right" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
+                                    </Grid>
+
+                                    <ControlTemplate.Triggers>
+                                        <EventTrigger RoutedEvent="ScrollViewer.ScrollChanged">
+                                            <EventTrigger.Actions>
+                                                <BeginStoryboard>
+                                                    <Storyboard>
+                                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_VerticalScrollBar" Storyboard.TargetProperty="Opacity" Duration="00:00:01" FillBehavior="Stop">
+                                                            <EasingDoubleKeyFrame KeyTime="00:00:0.2" Value="1"></EasingDoubleKeyFrame>
+                                                            <DiscreteDoubleKeyFrame KeyTime="00:00:0.2" Value="1"></DiscreteDoubleKeyFrame>
+                                                            <EasingDoubleKeyFrame KeyTime="00:00:01" Value="0"></EasingDoubleKeyFrame>
+                                                        </DoubleAnimationUsingKeyFrames>
+                                                    </Storyboard>
+                                                </BeginStoryboard>
+                                            </EventTrigger.Actions>
+                                        </EventTrigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </local:TouchScrollViewer.Template>
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </local:TouchScrollViewer>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsGrouping" Value="true"/>
+                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+            </MultiTrigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
index 79ecd4387..cac9f47e4 100644
--- a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
+++ b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
@@ -86,6 +86,7 @@
     <Compile Include="Controls\TouchNumericTextBox.cs" />
     <Compile Include="Controls\TouchProgressBar.cs" />
     <Compile Include="Controls\TouchRingProgress.cs" />
+    <Compile Include="Controls\TouchSimpleDataGrid.cs" />
     <Compile Include="Controls\TouchSlider.cs" />
     <Compile Include="Controls\TouchStaticListBox.cs" />
     <Compile Include="Controls\TouchStaticListBoxItem.cs" />
@@ -224,6 +225,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Controls\TouchSimpleDataGrid.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Controls\TouchSlider.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -404,7 +409,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml b/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml
index 6ae82cefb..f5b8f3caa 100644
--- a/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml
@@ -46,6 +46,7 @@
         <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Controls/TouchDatePicker.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Controls/TouchVirtualizedContentControl.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Controls/TouchDropShadowBorder.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Controls/TouchSimpleDataGrid.xaml" />
      
         <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Controls/TouchToggleImageButton.xaml" />
 
-- 
cgit v1.3.1


From 333a1e44ac878c6de96bc398e0fa49d3adabc4c1 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 8 Sep 2019 14:56:38 +0300
Subject: Refactored RML module CCT association.

---
 .../Tango.MachineStudio.RML/Models/CctModel.cs     |  16 ++++
 .../Tango.MachineStudio.RML.csproj                 |   1 +
 .../ViewModels/MainViewVM.cs                       | 106 ++++++++++++++++++---
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     |   2 +-
 4 files changed, 110 insertions(+), 15 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/CctModel.cs

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/CctModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/CctModel.cs
new file mode 100644
index 000000000..9079b8fc6
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/CctModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.MachineStudio.RML.Models
+{
+    public class CctModel
+    {
+        public String Guid { get; set; }
+        public String FileName { get; set; }
+        public bool IsNew { get; set; }
+        public byte[] Data { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
index 6b113be5f..fc05f3c16 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
@@ -73,6 +73,7 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Contracts\IMainView.cs" />
+    <Compile Include="Models\CctModel.cs" />
     <Compile Include="RMLModule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index 7218ef5ea..cb79dd043 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -17,6 +17,7 @@ using Tango.MachineStudio.ColorLab.ViewModels;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.RML.Contracts;
+using Tango.MachineStudio.RML.Models;
 using Tango.MachineStudio.RML.Views;
 using Tango.PMR.ColorLab;
 
@@ -120,6 +121,20 @@ namespace Tango.MachineStudio.RML.ViewModels
             set { _activeProcessParametersTableView = value; RaisePropertyChangedAuto(); }
         }
 
+        private ObservableCollection<CctModel> _ccts;
+        public ObservableCollection<CctModel> CCTS
+        {
+            get { return _ccts; }
+            set { _ccts = value; RaisePropertyChangedAuto(); }
+        }
+
+        private CctModel _selectedCCT;
+        public CctModel SelectedCCT
+        {
+            get { return _selectedCCT; }
+            set { _selectedCCT = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
         /// <summary>
         /// Gets or sets the manage RML command.
         /// </summary>
@@ -170,9 +185,9 @@ namespace Tango.MachineStudio.RML.ViewModels
             CreateCalibrationDataExcelTemplateCommand = new RelayCommand(CreateCalibrationDataExcelTemplate);
             SaveCommand = new RelayCommand(Save, () => IsFree);
 
-            ImportForwardDataCommand = new RelayCommand(ImportForwardData, () => ActiveRML != null && IsFree);
+            ImportForwardDataCommand = new RelayCommand(ImportCCTData, () => ActiveRML != null && IsFree);
 
-            ExportForwardDataCommand = new RelayCommand(ExportForwardData, () => ActiveRML != null && ActiveRML.Cct != null && IsFree);
+            ExportForwardDataCommand = new RelayCommand(ExportCCTData, () => ActiveRML != null && SelectedCCT != null && IsFree);
         }
 
         public override void OnApplicationReady()
@@ -201,6 +216,16 @@ namespace Tango.MachineStudio.RML.ViewModels
 
                 _active_context = ObservablesContext.CreateDefault();
 
+                CCTS = _active_context.Ccts
+                    .Select(x => new CctModel()
+                    {
+                        Guid = x.Guid,
+                        FileName = x.FileName,
+
+                    }).ToObservableCollection();
+
+                CCTS.Where(x => String.IsNullOrWhiteSpace(x.FileName)).ToList().ForEach(x => x.FileName = x.Guid);
+
                 LoadRmlProperties();
 
                 ActiveRML = await new RmlBuilder(_active_context)
@@ -210,6 +235,11 @@ namespace Tango.MachineStudio.RML.ViewModels
                     .WithCCT()
                     .BuildAsync();
 
+                if (ActiveRML.Cct != null)
+                {
+                    SelectedCCT = CCTS.SingleOrDefault(x => x.Guid == ActiveRML.Cct.Guid);
+                }
+
                 if (ActiveRML.ProcessParametersTablesGroups.ToList().Count == 0)
                 {
                     if (!_notification.ShowQuestion("Could not find any process group for the selected RML. Would you like to create one?"))
@@ -483,6 +513,21 @@ namespace Tango.MachineStudio.RML.ViewModels
 
                     ActiveRML.LastUpdated = DateTime.UtcNow;
 
+                    if (SelectedCCT != null)
+                    {
+                        if (SelectedCCT.IsNew)
+                        {
+                            Cct cct = new Cct();
+                            cct.FileName = SelectedCCT.FileName;
+                            cct.Data = SelectedCCT.Data;
+                            ActiveRML.Cct = cct;
+                        }
+                        else
+                        {
+                            ActiveRML.CctGuid = SelectedCCT.Guid;
+                        }
+                    }
+
                     await _active_context.SaveChangesAsync();
                 }
             }
@@ -505,28 +550,61 @@ namespace Tango.MachineStudio.RML.ViewModels
 
         #region Import / Export Color Conversion Data
 
-        private void ImportForwardData()
+        private void ImportCCTData()
         {
             String file = GetCCTFileOpen();
             if (file != null)
             {
-                if (ActiveRML.Cct == null)
-                {
-                    Cct cct = new Cct();
-                    ActiveRML.Cct = cct;
-                }
+                CctModel cctModel = new CctModel();
+                cctModel.Guid = Guid.NewGuid().ToString();
+                cctModel.IsNew = true;
+
+                cctModel.FileName = Path.GetFileName(file);
+                cctModel.Data = File.ReadAllBytes(file);
 
-                ActiveRML.Cct.FileName = Path.GetFileName(file);
-                ActiveRML.Cct.Data = File.ReadAllBytes(file);
+                CCTS.Insert(0, cctModel);
+                SelectedCCT = cctModel;
             }
         }
 
-        private void ExportForwardData()
+        private void ExportCCTData()
         {
-            String file = GetCCTFileSave(ActiveRML.Cct.FileName);
-            if (file != null)
+            if (SelectedCCT != null)
             {
-                File.WriteAllBytes(file, ActiveRML.Cct.Data);
+                String file = GetCCTFileSave(ActiveRML.Cct.FileName);
+                if (file != null)
+                {
+                    using (_notification.PushTaskItem("Exporting CCT file..."))
+                    {
+                        try
+                        {
+                            IsFree = false;
+
+                            if (SelectedCCT.IsNew)
+                            {
+                                File.WriteAllBytes(file, SelectedCCT.Data);
+                            }
+                            else
+                            {
+                                var cct = _active_context.Ccts.SingleOrDefault(x => x.Guid == SelectedCCT.Guid);
+
+                                if (cct != null)
+                                {
+                                    File.WriteAllBytes(file, cct.Data);
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, "Error exporting CCT file.");
+                            _notification.ShowError($"An error occurred while trying to export the CCT file.\n{ex.Message}");
+                        }
+                        finally
+                        {
+                            IsFree = true;
+                        }
+                    }
+                }
             }
         }
 
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 333cf9394..fa51a6bf5 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
@@ -222,7 +222,7 @@
                                                 <Image Source="../Images/data-table.png" Height="80" Opacity="0.8"></Image>
                                                 <StackPanel VerticalAlignment="Center" Width="300" Margin="10 0 0 0">
 
-                                                    <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding ActiveRML.Cct.FileName}" HorizontalContentAlignment="Center"></TextBox>
+                                                    <ComboBox materialDesign:HintAssist.Hint="No CCT Defined" Margin="0 5 0 0" HorizontalContentAlignment="Center" ItemsSource="{Binding CCTS}" SelectedItem="{Binding SelectedCCT}" DisplayMemberPath="FileName" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
                                                     <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
                                                         <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
                                                             <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
-- 
cgit v1.3.1


From 50e86d29ec671997f599560202ff7eb84440393b Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Mon, 9 Sep 2019 10:11:20 +0300
Subject: Refactoring ColorLab module CCT association.

---
 .../Models/CctModel.cs                             |  16 ++
 .../Tango.MachineStudio.ColorLab.csproj            |   3 +-
 .../ViewModels/MainViewVM.cs                       | 188 +++++++++++++++++----
 .../Views/MainView.xaml                            |   3 +-
 .../ViewModels/MainViewVM.cs                       |   2 +
 5 files changed, 173 insertions(+), 39 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Models/CctModel.cs

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Models/CctModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Models/CctModel.cs
new file mode 100644
index 000000000..bb5525ffb
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Models/CctModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.MachineStudio.ColorLab.Models
+{
+    public class CctModel
+    {
+        public String Guid { get; set; }
+        public String FileName { get; set; }
+        public bool IsNew { get; set; }
+        public byte[] Data { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj
index 367657cdc..ef01ae5f9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj
@@ -73,6 +73,7 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ColorLabModuleSettings.cs" />
+    <Compile Include="Models\CctModel.cs" />
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\CalibrationDataPointVM.cs" />
     <Compile Include="ViewModels\CalibrationDataViewVM.cs" />
@@ -196,7 +197,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
index 71929b72b..a521127e1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
@@ -17,6 +17,7 @@ using Tango.BL.Entities;
 using Tango.BL.Enumerations;
 using Tango.ColorConversion;
 using Tango.Core.Commands;
+using Tango.MachineStudio.ColorLab.Models;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Controls;
 using Tango.MachineStudio.Common.Notifications;
@@ -25,6 +26,7 @@ using Tango.PMR.ColorLab;
 using Tango.Settings;
 using Tango.SharedUI;
 using Tango.SharedUI.Controls;
+using System.Data.Entity;
 
 namespace Tango.MachineStudio.ColorLab.ViewModels
 {
@@ -32,7 +34,6 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
     {
         private ObservablesContext _dbContext;
         private INotificationProvider _notification;
-        private bool _isNewCCT;
         private bool _prevent_inverse_conversion;
 
         #region Properties
@@ -183,16 +184,40 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             set { _targetColor = value; RaisePropertyChangedAuto(); }
         }
 
-        private Cct _cct;
-        /// <summary>
-        /// Gets or sets the CCT.
-        /// </summary>
-        public Cct CCT
+        private ObservableCollection<CctModel> _ccts;
+        public ObservableCollection<CctModel> CCTS
+        {
+            get { return _ccts; }
+            set
+            {
+                _ccts = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private CctModel _selectedCCT;
+        public CctModel SelectedCCT
         {
-            get { return _cct; }
-            set { _cct = value; RaisePropertyChangedAuto(); }
+            get { return _selectedCCT; }
+            set
+            {
+                _selectedCCT = value;
+                RaisePropertyChangedAuto();
+                InvalidateRelayCommands();
+                OnSelectedCCTChanged();
+            }
         }
 
+        //private Cct _cct;
+        ///// <summary>
+        ///// Gets or sets the CCT.
+        ///// </summary>
+        //public Cct CCT
+        //{
+        //    get { return _cct; }
+        //    set { _cct = value; RaisePropertyChangedAuto(); }
+        //}
+
         private int _deltaChroma;
         /// <summary>
         /// Gets or sets the delta chroma.
@@ -265,14 +290,14 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
         {
             _notification = notification;
 
-            CCT = new Cct();
+            // CCT = new Cct();
 
             SourceColor = new RgbVM();
             SourceColor.ColorChanged += SourceColor_ColorChanged;
 
             ImportForwardDataCommand = new RelayCommand(ImportForwardData, () => SelectedRML != null && IsFree);
 
-            ExportForwardDataCommand = new RelayCommand(ExportForwardData, () => SelectedRML != null && CCT != null && CCT.FileName != null && IsFree);
+            ExportForwardDataCommand = new RelayCommand(ExportForwardData, () => SelectedRML != null && SelectedCCT != null && IsFree);
 
             SaveCommand = new RelayCommand(Save, () => SelectedRML != null && IsFree);
         }
@@ -299,6 +324,15 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                 Machines = _dbContext.Machines.ToObservableCollection();
                 ColorSpaces = _dbContext.ColorSpaces.ToObservableCollection();
                 Rmls = _dbContext.Rmls.ToObservableCollection();
+
+                CCTS = _dbContext.Ccts.Select(x => new CctModel()
+                {
+                    Guid = x.Guid,
+                    FileName = x.FileName,
+
+                }).ToObservableCollection();
+
+                CCTS.Where(x => String.IsNullOrWhiteSpace(x.FileName)).ToList().ForEach(x => x.FileName = x.Guid);
             });
 
             var settings = SettingsManager.Default.GetOrCreate<ColorLabModuleSettings>();
@@ -331,13 +365,13 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             {
                 try
                 {
-                    if (LiquidsCalibrationData == null || CCT.Data == null) return;
+                    if (LiquidsCalibrationData == null || SelectedCCT == null || SelectedCCT.Data == null) return;
 
                     ConversionInput input = new ConversionInput();
                     input.ColorSpace = SourceColor.IsLab ? PMR.ColorLab.ColorSpace.Lab : PMR.ColorLab.ColorSpace.Rgb;
                     input.DeltaChroma = DeltaChroma;
                     input.DeltaL = DeltaL;
-                    input.ForwardData = ByteString.CopyFrom(CCT.Data);
+                    input.ForwardData = ByteString.CopyFrom(SelectedCCT.Data);
 
                     input.InputCoordinates = new InputCoordinates();
                     input.InputCoordinates.Red = (int)SourceColor.Red;
@@ -452,17 +486,57 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             String file = GetCCTFileOpen();
             if (file != null)
             {
-                CCT.FileName = Path.GetFileName(file);
-                CCT.Data = File.ReadAllBytes(file);
+                CctModel cctModel = new CctModel();
+                cctModel.Guid = Guid.NewGuid().ToString();
+                cctModel.IsNew = true;
+
+                cctModel.FileName = Path.GetFileName(file);
+                cctModel.Data = File.ReadAllBytes(file);
+
+                CCTS.Insert(0, cctModel);
+                SelectedCCT = cctModel;
             }
         }
 
         private void ExportForwardData()
         {
-            String file = GetCCTFileSave(CCT.FileName);
-            if (file != null)
+
+            if (SelectedCCT != null)
             {
-                File.WriteAllBytes(file, CCT.Data);
+                String file = GetCCTFileSave(SelectedCCT.FileName);
+                if (file != null)
+                {
+                    using (_notification.PushTaskItem("Exporting CCT file..."))
+                    {
+                        try
+                        {
+                            IsFree = false;
+
+                            if (SelectedCCT.IsNew)
+                            {
+                                File.WriteAllBytes(file, SelectedCCT.Data);
+                            }
+                            else
+                            {
+                                var cct = _dbContext.Ccts.SingleOrDefault(x => x.Guid == SelectedCCT.Guid);
+
+                                if (cct != null)
+                                {
+                                    File.WriteAllBytes(file, cct.Data);
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, "Error exporting CCT file.");
+                            _notification.ShowError($"An error occurred while trying to export the CCT file.\n{ex.Message}");
+                        }
+                        finally
+                        {
+                            IsFree = true;
+                        }
+                    }
+                }
             }
         }
 
@@ -497,6 +571,25 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
         #endregion
 
         #region Liquid Volumes
+        private async void OnSelectedCCTChanged()
+        {
+            if (SelectedCCT != null && !SelectedCCT.IsNew)
+            {
+                using (_notification.PushTaskItem("Loading CCT data..."))
+                {
+                    IsFree = false;
+
+                    var cct = await _dbContext.Ccts.SingleOrDefaultAsync(x => x.Guid == SelectedCCT.Guid);
+
+                    if (cct != null)
+                    {
+                        SelectedCCT.Data = cct.Data;
+                    }
+
+                    IsFree = true;
+                }
+            }
+        }
 
         private void OnSelectedMachineChanged()
         {
@@ -551,7 +644,7 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                 input.ColorSpace = PMR.ColorLab.ColorSpace.Volume;
                 input.DeltaChroma = DeltaChroma;
                 input.DeltaL = DeltaL;
-                input.ForwardData = ByteString.CopyFrom(CCT.Data);
+                input.ForwardData = ByteString.CopyFrom(SelectedCCT.Data);
 
                 input.InputCoordinates = new InputCoordinates();
                 input.ThreadL = SelectedRML.WhitePointL;
@@ -636,12 +729,33 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                             _dbContext.Adapter.GetConfiguration(x => x.Guid == SelectedMachine.ConfigurationGuid);
                         }
 
-                        _selectedRML = new RmlBuilder(_dbContext)
+                        var builder = new RmlBuilder(_dbContext)
                         .Set(_selectedRML.Guid)
                         .WithActiveParametersGroup()
                         .WithCAT(SelectedMachine.Guid)
-                        .WithCCT()
-                        .WithLiquidFactors().Build();
+                        .WithLiquidFactors();
+
+                        if (IsHosted)
+                        {
+                            builder.WithCCT();
+                        }
+
+                        _selectedRML = builder.Build();
+
+                        if (IsHosted)
+                        {
+                            if(SelectedRML.Cct != null){
+
+                                SelectedCCT = new CctModel()
+                                {
+                                    Data = SelectedRML.Cct.Data
+                                };
+                            }
+                        }
+                        else
+                        {
+                            SelectedCCT = CCTS.SingleOrDefault(x => x.Guid == SelectedRML.CctGuid);
+                        }
 
                         LiquidVolumes = SelectedMachine.Configuration.GetSupportedIdsPacks(_selectedRML).Select(x => new LiquidVolumeVM()
                         {
@@ -685,16 +799,6 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                             }
                         }
 
-                        _isNewCCT = false;
-                        CCT = SelectedRML.Cct;
-
-                        if (CCT == null)
-                        {
-                            CCT = new Cct();
-                            SelectedRML.Cct = CCT;
-                            _isNewCCT = true;
-                        }
-
                         var settings = SettingsManager.Default.GetOrCreate<ColorLabModuleSettings>();
                         settings.LastMachineSerialNumber = SelectedMachine.SerialNumber;
                         settings.LastRmlGuid = SelectedRML.Guid;
@@ -750,11 +854,6 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
 
         public async Task SaveChanges()
         {
-            if (_isNewCCT)
-            {
-                _dbContext.Ccts.Add(CCT);
-            }
-
             foreach (var calDataVM in LiquidsCalibrationData)
             {
                 var cat = calDataVM.IdsPack.LiquidType.Cats.FirstOrDefault(x => x.Machine == SelectedMachine && x.Rml == SelectedRML);
@@ -777,6 +876,23 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                 cat.PutCalibrationData(calData);
             }
 
+            if (SelectedCCT != null && !IsHosted)
+            {
+                if (SelectedCCT.IsNew)
+                {
+                    Cct cct = new Cct();
+                    cct.Guid = SelectedCCT.Guid;
+                    cct.FileName = SelectedCCT.FileName;
+                    cct.Data = SelectedCCT.Data;
+                    SelectedRML.Cct = cct;
+                    SelectedCCT.IsNew = false;
+                }
+                else
+                {
+                    SelectedRML.CctGuid = SelectedCCT.Guid;
+                }
+            }
+
             await _dbContext.SaveChangesAsync();
 
             InvalidateLiquidFactorsCalibrationData();
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 49966bad2..37f5f70be 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
@@ -148,8 +148,7 @@
                                     <materialDesign:PackIcon Kind="ArrowLeftBoldHexagonOutline" VerticalAlignment="Center" Width="40" Height="40" />
                                     <Image Source="../Images/data-table.png" Height="80" Opacity="0.8"></Image>
                                     <StackPanel VerticalAlignment="Center" Width="300" Margin="10 0 0 0">
-
-                                        <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding CCT.FileName}" HorizontalContentAlignment="Center"></TextBox>
+                                        <ComboBox materialDesign:HintAssist.Hint="No CCT Defined" Margin="0 5 0 0" HorizontalContentAlignment="Center" ItemsSource="{Binding CCTS}" SelectedItem="{Binding SelectedCCT}" DisplayMemberPath="FileName" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
                                         <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
                                             <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
                                                 <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index cb79dd043..aa84fb137 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -518,9 +518,11 @@ namespace Tango.MachineStudio.RML.ViewModels
                         if (SelectedCCT.IsNew)
                         {
                             Cct cct = new Cct();
+                            cct.Guid = SelectedCCT.Guid;
                             cct.FileName = SelectedCCT.FileName;
                             cct.Data = SelectedCCT.Data;
                             ActiveRML.Cct = cct;
+                            SelectedCCT.IsNew = false;
                         }
                         else
                         {
-- 
cgit v1.3.1


From b34d8641f72e7b92958ea17d10ff15c29d37c464 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Mon, 16 Sep 2019 11:40:14 +0300
Subject: Dropping Machine Studio ColorLab Module. Move to RML module.

Related Work Items: #1168
---
 .../Images/arrow-long-down.png                     | Bin 0 -> 2865 bytes
 .../Images/arrow-long-left.png                     | Bin 0 -> 2413 bytes
 .../Images/arrow-long-right.png                    | Bin 0 -> 2169 bytes
 .../Tango.MachineStudio.RML.csproj                 |  54 +-
 .../ViewModels/CalibrationDataPointVM.cs           |  64 ++
 .../ViewModels/CalibrationDataVM.cs                |  83 +++
 .../ViewModels/CalibrationDataViewVM.cs            | 110 +++
 .../ViewModels/ColorConversionViewVM.cs            | 396 +++++++++++
 .../ViewModels/LiquidVolumeVM.cs                   |  51 ++
 .../ViewModels/MainViewVM.cs                       |  41 +-
 .../Tango.MachineStudio.RML/ViewModels/RgbVM.cs    | 148 ++++
 .../Views/CalibrationDataView.xaml                 |  72 ++
 .../Views/CalibrationDataView.xaml.cs              |  28 +
 .../Views/ColorConversionView.xaml                 | 772 +++++++++++++++++++++
 .../Views/ColorConversionView.xaml.cs              |  28 +
 .../Views/ProcessParametersView.xaml               | 155 +++++
 .../Views/ProcessParametersView.xaml.cs            |  59 ++
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     | 272 ++------
 .../Tango.MachineStudio.RML/Views/RmlView.xaml.cs  |  22 +-
 Software/Visual_Studio/Tango.sln                   |  13 +-
 20 files changed, 2141 insertions(+), 227 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/arrow-long-down.png
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/arrow-long-left.png
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/arrow-long-right.png
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/CalibrationDataPointVM.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/CalibrationDataVM.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/CalibrationDataViewVM.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml.cs

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/arrow-long-down.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/arrow-long-down.png
new file mode 100644
index 000000000..e3a862399
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/arrow-long-down.png differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/arrow-long-left.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/arrow-long-left.png
new file mode 100644
index 000000000..5845204d2
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/arrow-long-left.png differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/arrow-long-right.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/arrow-long-right.png
new file mode 100644
index 000000000..6c089d44e
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/arrow-long-right.png differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
index fc05f3c16..6741a1dff 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
@@ -90,13 +90,28 @@
     </Compile>
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\AddLiquidFactorViewVM.cs" />
+    <Compile Include="ViewModels\CalibrationDataPointVM.cs" />
+    <Compile Include="ViewModels\CalibrationDataViewVM.cs" />
+    <Compile Include="ViewModels\CalibrationDataVM.cs" />
+    <Compile Include="ViewModels\ColorConversionViewVM.cs" />
+    <Compile Include="ViewModels\LiquidVolumeVM.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
+    <Compile Include="ViewModels\RgbVM.cs" />
     <Compile Include="Views\AddLiquidFactorView.xaml.cs">
       <DependentUpon>AddLiquidFactorView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\CalibrationDataView.xaml.cs">
+      <DependentUpon>CalibrationDataView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ColorConversionView.xaml.cs">
+      <DependentUpon>ColorConversionView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\ProcessParametersView.xaml.cs">
+      <DependentUpon>ProcessParametersView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\RmlsView.xaml.cs">
       <DependentUpon>RmlsView.xaml</DependentUpon>
     </Compile>
@@ -115,10 +130,22 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\SideChains\ColorMine\ColorMine.csproj">
+      <Project>{37e4ceab-b54b-451f-b535-04cf7da9c459}</Project>
+      <Name>ColorMine</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
       <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
       <Name>Tango.BL</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.BrushPicker\Tango.BrushPicker.csproj">
+      <Project>{40085232-aced-4cbe-945b-90ba8153c151}</Project>
+      <Name>Tango.BrushPicker</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.ColorConversion\Tango.ColorConversion.csproj">
+      <Project>{b4fe6485-4161-4b36-bc08-67e0b53d01b7}</Project>
+      <Name>Tango.ColorConversion</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.Core\Tango.Core.csproj">
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
@@ -135,6 +162,10 @@
       <Project>{b112d89a-a106-41ae-a0c1-4abc84c477f5}</Project>
       <Name>Tango.DragAndDrop</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Hive\Tango.Hive.csproj">
+      <Project>{942134ac-6ea2-4500-8f22-0f739b70a05f}</Project>
+      <Name>Tango.Hive</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.Logging\Tango.Logging.csproj">
       <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project>
       <Name>Tango.Logging</Name>
@@ -155,10 +186,6 @@
       <Project>{cb0b0aa2-bb24-4bca-a720-45e397684e12}</Project>
       <Name>Tango.MachineStudio.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Tango.MachineStudio.ColorLab\Tango.MachineStudio.ColorLab.csproj">
-      <Project>{4d183aca-552b-4135-ae81-7c5a8e5fc3b1}</Project>
-      <Name>Tango.MachineStudio.ColorLab</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\rml-module.jpg" />
@@ -168,10 +195,22 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\CalibrationDataView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\ColorConversionView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MainView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\ProcessParametersView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\RmlsView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -190,6 +229,13 @@
   <ItemGroup>
     <Resource Include="Images\data-table.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\arrow-long-down.png" />
+    <Resource Include="Images\arrow-long-left.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\arrow-long-right.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/CalibrationDataPointVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/CalibrationDataPointVM.cs
new file mode 100644
index 000000000..4ad06c7ed
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/CalibrationDataPointVM.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+using Tango.PMR.ColorLab;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.RML.ViewModels
+{
+    public class CalibrationDataPointVM : ExtendedObject
+    {
+        private double _x;
+
+        public double X
+        {
+            get { return _x; }
+            set { _x = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _y;
+
+        public double Y
+        {
+            get { return _y; }
+            set { _y = value; RaisePropertyChangedAuto(); }
+        }
+
+        private int _index;
+
+        public int Index
+        {
+            get { return _index; }
+            set { _index = value; RaisePropertyChangedAuto(); }
+        }
+
+
+        public CalibrationDataPointVM()
+        {
+
+        }
+
+        public CalibrationDataPointVM(double x, double y)
+        {
+            X = x;
+            Y = y;
+        }
+
+        public CalibrationDataPointVM(CalibrationPoint calibrationPoint) : this(calibrationPoint.X, calibrationPoint.Y)
+        {
+
+        }
+
+        public CalibrationPoint ToPMR()
+        {
+            return new CalibrationPoint()
+            {
+                X = X,
+                Y = Y,
+            };
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/CalibrationDataVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/CalibrationDataVM.cs
new file mode 100644
index 000000000..403494a8e
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/CalibrationDataVM.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using Tango.Core;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.RML.ViewModels
+{
+    public class CalibrationDataVM : ExtendedObject
+    {
+        private LiquidType _liquidType;
+
+        public LiquidType LiquidType
+        {
+            get { return _liquidType; }
+            set { _liquidType = value; RaisePropertyChangedAuto(); }
+        }
+
+        private IdsPack _idsPack;
+
+        public IdsPack IdsPack
+        {
+            get { return _idsPack; }
+            set { _idsPack = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<CalibrationDataPointVM> _calibrationPoints;
+
+        public ObservableCollection<CalibrationDataPointVM> CalibrationPoints
+        {
+            get { return _calibrationPoints; }
+            set { _calibrationPoints = value; RaisePropertyChangedAuto(); OnCalibrationPointsChanged(); }
+        }
+
+        private void OnCalibrationPointsChanged()
+        {
+            if (CalibrationPoints != null)
+            {
+                CalibrationPoints.CollectionChanged -= CalibrationPoints_CollectionChanged;
+                CalibrationPoints.CollectionChanged += CalibrationPoints_CollectionChanged;
+
+                SetIndices();
+            }
+        }
+
+        private void CalibrationPoints_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            SetIndices();
+        }
+
+        private void SetIndices()
+        {
+            if (CalibrationPoints != null)
+            {
+                int index = 1;
+                foreach (var p in CalibrationPoints)
+                {
+                    p.Index = index++;
+                }
+            }
+        }
+
+        private CalibrationDataVM()
+        {
+            CalibrationPoints = new ObservableCollection<CalibrationDataPointVM>();
+        }
+
+        public CalibrationDataVM(IdsPack pack) : this()
+        {
+            IdsPack = pack;
+            LiquidType = pack.LiquidType;
+        }
+
+        public CalibrationDataVM(LiquidType liquidType) : this()
+        {
+            LiquidType = liquidType;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/CalibrationDataViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/CalibrationDataViewVM.cs
new file mode 100644
index 000000000..b34ef83bc
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/CalibrationDataViewVM.cs
@@ -0,0 +1,110 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Calibration;
+using Tango.Core.Commands;
+using Tango.MachineStudio.Common;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.RML.ViewModels
+{
+    public class CalibrationDataViewVM : ViewModel
+    {
+        private INotificationProvider _notification;
+
+        private ObservableCollection<CalibrationDataVM> _liquidsCalibrationData;
+        /// <summary>
+        /// Gets or sets the liquids calibration data.
+        /// </summary>
+        public ObservableCollection<CalibrationDataVM> LiquidsCalibrationData
+        {
+            get { return _liquidsCalibrationData; }
+            set { _liquidsCalibrationData = value; RaisePropertyChangedAuto(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the import excel command.
+        /// </summary>
+        public RelayCommand<CalibrationDataVM> ImportExcelCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the export excel command.
+        /// </summary>
+        public RelayCommand<CalibrationDataVM> ExportExcelCommand { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CalibrationDataViewVM"/> class.
+        /// </summary>
+        public CalibrationDataViewVM(INotificationProvider notificationProvider)
+        {
+            _notification = notificationProvider;
+
+            LiquidsCalibrationData = new ObservableCollection<CalibrationDataVM>();
+
+            ImportExcelCommand = new RelayCommand<CalibrationDataVM>(ImportExcel);
+            ExportExcelCommand = new RelayCommand<CalibrationDataVM>(ExportExcel);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CalibrationDataViewVM"/> class.
+        /// </summary>
+        /// <param name="liquidsCalibrationData">The liquids calibration data.</param>
+        public CalibrationDataViewVM(INotificationProvider notificationProvider, ObservableCollection<CalibrationDataVM> liquidsCalibrationData) : this(notificationProvider)
+        {
+            LiquidsCalibrationData = liquidsCalibrationData;
+        }
+
+        private void ImportExcel(CalibrationDataVM vm)
+        {
+            OpenFileDialog dlg = new OpenFileDialog();
+
+            try
+            {
+                dlg.Title = $"Import excel calibration file for {vm.LiquidType.Name}";
+                dlg.Filter = "Excel Files|*.xlsx";
+                if (dlg.ShowDialog().Value)
+                {
+                    vm.CalibrationPoints.Clear();
+                    var points = CalibrationHelper.ImportCalibrationDataFromExcel(dlg.FileName);
+
+                    foreach (var p in points)
+                    {
+                        vm.CalibrationPoints.Add(new CalibrationDataPointVM(p));
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error importing excel file " + dlg.FileName);
+                _notification.ShowError("An error occurred while trying to import the selected excel file. Please check the file format if valid and is available to read.");
+            }
+        }
+
+        private void ExportExcel(CalibrationDataVM vm)
+        {
+            SaveFileDialog dlg = new SaveFileDialog();
+            try
+            {
+                dlg.Title = $"Export excel calibration file for {vm.LiquidType.Name}";
+                dlg.Filter = "Excel Files|*.xlsx";
+                dlg.DefaultExt = ".xlsx";
+                dlg.FileName = $"CData_{vm.LiquidType.Name}_v{vm.LiquidType.Version}.xlsx";
+                if (dlg.ShowDialog().Value)
+                {
+                    var points = vm.CalibrationPoints.Select(x => x.ToPMR()).ToList();
+                    CalibrationHelper.ExportCalibrationDataToExcel(points, dlg.FileName);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error exporting excel file " + dlg.FileName);
+                _notification.ShowError("An error occurred while trying to export the calibration data.");
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
new file mode 100644
index 000000000..2624c9b7d
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
@@ -0,0 +1,396 @@
+using Google.Protobuf;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Data.Entity;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using Tango.BL;
+using Tango.BL.Entities;
+using Tango.BL.Enumerations;
+using Tango.ColorConversion;
+using Tango.MachineStudio.Common;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.MachineStudio.RML.Models;
+using Tango.PMR.ColorLab;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.RML.ViewModels
+{
+    public class ColorConversionViewVM: ViewModel
+    {
+        #region properties
+
+        private INotificationProvider _notification;
+        private bool _prevent_inverse_conversion;
+
+        private bool _isVolumesOutOfRange;
+        /// <summary>
+        /// Gets or sets a value indicating whether the liquid volumes are out of range.
+        /// </summary>
+        public bool IsVolumesOutOfRange
+        {
+            get { return _isVolumesOutOfRange; }
+            set
+            {
+                if (_isVolumesOutOfRange != value)
+                {
+                    _isVolumesOutOfRange = value;
+                    RaisePropertyChangedAuto();
+                }
+            }
+        }
+
+        private bool _isOutOfGamut;
+        /// <summary>
+        /// Gets or sets a value indicating whether the source color is out of gamut.
+        /// </summary>
+        public bool IsOutOfGamut
+        {
+            get { return _isOutOfGamut; }
+            set { _isOutOfGamut = value; RaisePropertyChangedAuto(); }
+        }
+
+        private Rml _rml;
+        public Rml RML
+        {
+            get { return _rml; }
+            set { _rml = value; RaisePropertyChangedAuto(); }
+        }
+
+        private List<ColorConversionSuggestion> _hiveSuggestions;
+        /// <summary>
+        /// Gets or sets the hive suggestions.
+        /// </summary>
+        public List<ColorConversionSuggestion> HiveSuggestions
+        {
+            get { return _hiveSuggestions; }
+            set { _hiveSuggestions = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ColorConversionSuggestion _selectedSuggestion;
+        /// <summary>
+        /// Gets or sets the selected suggestion.
+        /// </summary>
+        public ColorConversionSuggestion SelectedSuggestion
+        {
+            get { return _selectedSuggestion; }
+            set { _selectedSuggestion = value; RaisePropertyChangedAuto(); OnSelectedSuggestionChanged(); }
+        }
+
+        private ObservableCollection<LiquidTypesRml> _liquidTypesRmls;
+        /// <summary>
+        /// Gets or sets the liquid types RMLS.
+        /// </summary>
+        public ObservableCollection<LiquidTypesRml> LiquidTypesRmls
+        {
+            get { return _liquidTypesRmls; }
+            set { _liquidTypesRmls = value; RaisePropertyChangedAuto(); OnLiquidTypesRmlsChanged(); }
+        }
+
+        private void OnLiquidTypesRmlsChanged()
+        {
+            if (LiquidTypesRmls != null)
+            {
+                LiquidTypesRmls.CollectionChanged += LiquidTypesRmls_CollectionChanged;
+                InvalidateLiquidVolumes();
+            }
+        }
+
+        private void LiquidTypesRmls_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            InvalidateLiquidVolumes();
+        }
+
+        private void InvalidateLiquidVolumes()
+        {
+            LiquidVolumes = LiquidTypesRmls.Where(x => x.LiquidType.HasPigment).Select(x => new LiquidVolumeVM()
+            {
+                Color = x.LiquidType.Color,
+                Name = x.LiquidType.Name,
+                LiquidType = x.LiquidType,
+            }).ToObservableCollection();
+        }
+
+        private ObservableCollection<LiquidVolumeVM> _liquidVolumes;
+        /// <summary>
+        /// Gets or sets the liquid volumes.
+        /// </summary>
+        public ObservableCollection<LiquidVolumeVM> LiquidVolumes
+        {
+            get { return _liquidVolumes; }
+            set { _liquidVolumes = value; RaisePropertyChangedAuto(); OnLiquidsVolumesChanged(); }
+        }
+
+        private ObservableCollection<CalibrationDataVM> _liquidsCalibrationData;
+        /// <summary>
+        /// Gets or sets the liquids calibration data.
+        /// </summary>
+        public ObservableCollection<CalibrationDataVM> LiquidsCalibrationData
+        {
+            get { return _liquidsCalibrationData; }
+            set { _liquidsCalibrationData = value; RaisePropertyChangedAuto(); }
+        }
+
+        private CctModel _cct;
+        public CctModel CCT
+        {
+            get { return _cct; }
+            set
+            {
+                _cct = value;
+                RaisePropertyChangedAuto();
+                InvalidateRelayCommands();
+            }
+        }
+
+        private RgbVM _sourceColor;
+        /// <summary>
+        /// Gets or sets the color of the source.
+        /// </summary>
+        public RgbVM SourceColor
+        {
+            get { return _sourceColor; }
+            set { _sourceColor = value; RaisePropertyChangedAuto(); }
+        }
+
+        private RgbVM _targetColor;
+        /// <summary>
+        /// Gets or sets the color of the target.
+        /// </summary>
+        /// <value>
+        /// The color of the target.
+        /// </value>
+        public RgbVM TargetColor
+        {
+            get { return _targetColor; }
+            set { _targetColor = value; RaisePropertyChangedAuto(); }
+        }
+
+        #endregion
+
+        public ColorConversionViewVM(INotificationProvider notification)
+        {
+            _notification = notification;
+
+            // CCT = new Cct();
+
+            SourceColor = new RgbVM();
+            SourceColor.ColorChanged += SourceColor_ColorChanged;
+        }
+
+        private void OnLiquidsVolumesChanged()
+        {
+            LiquidVolumes.EnableCrossThreadOperations();
+            LiquidVolumes.ToList().ForEach(x => x.VolumeChanged += (s, e) => OnLiquidVolumeChanged());
+        }
+
+        private void SourceColor_ColorChanged(object sender, Color e)
+        {
+            GetHiveSuggestions();
+        }
+
+        private void GetHiveSuggestions()
+        {
+            Task.Factory.StartNew(() =>
+            {
+                try
+                {
+                    if (RML == null || LiquidsCalibrationData == null || CCT == null || CCT.Data == null) return;
+
+                    ConversionInput input = new ConversionInput();
+                    input.ColorSpace = SourceColor.IsLab ? PMR.ColorLab.ColorSpace.Lab : PMR.ColorLab.ColorSpace.Rgb;
+                    //input.DeltaChroma = DeltaChroma;
+                    //input.DeltaL = DeltaL;
+                    input.ForwardData = ByteString.CopyFrom(CCT.Data);
+
+                    input.InputCoordinates = new InputCoordinates();
+                    input.InputCoordinates.Red = (int)SourceColor.Red;
+                    input.InputCoordinates.Green = (int)SourceColor.Green;
+                    input.InputCoordinates.Blue = (int)SourceColor.Blue;
+
+                    input.InputCoordinates.L = SourceColor.L;
+                    input.InputCoordinates.A = SourceColor.A;
+                    input.InputCoordinates.B = SourceColor.B;
+
+                    input.ThreadL = RML.WhitePointL;
+                    input.ThreadA = RML.WhitePointA;
+                    input.ThreadB = RML.WhitePointB;
+
+                    //Validate calibration data
+                    foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment))
+                    {
+                        if (vm.CalibrationPoints.Count == 0)
+                        {
+                            InvokeUI(() =>
+                            {
+                                _notification.ShowError($"No calibration data for liquid '{vm.LiquidType.Name}'. Could not convert source color.");
+                            });
+                            return;
+                        }
+                        else if (!(vm.CalibrationPoints.First().X == 0 && vm.CalibrationPoints.First().Y == 0 && vm.CalibrationPoints.Last().X == 100 && vm.CalibrationPoints.Last().Y == 100))
+                        {
+                            InvokeUI(() =>
+                            {
+                                _notification.ShowError($"Invalid calibration data for liquid '{vm.LiquidType.Name}'. Could not convert source color.");
+                            });
+                            return;
+                        }
+                    }
+
+                    foreach (var vm in LiquidsCalibrationData)
+                    {
+                        InputLiquid inputLiquid = new InputLiquid();
+
+
+                        CalibrationData calData = new CalibrationData();
+                        calData.LiquidType = (PMR.ColorLab.LiquidType)vm.LiquidType.Code;
+                        calData.CalibrationPoints.AddRange(vm.CalibrationPoints.Select(x => new CalibrationPoint() { X = x.X, Y = x.Y }));
+
+                        inputLiquid.CalibrationData = calData;
+
+                        inputLiquid.LiquidType = (PMR.ColorLab.LiquidType)vm.LiquidType.Code;
+                        inputLiquid.MaxNanoliterPerCentimeter = LiquidTypesRmls.SingleOrDefault(x => x.LiquidType.Code == vm.LiquidType.Code).MaxNlPerCm;
+
+                        input.InputCoordinates.InputLiquids.Add(inputLiquid);
+                    }
+
+                    foreach (var process in RML.GetActiveProcessGroup().ProcessParametersTables)
+                    {
+                        input.ProcessRanges.Add(new ProcessRange()
+                        {
+                            MinInkUptake = process.MinInkUptake,
+                            MaxInkUptake = process.MaxInkUptake,
+                        });
+                    }
+
+                    IColorConverter converter = new DefaultColorConverter();
+
+                    var output = converter.Convert(input);
+
+                    IsOutOfGamut = output.OutOfGamut;
+
+                    HiveSuggestions = output.CreateHiveSuggestions();
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "An error occurred while trying to convert from source color to Volume.");
+
+                    InvokeUI(() =>
+                    {
+                        _notification.ShowError($"An error occurred while trying to convert from source color to Volume.\n" + ex.Message);
+                    });
+                }
+            });
+        }
+
+        private void OnSelectedSuggestionChanged()
+        {
+            if (SelectedSuggestion != null)
+            {
+                _prevent_inverse_conversion = true;
+
+                var coords = SelectedSuggestion.Coordinates;
+
+                foreach (var liquid in coords.OutputLiquids)
+                {
+                    var liquidVolume = LiquidVolumes.SingleOrDefault(x => x.LiquidType.Code == liquid.LiquidType.ToInt32());
+
+                    if (liquidVolume != null)
+                    {
+                        liquidVolume.Volume = liquid.Volume;
+                    }
+                }
+
+                _prevent_inverse_conversion = false;
+
+                OnLiquidVolumeChanged();
+            }
+        }
+
+        private void OnLiquidVolumeChanged()
+        {
+            try
+            {
+                if (LiquidsCalibrationData == null || _prevent_inverse_conversion) return;
+
+                //TODO: This is temporary because of out of range volumes.
+                if (LiquidVolumes.Where(x => x.LiquidType.HasPigment).Sum(x => x.Volume) > 200)
+                {
+                    IsVolumesOutOfRange = true;
+                    return;
+                }
+                else
+                {
+                    IsVolumesOutOfRange = false;
+                }
+
+                ConversionInput input = new ConversionInput();
+                input.ColorSpace = PMR.ColorLab.ColorSpace.Volume;
+                input.ForwardData = ByteString.CopyFrom(CCT.Data);
+
+                input.InputCoordinates = new InputCoordinates();
+                input.ThreadL = RML.WhitePointL;
+                input.ThreadA = RML.WhitePointA;
+                input.ThreadB = RML.WhitePointB;
+
+                foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment))
+                {
+                    InputLiquid inputLiquid = new InputLiquid();
+
+                    CalibrationData calData = new CalibrationData();
+                    calData.LiquidType = (PMR.ColorLab.LiquidType)vm.LiquidType.Code;
+                    calData.CalibrationPoints.AddRange(vm.CalibrationPoints.Select(x => new CalibrationPoint() { X = x.X, Y = x.Y }));
+
+                    inputLiquid.CalibrationData = calData;
+
+                    inputLiquid.LiquidType = (PMR.ColorLab.LiquidType)vm.LiquidType.Code;
+                    inputLiquid.MaxNanoliterPerCentimeter = LiquidTypesRmls.SingleOrDefault(x => x.LiquidType.Code == vm.LiquidType.Code).MaxNlPerCm;
+                    inputLiquid.Volume = LiquidVolumes.SingleOrDefault(x => x.LiquidType == vm.LiquidType).Volume;
+
+                    input.InputCoordinates.InputLiquids.Add(inputLiquid);
+                }
+
+                foreach (var process in RML.ProcessParametersTablesGroups.Single().ProcessParametersTables)
+                {
+                    input.ProcessRanges.Add(new ProcessRange()
+                    {
+                        MinInkUptake = process.MinInkUptake,
+                        MaxInkUptake = process.MaxInkUptake,
+                    });
+                }
+
+                IColorConverter converter = new DefaultColorConverter();
+
+                var output = converter.Convert(input);
+
+                if (SourceColor.IsLab)
+                {
+                    TargetColor = new RgbVM()
+                    {
+                        IsLab = true,
+                        L = output.SingleCoordinates.L,
+                        A = output.SingleCoordinates.A,
+                        B = output.SingleCoordinates.B,
+                    };
+                }
+                else
+                {
+                    TargetColor = new RgbVM()
+                    {
+                        Red = output.SingleCoordinates.Red,
+                        Green = output.SingleCoordinates.Green,
+                        Blue = output.SingleCoordinates.Blue,
+                    };
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error in inversed color conversion!");
+                _notification.ShowError("An error occurred while trying to convert from Volume to RGB.\n" + ex.Message);
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs
new file mode 100644
index 000000000..7399d62af
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/LiquidVolumeVM.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using Tango.Core;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.RML.ViewModels
+{
+    public class LiquidVolumeVM : ExtendedObject
+    {
+        public event EventHandler<double> VolumeChanged;
+
+        private String _name;
+
+        public String Name
+        {
+            get { return _name; }
+            set { _name = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _volume;
+
+        public double Volume
+        {
+            get { return _volume; }
+            set
+            {
+                _volume = value; RaisePropertyChangedAuto();
+                VolumeChanged?.Invoke(this, _volume);
+            }
+        }
+
+        private int _color;
+
+        public int Color
+        {
+            get { return _color; }
+            set { _color = value; RaisePropertyChangedAuto(); }
+        }
+
+        private LiquidType _liquidType;
+        public LiquidType LiquidType
+        {
+            get { return _liquidType; }
+            set { _liquidType = value; RaisePropertyChangedAuto(); }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index aa84fb137..361608ef6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -13,13 +13,13 @@ using Tango.BL.Builders;
 using Tango.BL.Calibration;
 using Tango.BL.Entities;
 using Tango.Core.Commands;
-using Tango.MachineStudio.ColorLab.ViewModels;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.RML.Contracts;
 using Tango.MachineStudio.RML.Models;
 using Tango.MachineStudio.RML.Views;
 using Tango.PMR.ColorLab;
+using System.Data.Entity;
 
 namespace Tango.MachineStudio.RML.ViewModels
 {
@@ -132,7 +132,14 @@ namespace Tango.MachineStudio.RML.ViewModels
         public CctModel SelectedCCT
         {
             get { return _selectedCCT; }
-            set { _selectedCCT = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+            set { _selectedCCT = value; RaisePropertyChangedAuto(); OnSelectedCCTChanged(); InvalidateRelayCommands(); }
+        }
+
+        private ColorConversionViewVM _colorConversionViewVM;
+        public ColorConversionViewVM ColorConversionViewVM
+        {
+            get { return _colorConversionViewVM; }
+            set { _colorConversionViewVM = value; RaisePropertyChangedAuto(); }
         }
 
         /// <summary>
@@ -287,6 +294,13 @@ namespace Tango.MachineStudio.RML.ViewModels
                     CalibrationDataViewVM.LiquidsCalibrationData.Add(catVM);
                 }
 
+                ColorConversionViewVM = new ColorConversionViewVM(_notification)
+                {
+                    RML = ActiveRML,
+                    CCT = SelectedCCT,
+                    LiquidsCalibrationData = CalibrationDataViewVM.LiquidsCalibrationData,
+                    LiquidTypesRmls = LiquidTypesRmls,
+                };
 
                 View.NavigateTo(RmlNavigationView.RmlView);
 
@@ -296,6 +310,27 @@ namespace Tango.MachineStudio.RML.ViewModels
             }
         }
 
+        private async void OnSelectedCCTChanged()
+        {
+            if (SelectedCCT != null && !SelectedCCT.IsNew)
+            {
+                using (_notification.PushTaskItem("Loading CCT data..."))
+                {
+                    IsFree = false;
+
+                    var cct = await _active_context.Ccts.SingleOrDefaultAsync(x => x.Guid == SelectedCCT.Guid);
+
+                    if (cct != null)
+                    {
+                        SelectedCCT.Data = cct.Data;
+                        ColorConversionViewVM.CCT = SelectedCCT;
+                    }
+
+                    IsFree = true;
+                }
+            }
+        }
+
         private void LoadRmlProperties()
         {
             Materials = _active_context.MediaMaterials.ToObservableCollection();
@@ -566,6 +601,8 @@ namespace Tango.MachineStudio.RML.ViewModels
 
                 CCTS.Insert(0, cctModel);
                 SelectedCCT = cctModel;
+
+                ColorConversionViewVM.CCT = SelectedCCT;
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs
new file mode 100644
index 000000000..e64592aae
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/RgbVM.cs
@@ -0,0 +1,148 @@
+using ColorMine.ColorSpaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using System.Windows.Threading;
+using Tango.Core;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.RML.ViewModels
+{
+    public class RgbVM : ExtendedObject
+    {
+        private DispatcherTimer _color_change_timer;
+
+        public event EventHandler<Color> ColorChanged;
+
+        public RgbVM()
+        {
+            _color_change_timer = new DispatcherTimer();
+            _color_change_timer.Interval = TimeSpan.FromMilliseconds(30);
+            _color_change_timer.Tick += _color_change_timer_Tick;
+            _color_change_timer.Stop();
+
+            Color = Colors.DimGray;
+        }
+
+        private void _color_change_timer_Tick(object sender, EventArgs e)
+        {
+            _color_change_timer.Stop();
+            ColorChanged?.Invoke(this, Color);
+        }
+
+        private double _red;
+        public double Red
+        {
+            get { return _red; }
+            set { _red = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
+        }
+
+        private double _green;
+        public double Green
+        {
+            get { return _green; }
+            set { _green = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
+        }
+
+        private double _blue;
+        public double Blue
+        {
+            get { return _blue; }
+            set { _blue = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
+        }
+
+        private double _l;
+        public double L
+        {
+            get { return _l; }
+            set { _l = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
+        }
+
+        private double _a;
+        public double A
+        {
+            get { return _a; }
+            set { _a = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
+        }
+
+        private double _b;
+        public double B
+        {
+            get { return _b; }
+            set { _b = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
+        }
+
+        private Color _color;
+        public Color Color
+        {
+            get { return _color; }
+            set { _color = value; RaisePropertyChanged(nameof(Color)); SynchronizeComponents(); }
+        }
+
+        private bool _isLab;
+        public bool IsLab
+        {
+            get { return _isLab; }
+            set { _isLab = value; RaisePropertyChangedAuto(); }
+        }
+
+
+        private void SynchronizeColor()
+        {
+            _color_change_timer.Stop();
+
+            if (!IsLab)
+            {
+                Rgb rgb = new Rgb(Red, Green, Blue);
+                Lab lab = rgb.To<Lab>();
+                _l = lab.L;
+                _a = lab.A;
+                _b = lab.B;
+            }
+            else
+            {
+                Lab lab = new Lab(L, A, B);
+                Rgb rgb = lab.To<Rgb>();
+                _red = rgb.R;
+                _green = rgb.G;
+                _blue = rgb.B;
+            }
+
+            _color = Color.FromRgb((byte)Red, (byte)Green, (byte)Blue);
+            RaisePropertyChanged(nameof(Color));
+
+            _color_change_timer.Start();
+        }
+
+        private void SynchronizeComponents()
+        {
+            _color_change_timer.Stop();
+
+            _red = Color.R;
+            _green = Color.G;
+            _blue = Color.B;
+
+            if (IsLab)
+            {
+                Rgb rgb = new Rgb(Red, Green, Blue);
+                Lab lab = rgb.To<Lab>();
+                _l = lab.L;
+                _a = lab.A;
+                _b = lab.B;
+            }
+
+            RaisePropertyChanged(nameof(Red));
+            RaisePropertyChanged(nameof(Green));
+            RaisePropertyChanged(nameof(Blue));
+            RaisePropertyChanged(nameof(L));
+            RaisePropertyChanged(nameof(A));
+            RaisePropertyChanged(nameof(B));
+            RaisePropertyChanged(nameof(Color));
+
+            _color_change_timer.Start();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml
new file mode 100644
index 000000000..54e96017c
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml
@@ -0,0 +1,72 @@
+<UserControl x:Class="Tango.MachineStudio.RML.Views.CalibrationDataView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.RML.ViewModels"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:local="clr-namespace:Tango.MachineStudio.RML.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:CalibrationDataViewVM, IsDesignTimeCreatable=False}">
+
+    <UserControl.Resources>
+        <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
+        <converters:ColorComponentToOpacityConverter x:Key="ColorComponentToOpacityConverter" />
+        <converters:ColorToComponentsConverter x:Key="ColorToComponentsConverter" />
+    </UserControl.Resources>
+    
+    <Grid>
+        <ItemsControl DockPanel.Dock="Top" ItemsSource="{Binding LiquidsCalibrationData}" IsEnabled="{Binding IsFree}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <UniformGrid Rows="1" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <DockPanel Width="240">
+
+                        <StackPanel DockPanel.Dock="Top">
+
+                            <StackPanel DockPanel.Dock="Right" VerticalAlignment="Bottom" HorizontalAlignment="Right" Orientation="Horizontal" Margin="0 0 5 0">
+                                <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Import from excel" Width="30" Command="{Binding RelativeSource={RelativeSource AncestorType=local:CalibrationDataView},Path=DataContext.ImportExcelCommand}" CommandParameter="{Binding}">
+                                    <materialDesign:PackIcon Kind="Download" Foreground="{StaticResource BlackForegroundBrush}" />
+                                </Button>
+                                <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Export to excel" Width="30" Command="{Binding RelativeSource={RelativeSource AncestorType=local:CalibrationDataView},Path=DataContext.ExportExcelCommand}" CommandParameter="{Binding}">
+                                    <materialDesign:PackIcon Kind="Upload" Foreground="{StaticResource BlackForegroundBrush}" />
+                                </Button>
+                            </StackPanel>
+                            <Border Padding="2" Margin="5" CornerRadius="3">
+                            <Border.Background>
+                                <SolidColorBrush Opacity="0.4" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                            </Border.Background>
+                                <TextBlock Text="{Binding LiquidType.Name}" HorizontalAlignment="Center" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
+                        </Border>
+                        </StackPanel>
+
+                        <Grid Margin="0 0 0 5">
+                            <DataGrid Background="{StaticResource TransparentBackgroundBrush400}" AlternatingRowBackground="{StaticResource Transparent200}" 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"/>
+                                        <Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
+                                        <Setter Property="FlowDirection" Value="RightToLeft"></Setter>
+                                        <Setter Property="Foreground" Value="{StaticResource BlackForegroundBrush}"></Setter>
+                                    </Style>
+                                </DataGrid.CellStyle>
+                                <DataGrid.Columns>
+                                    <DataGridTextColumn Header="#" Binding="{Binding Index}" Width="Auto" IsReadOnly="True" Foreground="{StaticResource DimGrayBrush}" FontSize="11" />
+                                    <mahapps:DataGridNumericUpDownColumn Header="X" Binding="{Binding X}" Minimum="0" Maximum="10000" HideUpDownButtons="True" Width="1*"/>
+                                    <mahapps:DataGridNumericUpDownColumn Header="Y" Binding="{Binding Y}" Minimum="0" Maximum="10000" HideUpDownButtons="True" Width="1*" />
+                                </DataGrid.Columns>
+                            </DataGrid>
+                        </Grid>
+                    </DockPanel>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml.cs
new file mode 100644
index 000000000..e23e343a4
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/CalibrationDataView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.RML.Views
+{
+    /// <summary>
+    /// Interaction logic for CalibrationDataView.xaml
+    /// </summary>
+    public partial class CalibrationDataView : UserControl
+    {
+        public CalibrationDataView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml
new file mode 100644
index 000000000..ed27c1760
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml
@@ -0,0 +1,772 @@
+<UserControl x:Class="Tango.MachineStudio.RML.Views.ColorConversionView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.MachineStudio.RML.Views"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.RML.ViewModels"
+             xmlns:global="clr-namespace:Tango.MachineStudio.RML"
+             xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:editors="clr-namespace:Tango.SharedUI.Editors;assembly=Tango.SharedUI"
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:hive="clr-namespace:Tango.Hive;assembly=Tango.Hive"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:brushPicker="clr-namespace:Tango.BrushPicker;assembly=Tango.BrushPicker"
+             xmlns:colorConversion="clr-namespace:Tango.ColorConversion;assembly=Tango.ColorConversion"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+    <UserControl.Resources>
+        <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
+        <converters:ColorComponentToOpacityConverter x:Key="ColorComponentToOpacityConverter" />
+        <converters:ColorToComponentsConverter x:Key="ColorToComponentsConverter" />
+        <converters:NullObjectToBooleanConverter x:Key="NullObjectToBooleanConverter" />
+        <converters:ObjectToObjectTypeConverter x:Key="ObjectToObjectTypeConverter" />
+        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+        <converters:BooleanInverseConverter x:Key="BooleanInverseConverter" />
+        <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
+    </UserControl.Resources>
+    <Grid>
+        <DockPanel>
+            <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
+                <Border.Effect>
+                    <DropShadowEffect Opacity="0.4" />
+                </Border.Effect>
+                <Grid>
+                    <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">COLOR CONVERSION</TextBlock>
+                </Grid>
+            </Border>
+            <Grid DockPanel.Dock="Top" x:Name="ColorCalibrationGrid" Margin="80,20,20,20">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="250" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="1*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="20" />
+                    <RowDefinition/>
+                    <RowDefinition Height="30" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.Resources>
+                    <Style TargetType="TextBlock" >
+                        <Setter Property="Foreground" Value="{StaticResource JobFieldForeground}"/>
+                    </Style>
+                </Grid.Resources>
+
+                <Grid Grid.Row="1">
+
+                    <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="-60 35 0 0">
+                        <RadioButton IsChecked="{Binding SourceColor.IsLab,Converter={StaticResource BooleanInverseConverter}}">RGB</RadioButton>
+                        <RadioButton Margin="0 10 0 0" IsChecked="{Binding SourceColor.IsLab}">LAB</RadioButton>
+                    </StackPanel>
+
+                    <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="{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">
+                            <brushPicker:BrushPicker x:Name="picker" Color="{Binding SourceColor.Color,Mode=TwoWay}" Background="Transparent" BorderThickness="0" Height="150" BrushTypeVisibility="Collapsed"></brushPicker:BrushPicker>
+                        </Border>
+
+                        <Grid>
+                            <ContentControl>
+                                <ContentControl.Style>
+                                    <Style TargetType="ContentControl">
+                                        <Setter Property="Content">
+                                            <Setter.Value>
+                                                <StackPanel>
+                                                    <DockPanel Margin="0 10 0 0">
+                                                        <TextBlock DockPanel.Dock="Left" Text="R" VerticalAlignment="Center" />
+                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Red}"></mahapps:NumericUpDown>
+                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Red,Mode=TwoWay}"></Slider>
+                                                    </DockPanel>
+                                                    <DockPanel Margin="0 10 0 0">
+                                                        <TextBlock DockPanel.Dock="Left" Text="G" VerticalAlignment="Center" />
+                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Green}"></mahapps:NumericUpDown>
+                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Green,Mode=TwoWay}"></Slider>
+                                                    </DockPanel>
+                                                    <DockPanel Margin="0 10 0 0">
+                                                        <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
+                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Blue}"></mahapps:NumericUpDown>
+                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Blue,Mode=TwoWay}"></Slider>
+                                                    </DockPanel>
+                                                </StackPanel>
+                                            </Setter.Value>
+                                        </Setter>
+
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding SourceColor.IsLab}" Value="True">
+                                                <Setter Property="Content">
+                                                    <Setter.Value>
+                                                        <StackPanel>
+                                                            <DockPanel Margin="0 10 0 0">
+                                                                <TextBlock DockPanel.Dock="Left" Text="L" VerticalAlignment="Center" />
+                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="100" Width="30" Value="{Binding SourceColor.L}"></mahapps:NumericUpDown>
+                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="0" Maximum="100" Value="{Binding SourceColor.L,Mode=TwoWay}"></Slider>
+                                                            </DockPanel>
+                                                            <DockPanel Margin="0 10 0 0">
+                                                                <TextBlock DockPanel.Dock="Left" Text="A" VerticalAlignment="Center" />
+                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="-128" Maximum="128" Width="30" Value="{Binding SourceColor.A}"></mahapps:NumericUpDown>
+                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="-128" Maximum="128" Value="{Binding SourceColor.A,Mode=TwoWay}"></Slider>
+                                                            </DockPanel>
+                                                            <DockPanel Margin="0 10 0 0">
+                                                                <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
+                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="-128" Maximum="128" Width="30" Value="{Binding SourceColor.B}"></mahapps:NumericUpDown>
+                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="-128" Maximum="128" Value="{Binding SourceColor.B,Mode=TwoWay}"></Slider>
+                                                            </DockPanel>
+                                                        </StackPanel>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </ContentControl.Style>
+                            </ContentControl>
+                        </Grid>
+                    </StackPanel>
+                </Grid>
+
+                <TextBlock FontStyle="Italic" HorizontalAlignment="Center">SOURCE / INVERSE</TextBlock>
+                <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="2" Margin="0 0 0 0">SUGGESTIONS</TextBlock>
+                <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="4" Margin="-80 0 0 0">LIQUID VOLUMES</TextBlock>
+
+                <Image Source="../Images/arrow-long-right.png" Grid.Column="1" Grid.Row="1" Width="120" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image>
+
+                <hive:HexList Width="220" Height="270" UseHexItemHasContainer="True" Grid.Column="2" Grid.Row="1" RowCount="6" ColumnCount="5" ItemsSource="{Binding HiveSuggestions}" SelectedItem="{Binding SelectedSuggestion,Mode=TwoWay}">
+                    <hive:HexList.ItemContainerStyle>
+                        <Style TargetType="hive:HexItem" BasedOn="{StaticResource {x:Type hive:HexItem}}">
+                            <Setter Property="Background" Value="{Binding Brush}"></Setter>
+                            <Setter Property="Grid.Column" Value="0"></Setter>
+                            <Setter Property="Grid.Row" Value="0"></Setter>
+                            <Setter Property="Background" Value="Transparent"></Setter>
+                            <Setter Property="BorderThickness" Value="1"></Setter>
+
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},Path=DataContext,Converter={StaticResource ObjectToObjectTypeConverter}}" Value="{x:Type colorConversion:ColorConversionSuggestion}">
+                                    <Setter Property="Grid.Column" Value="{Binding Column}"></Setter>
+                                    <Setter Property="Grid.Row" Value="{Binding Row}"></Setter>
+                                    <Setter Property="Background" Value="{Binding Brush}"></Setter>
+                                </DataTrigger>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter Property="BorderThickness" Value="2"></Setter>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </hive:HexList.ItemContainerStyle>
+
+                    <hive:HexList.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Foreground="{StaticResource WhiteTextBrush}">
+                                        <Run Text="{Binding Row}"></Run><Run>,</Run>
+                                        <Run Text="{Binding Column}"/>
+                            </TextBlock>
+                        </DataTemplate>
+                    </hive:HexList.ItemTemplate>
+                </hive:HexList>
+
+                <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>
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding HiveSuggestions.Count}" Value="0">
+                                    <Setter Property="Visibility" Value="Visible"></Setter>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </TextBlock.Style>
+                </TextBlock>
+
+                <Image Source="../Images/arrow-long-right.png" Grid.Column="3" Grid.Row="1" Width="120" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image>
+
+                <Grid Grid.Column="4" Grid.Row="1" IsHitTestVisible="False">
+                    <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 -20 0 0">
+                        <StackPanel Orientation="Horizontal" Height="60">
+                            <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
+
+                                <Grid>
+                                    <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                        <Rectangle.Fill>
+                                            <SolidColorBrush Color="Red" Opacity="{Binding SelectedSuggestion.Coordinates.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                        </Rectangle.Fill>
+                                    </Rectangle>
+                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                </Grid>
+                            </DockPanel>
+                            <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.Fill>
+                                            <SolidColorBrush Color="Green" Opacity="{Binding SelectedSuggestion.Coordinates.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                        </Rectangle.Fill>
+                                    </Rectangle>
+                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                </Grid>
+                            </DockPanel>
+                            <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.Fill>
+                                            <SolidColorBrush Color="Blue" Opacity="{Binding SelectedSuggestion.Coordinates.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                        </Rectangle.Fill>
+                                    </Rectangle>
+                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                </Grid>
+                            </DockPanel>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
+                            <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
+
+                                <Grid>
+                                    <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                </Grid>
+                            </DockPanel>
+                            <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
+
+                                <Grid>
+                                    <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                </Grid>
+                            </DockPanel>
+                            <DockPanel Width="50" HorizontalAlignment="Left">
+                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+
+                                <Grid>
+                                    <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                </Grid>
+                            </DockPanel>
+                        </StackPanel>
+                    </StackPanel>
+
+                    <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="420" >
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel>
+                                    <TextBlock HorizontalAlignment="Center" TextAlignment="Center" Text="{Binding Name}" FontSize="10" Margin="0 0 0 5"></TextBlock>
+                                    <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
+                                        <ContentControl.Foreground>
+                                            <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                        </ContentControl.Foreground>
+                                        <mahapps:NumericUpDown FontSize="16" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.00" 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>-->
+                                        </mahapps:NumericUpDown>
+                                    </ContentControl>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                    <Image Source="../Images/arrow-long-down.png" Grid.Column="1" Grid.Row="1" Margin="0 0 10 -170" Height="70" Width="40" Opacity="0.8" Stretch="Fill" HorizontalAlignment="Right" ></Image>
+
+                    <TextBlock FontSize="14" FontWeight="SemiBold" FontStyle="Italic" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 15">
+                                <Run>GAMUT REGION:</Run>
+                                <Run Text="{Binding SelectedSuggestion.ProcessParametersTableIndex,Mode=OneWay}"></Run>
+                    </TextBlock>
+                </Grid>
+
+
+                <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="{StaticResource RedBrush100}" />
+                            <TextBlock Margin="5 0 0 0" Foreground="{StaticResource RedBrush100}">Liquid volumes exceeds the maximum range</TextBlock>
+                        </StackPanel>
+                    </StackPanel>
+
+                    <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="420" IsEnabled="{Binding IsFree}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel>
+                                    <TextBlock HorizontalAlignment="Center" TextAlignment="Center" Text="{Binding Name}" FontSize="10" Margin="0 0 0 5"></TextBlock>
+                                    <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
+                                        <ContentControl.Foreground>
+                                            <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                        </ContentControl.Foreground>
+                                        <mahapps:NumericUpDown FontSize="16" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.00" 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>-->
+                                        </mahapps:NumericUpDown>
+                                    </ContentControl>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </StackPanel>
+
+
+                <Image Source="../Images/arrow-long-Left.png" Grid.Column="2" Grid.Row="3" Width="140" Stretch="Fill" Height="30" Opacity="0.8"></Image>
+
+                <Border BorderBrush="{StaticResource borderBrush}" Grid.Row="3">
+                    <Grid>
+                        <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="{StaticResource DarkGrayBrush}">
+                                    <Ellipse.Fill>
+                                        <SolidColorBrush Color="{Binding TargetColor.Color}"></SolidColorBrush>
+                                    </Ellipse.Fill>
+                                </Ellipse>
+                                <materialDesign:PackIcon Visibility="{Binding IsVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}" Kind="Alert" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" Width="24" Height="24" />
+                            </Grid>
+                        </DockPanel>
+
+                        <StackPanel HorizontalAlignment="Right">
+                            <StackPanel Orientation="Horizontal" Height="60">
+                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
+
+                                    <Grid>
+                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
+                                            <Rectangle.Fill>
+                                                <SolidColorBrush Color="Red" Opacity="{Binding TargetColor.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                            </Rectangle.Fill>
+                                        </Rectangle>
+                                        <TextBlock Text="{Binding TargetColor.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                    </Grid>
+                                </DockPanel>
+                                <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="{StaticResource DarkGrayBrush}">
+                                            <Rectangle.Fill>
+                                                <SolidColorBrush Color="Green" Opacity="{Binding TargetColor.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                            </Rectangle.Fill>
+                                        </Rectangle>
+                                        <TextBlock Text="{Binding TargetColor.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                    </Grid>
+                                </DockPanel>
+                                <DockPanel Width="50" HorizontalAlignment="Left">
+                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+                                    <Grid>
+                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
+                                            <Rectangle.Fill>
+                                                <SolidColorBrush Color="Blue" Opacity="{Binding TargetColor.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                            </Rectangle.Fill>
+                                        </Rectangle>
+                                        <TextBlock Text="{Binding TargetColor.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                    </Grid>
+                                </DockPanel>
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
+                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
+
+                                    <Grid>
+                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
+                                        <TextBlock Text="{Binding TargetColor.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
+                                    </Grid>
+                                </DockPanel>
+                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
+
+                                    <Grid>
+                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
+                                        <TextBlock Text="{Binding TargetColor.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
+                                    </Grid>
+                                </DockPanel>
+                                <DockPanel Width="50" HorizontalAlignment="Left">
+                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+
+                                    <Grid>
+                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
+                                        <TextBlock Text="{Binding TargetColor.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
+                                    </Grid>
+                                </DockPanel>
+                            </StackPanel>
+                        </StackPanel>
+                    </Grid>
+                </Border>
+            </Grid>
+
+            <!--<Grid Margin="80,20,20,20" DockPanel.Dock="Top" x:Name="ColorCalibrationGrid">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="250" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="1*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="20" />
+                    <RowDefinition />
+                    <RowDefinition Height="30" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.Resources>
+                    <Style TargetType="TextBlock" >
+                        <Setter Property="Foreground" Value="{StaticResource JobFieldForeground}"/>
+                    </Style>
+                </Grid.Resources>
+
+                <Grid Grid.Row="1">
+
+                    <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="-70 15 0 0">
+                        <RadioButton IsChecked="{Binding SourceColor.IsLab,Converter={StaticResource BooleanInverseConverter}}">RGB</RadioButton>
+                        <RadioButton Margin="0 10 0 0" IsChecked="{Binding SourceColor.IsLab}">LAB</RadioButton>
+                    </StackPanel>
+
+                    <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="{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">
+                            <brushPicker:BrushPicker x:Name="picker" Color="{Binding SourceColor.Color,Mode=TwoWay}" Background="Transparent" BorderThickness="0" Height="150" BrushTypeVisibility="Collapsed"></brushPicker:BrushPicker>
+                        </Border>
+
+                        <Grid>
+                            <ContentControl>
+                                <ContentControl.Style>
+                                    <Style TargetType="ContentControl">
+                                        <Setter Property="Content">
+                                            <Setter.Value>
+                                                <StackPanel>
+                                                    <DockPanel Margin="0 10 0 0">
+                                                        <TextBlock DockPanel.Dock="Left" Text="R" VerticalAlignment="Center" />
+                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Red}"></mahapps:NumericUpDown>
+                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Red,Mode=TwoWay}"></Slider>
+                                                    </DockPanel>
+                                                    <DockPanel Margin="0 10 0 0">
+                                                        <TextBlock DockPanel.Dock="Left" Text="G" VerticalAlignment="Center" />
+                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Green}"></mahapps:NumericUpDown>
+                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Green,Mode=TwoWay}"></Slider>
+                                                    </DockPanel>
+                                                    <DockPanel Margin="0 10 0 0">
+                                                        <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
+                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Blue}"></mahapps:NumericUpDown>
+                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Blue,Mode=TwoWay}"></Slider>
+                                                    </DockPanel>
+                                                </StackPanel>
+                                            </Setter.Value>
+                                        </Setter>
+
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding SourceColor.IsLab}" Value="True">
+                                                <Setter Property="Content">
+                                                    <Setter.Value>
+                                                        <StackPanel>
+                                                            <DockPanel Margin="0 10 0 0">
+                                                                <TextBlock DockPanel.Dock="Left" Text="L" VerticalAlignment="Center" />
+                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="100" Width="30" Value="{Binding SourceColor.L}"></mahapps:NumericUpDown>
+                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="0" Maximum="100" Value="{Binding SourceColor.L,Mode=TwoWay}"></Slider>
+                                                            </DockPanel>
+                                                            <DockPanel Margin="0 10 0 0">
+                                                                <TextBlock DockPanel.Dock="Left" Text="A" VerticalAlignment="Center" />
+                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="-128" Maximum="128" Width="30" Value="{Binding SourceColor.A}"></mahapps:NumericUpDown>
+                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="-128" Maximum="128" Value="{Binding SourceColor.A,Mode=TwoWay}"></Slider>
+                                                            </DockPanel>
+                                                            <DockPanel Margin="0 10 0 0">
+                                                                <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
+                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="-128" Maximum="128" Width="30" Value="{Binding SourceColor.B}"></mahapps:NumericUpDown>
+                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="-128" Maximum="128" Value="{Binding SourceColor.B,Mode=TwoWay}"></Slider>
+                                                            </DockPanel>
+                                                        </StackPanel>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </ContentControl.Style>
+                            </ContentControl>
+                        </Grid>
+                    </StackPanel>
+                </Grid>
+
+                <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="0">SOURCE / INVERSE</TextBlock>
+                <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="2" Margin="0 0 0 0">SUGGESTIONS</TextBlock>
+                <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="4" Margin="-80 0 0 0">LIQUID VOLUMES</TextBlock>
+
+                <Image Source="../Images/arrow-long-right.png" Grid.Column="1" Grid.Row="1" Width="100" Stretch="Fill" Height="30" Opacity="0.8" Margin="10 0 20 0"></Image>
+
+                <hive:HexList Width="220" Height="270" UseHexItemHasContainer="True" Grid.Column="2" Grid.Row="1" RowCount="6" ColumnCount="5" ItemsSource="{Binding HiveSuggestions}" SelectedItem="{Binding SelectedSuggestion,Mode=TwoWay}">
+                    <hive:HexList.ItemContainerStyle>
+                        <Style TargetType="hive:HexItem" BasedOn="{StaticResource {x:Type hive:HexItem}}">
+                            <Setter Property="Background" Value="{Binding Brush}"></Setter>
+                            <Setter Property="Grid.Column" Value="0"></Setter>
+                            <Setter Property="Grid.Row" Value="0"></Setter>
+                            <Setter Property="Background" Value="Transparent"></Setter>
+                            <Setter Property="BorderThickness" Value="1"></Setter>
+
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},Path=DataContext,Converter={StaticResource ObjectToObjectTypeConverter}}" Value="{x:Type colorConversion:ColorConversionSuggestion}">
+                                    <Setter Property="Grid.Column" Value="{Binding Column}"></Setter>
+                                    <Setter Property="Grid.Row" Value="{Binding Row}"></Setter>
+                                    <Setter Property="Background" Value="{Binding Brush}"></Setter>
+                                </DataTrigger>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter Property="BorderThickness" Value="2"></Setter>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </hive:HexList.ItemContainerStyle>
+
+                    <hive:HexList.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Foreground="{StaticResource WhiteTextBrush}">
+                                        <Run Text="{Binding Row}"></Run><Run>,</Run>
+                                        <Run Text="{Binding Column}"/>
+                            </TextBlock>
+                        </DataTemplate>
+                    </hive:HexList.ItemTemplate>
+                </hive:HexList>
+
+                <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>
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding HiveSuggestions.Count}" Value="0">
+                                    <Setter Property="Visibility" Value="Visible"></Setter>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </TextBlock.Style>
+                </TextBlock>
+
+                <Image Source="../Images/arrow-long-right.png" Grid.Column="3" Grid.Row="1" Width="100" Stretch="Fill" Height="30" Opacity="0.8" Margin="10 0 20 0"></Image>
+
+                <Grid Grid.Column="4" Grid.Row="1" IsHitTestVisible="False">
+                    <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 0 0 0">
+                        <StackPanel Orientation="Horizontal" Height="50">
+                            <DockPanel Width="40" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
+
+                                <Grid>
+                                    <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                        <Rectangle.Fill>
+                                            <SolidColorBrush Color="Red" Opacity="{Binding SelectedSuggestion.Coordinates.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                        </Rectangle.Fill>
+                                    </Rectangle>
+                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                </Grid>
+                            </DockPanel>
+                            <DockPanel Width="40" 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.Fill>
+                                            <SolidColorBrush Color="Green" Opacity="{Binding SelectedSuggestion.Coordinates.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                        </Rectangle.Fill>
+                                    </Rectangle>
+                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                </Grid>
+                            </DockPanel>
+                            <DockPanel Width="40" HorizontalAlignment="Left">
+                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+                                <Grid>
+                                    <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                        <Rectangle.Fill>
+                                            <SolidColorBrush Color="Blue" Opacity="{Binding SelectedSuggestion.Coordinates.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                        </Rectangle.Fill>
+                                    </Rectangle>
+                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                </Grid>
+                            </DockPanel>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
+                            <DockPanel Width="40" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
+
+                                <Grid>
+                                    <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                </Grid>
+                            </DockPanel>
+                            <DockPanel Width="40" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
+
+                                <Grid>
+                                    <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                </Grid>
+                            </DockPanel>
+                            <DockPanel Width="40" HorizontalAlignment="Left">
+                                <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+
+                                <Grid>
+                                    <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                    <TextBlock Text="{Binding SelectedSuggestion.Coordinates.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                </Grid>
+                            </DockPanel>
+                        </StackPanel>
+                    </StackPanel>
+
+                    <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="320" >
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel>
+                                    <TextBlock HorizontalAlignment="Center" TextAlignment="Center" Text="{Binding Name}" FontSize="10" Margin="0 0 0 5"></TextBlock>
+                                    <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
+                                        <ContentControl.Foreground>
+                                            <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                        </ContentControl.Foreground>
+                                        <mahapps:NumericUpDown FontSize="16" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.00" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+
+                                        </mahapps:NumericUpDown>
+                                    </ContentControl>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                    <Image Source="../Images/arrow-long-down.png" Grid.Column="1" Grid.Row="1" Margin="0 0 10 -170" Height="70" Width="40" Opacity="0.8" Stretch="Fill" HorizontalAlignment="Right" ></Image>
+
+                    <TextBlock FontSize="14" FontWeight="SemiBold" FontStyle="Italic" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 15">
+                                <Run>GAMUT REGION:</Run>
+                                <Run Text="{Binding SelectedSuggestion.ProcessParametersTableIndex,Mode=OneWay}"></Run>
+                    </TextBlock>
+                </Grid>
+
+
+                <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="{StaticResource RedBrush100}" />
+                            <TextBlock Margin="5 0 0 0" Foreground="{StaticResource RedBrush100}">Liquid volumes exceeds the maximum range</TextBlock>
+                        </StackPanel>
+                    </StackPanel>
+
+                    <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="420" IsEnabled="{Binding IsFree}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel>
+                                    <TextBlock HorizontalAlignment="Center" TextAlignment="Center" Text="{Binding Name}" FontSize="10" Margin="0 0 0 5"></TextBlock>
+                                    <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
+                                        <ContentControl.Foreground>
+                                            <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                        </ContentControl.Foreground>
+                                        <mahapps:NumericUpDown FontSize="16" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.00" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+
+                                        </mahapps:NumericUpDown>
+                                    </ContentControl>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </StackPanel>
+
+
+                <Image Source="../Images/arrow-long-Left.png" Grid.Column="2" Grid.Row="3" Width="120" Stretch="Fill" Height="30" Opacity="0.8"></Image>
+
+                <Border BorderBrush="{StaticResource borderBrush}" Grid.Row="3">
+                    <Grid>
+                        <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="{StaticResource DarkGrayBrush}">
+                                    <Ellipse.Fill>
+                                        <SolidColorBrush Color="{Binding TargetColor.Color}"></SolidColorBrush>
+                                    </Ellipse.Fill>
+                                </Ellipse>
+                                <materialDesign:PackIcon Visibility="{Binding IsVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}" Kind="Alert" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" Width="24" Height="24" />
+                            </Grid>
+                        </DockPanel>
+
+                        <StackPanel HorizontalAlignment="Right">
+                            <StackPanel Orientation="Horizontal" Height="60">
+                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
+
+                                    <Grid>
+                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
+                                            <Rectangle.Fill>
+                                                <SolidColorBrush Color="Red" Opacity="{Binding TargetColor.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                            </Rectangle.Fill>
+                                        </Rectangle>
+                                        <TextBlock Text="{Binding TargetColor.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                    </Grid>
+                                </DockPanel>
+                                <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="{StaticResource DarkGrayBrush}">
+                                            <Rectangle.Fill>
+                                                <SolidColorBrush Color="Green" Opacity="{Binding TargetColor.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                            </Rectangle.Fill>
+                                        </Rectangle>
+                                        <TextBlock Text="{Binding TargetColor.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                    </Grid>
+                                </DockPanel>
+                                <DockPanel Width="50" HorizontalAlignment="Left">
+                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+                                    <Grid>
+                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}">
+                                            <Rectangle.Fill>
+                                                <SolidColorBrush Color="Blue" Opacity="{Binding TargetColor.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                            </Rectangle.Fill>
+                                        </Rectangle>
+                                        <TextBlock Text="{Binding TargetColor.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                    </Grid>
+                                </DockPanel>
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
+                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
+
+                                    <Grid>
+                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
+                                        <TextBlock Text="{Binding TargetColor.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
+                                    </Grid>
+                                </DockPanel>
+                                <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
+
+                                    <Grid>
+                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
+                                        <TextBlock Text="{Binding TargetColor.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
+                                    </Grid>
+                                </DockPanel>
+                                <DockPanel Width="50" HorizontalAlignment="Left">
+                                    <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+
+                                    <Grid>
+                                        <Rectangle Margin="0 5 0 0" Stroke="{StaticResource DarkGrayBrush}"/>
+                                        <TextBlock Text="{Binding TargetColor.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource BlackForegroundBrush}"></TextBlock>
+                                    </Grid>
+                                </DockPanel>
+                            </StackPanel>
+                        </StackPanel>
+                    </Grid>
+                </Border>
+            </Grid>-->
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml.cs
new file mode 100644
index 000000000..8b6955269
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.RML.Views
+{
+    /// <summary>
+    /// Interaction logic for ColorConversionView.xaml
+    /// </summary>
+    public partial class ColorConversionView : UserControl
+    {
+        public ColorConversionView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml
new file mode 100644
index 000000000..b85fd2c12
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml
@@ -0,0 +1,155 @@
+<UserControl x:Class="Tango.MachineStudio.RML.Views.ProcessParametersView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+            xmlns:global="clr-namespace:Tango.MachineStudio.RML"
+             xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:editors="clr-namespace:Tango.SharedUI.Editors;assembly=Tango.SharedUI"
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:dragAndDrop="clr-namespace:Tango.DragAndDrop;assembly=Tango.DragAndDrop"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.RML.ViewModels"
+             xmlns:local="clr-namespace:Tango.MachineStudio.RML.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+
+    <UserControl.Resources>
+        <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="416*"/>
+            <RowDefinition Height="120"/>
+        </Grid.RowDefinitions>
+        <Grid  Grid.Row="0">
+            <DockPanel>
+                <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
+                    <Border.Effect>
+                        <DropShadowEffect Opacity="0.4" />
+                    </Border.Effect>
+                    <Grid>
+                        <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">ACTIVE PROCESS GROUP</TextBlock>
+                        <Button ToolTip="Add new table" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Width="30" HorizontalAlignment="Right" Padding="0" Command="{Binding AddProcessParametersTableCommand}">
+                            <materialDesign:PackIcon Kind="Plus" Foreground="#0AC30A" Width="24" Height="24" />
+                        </Button>
+                    </Grid>
+                </Border>
+                <Grid>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 20">
+                        <ItemsControl ItemsSource="{Binding ActiveProcessParametersTableView}">
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <DockPanel>
+                                        <Button DockPanel.Dock="Right" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" VerticalAlignment="Bottom" ToolTip="Remove table" Width="30" Margin="10 0 0 10" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RemoveProcessParametersTableCommand}" CommandParameter="{Binding}">
+                                            <materialDesign:PackIcon Kind="Delete" Width="24" Height="24" Foreground="#FF7D7D" />
+                                        </Button>
+
+                                        <Grid Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessTableDropped">
+                                            <Border Padding="5" BorderThickness="1" Margin="20 5 0 5" BorderBrush="{StaticResource DarkGrayBrush}" Background="{StaticResource TransparentBackgroundBrush100}">
+                                                <Grid>
+                                                    <DockPanel Width="300">
+                                                        <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox>
+
+                                                        <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Padding="5">
+                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}">
+                                                                <editors:ParameterizedEditor.ItemsPanel>
+                                                                    <ItemsPanelTemplate>
+                                                                        <StackPanel IsItemsHost="True" />
+                                                                    </ItemsPanelTemplate>
+                                                                </editors:ParameterizedEditor.ItemsPanel>
+                                                                <editors:ParameterizedEditor.DoubleTemplate>
+                                                                    <DataTemplate>
+                                                                        <DockPanel>
+                                                                            <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11"></TextBlock>
+                                                                            <mahapps:NumericUpDown HorizontalAlignment="Right" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Right" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                                                        </DockPanel>
+                                                                    </DataTemplate>
+                                                                </editors:ParameterizedEditor.DoubleTemplate>
+                                                            </editors:ParameterizedEditor>
+                                                        </ScrollViewer>
+                                                    </DockPanel>
+                                                </Grid>
+                                            </Border>
+
+                                            <dragAndDrop:DragThumb Background="Transparent" Cursor="SizeAll" ToolTip="Drag and drop" Margin="0 3 -1 0" HorizontalAlignment="Right" VerticalAlignment="Top">
+                                                <materialDesign:PackIcon HorizontalAlignment="Right" VerticalAlignment="Top" IsHitTestVisible="False" Kind="Drag" Width="32" Height="32" Background="Transparent" />
+                                            </dragAndDrop:DragThumb>
+                                        </Grid>
+                                    </DockPanel>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                    </StackPanel>
+
+                    <dragAndDrop:DraggingSurface x:Name="draggingSurface" ClipToBounds="True" />
+                </Grid>
+            </DockPanel>
+        </Grid>
+        <Grid Grid.Row="1">
+            <DockPanel>
+                <Grid>
+                    <Grid  Margin="0 0 0 0">
+                        <DockPanel>
+                            <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
+                                <Border.Effect>
+                                    <DropShadowEffect Opacity="0.4" />
+                                </Border.Effect>
+                                <Grid>
+                                    <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">LIQUID FACTORS</TextBlock>
+
+                                    <Button ToolTip="Add new liquid factor" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" VerticalAlignment="Bottom" Width="30" Padding="0" Command="{Binding AddLiquidFactorCommand}">
+                                        <materialDesign:PackIcon Kind="Plus" Foreground="#0AC30A" Width="24" Height="24" />
+                                    </Button>
+                                </Grid>
+                            </Border>
+                            <ScrollViewer x:Name="liquidsFactorsScrollViewer" VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Hidden" Margin="15 0 20 0">
+                                <ItemsControl Width="{Binding WidthLilquidFactors, RelativeSource={RelativeSource AncestorType=UserControl}}" ItemsSource="{Binding LiquidTypesRmls}" Margin="0 10 0 0">
+                                    <ItemsControl.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <UniformGrid IsItemsHost="True" Rows="1"></UniformGrid>
+                                        </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate DataType="{x:Type observables:LiquidTypesRml}">
+                                            <Grid Margin="20 0 20 0" MaxWidth="230">
+
+                                                <Button HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Remove liquid factor" Width="30" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RemoveLiquidFactorCommand}" CommandParameter="{Binding}">
+                                                    <materialDesign:PackIcon Kind="Delete" Foreground="#FF7D7D" />
+                                                </Button>
+
+                                                <StackPanel Margin="0 0 10 0">
+                                                    <TextBlock HorizontalAlignment="Center" FontSize="10" Foreground="{StaticResource MainWindow.Foreground}" Text="{Binding LiquidType.Name}"></TextBlock>
+                                                    <Grid Width="58" Height="48" Margin="0 5 0 0">
+                                                        <shapes:Hexagon StrokeThickness="1" Stroke="Gray">
+                                                            <shapes:Hexagon.Fill>
+                                                                <LinearGradientBrush Opacity="0.7" >
+                                                                    <GradientStop Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                                    <GradientStop Color="White" Offset="1"/>
+                                                                </LinearGradientBrush>
+                                                            </shapes:Hexagon.Fill>
+                                                        </shapes:Hexagon>
+
+                                                        <TextBox Style="{x:Null}" Background="Transparent" Foreground="{StaticResource Hexagon.ForegroundBrush}" BorderThickness="0" Text="{Binding MaxNlPerCm}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  FontStyle="Italic"></TextBox>
+                                                    </Grid>
+                                                </StackPanel>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
+                            </ScrollViewer>
+                        </DockPanel>
+                    </Grid>
+                </Grid>
+            </DockPanel>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml.cs
new file mode 100644
index 000000000..a6d03ca0e
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Tango.MachineStudio.RML.ViewModels;
+using Tango.BL.Entities;
+using Tango.DragAndDrop;
+
+namespace Tango.MachineStudio.RML.Views
+{
+    /// <summary>
+    /// Interaction logic for ProcessParametersView.xaml
+    /// </summary>
+    public partial class ProcessParametersView : UserControl
+    {
+        private MainViewVM _vm;
+        public DraggingSurface DraggingSurface
+        {
+            get { return (DraggingSurface)GetValue(DraggingSurfaceProperty); }
+            set { SetValue(DraggingSurfaceProperty, value); }
+        }
+        public static readonly DependencyProperty DraggingSurfaceProperty =
+            DependencyProperty.Register("DraggingSurface", typeof(DraggingSurface), typeof(ProcessParametersView), new PropertyMetadata(null));
+        
+        public double WidthLilquidFactors
+        {
+            get { return (double )GetValue(WidthLilquidFactorsProperty); }
+            set { SetValue(WidthLilquidFactorsProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for WidthLilquidFactors.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty WidthLilquidFactorsProperty =
+            DependencyProperty.Register("WidthLilquidFactors", typeof(double ), typeof(ProcessParametersView), new PropertyMetadata(null));
+
+        
+        public ProcessParametersView()
+        {
+            InitializeComponent();
+            DraggingSurface = draggingSurface;
+            Loaded += (_, __) => { _vm = DataContext as MainViewVM; };
+        }
+        private void OnProcessTableDropped(object sender, DropEventArgs e)
+        {
+            ProcessParametersTable dragged = e.Draggable.DataContext as ProcessParametersTable;
+            ProcessParametersTable dropped = e.Droppable.DataContext as ProcessParametersTable;
+            _vm.OnProcessParametersTableDropped(dragged, dropped);
+        }
+    }
+}
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 fa51a6bf5..628b9e402 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
@@ -9,7 +9,6 @@
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:editors="clr-namespace:Tango.SharedUI.Editors;assembly=Tango.SharedUI"
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:colorLabViews="clr-namespace:Tango.MachineStudio.ColorLab.Views;assembly=Tango.MachineStudio.ColorLab"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:dragAndDrop="clr-namespace:Tango.DragAndDrop;assembly=Tango.DragAndDrop"
@@ -126,215 +125,94 @@
 
                 <Grid Grid.Column="2">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="416*"/>
-                        <RowDefinition Height="490"/>
+                        <RowDefinition Height="536*"/>
+                        <RowDefinition Height="370"/>
                     </Grid.RowDefinitions>
-
-                    <Grid>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="1*" />
-                                <ColumnDefinition Width="510" />
-                            </Grid.ColumnDefinitions>
-
-                            <DockPanel>
-                                <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
-                                    <Border.Effect>
-                                        <DropShadowEffect Opacity="0.4" />
-                                    </Border.Effect>
-                                    <Grid>
-                                        <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">ACTIVE PROCESS GROUP</TextBlock>
-                                        <Button ToolTip="Add new table" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Width="30" HorizontalAlignment="Right" Padding="0" Command="{Binding AddProcessParametersTableCommand}">
-                                            <materialDesign:PackIcon Kind="Plus" Foreground="#0AC30A" Width="24" Height="24" />
-                                        </Button>
-                                    </Grid>
-                                </Border>
+                    <Grid  Grid.Row="0" IsEnabled="{Binding IsFree}">
+                        <TabControl Background="Transparent" Margin="0,-70,0,0" x:Name="processTabControl" Padding="0 25 0 0">
+                            <TabControl.Resources>
+                                <Style TargetType="TabPanel">
+                                    <Setter Property="HorizontalAlignment" Value="Center"/>
+                                </Style>
+                                <Style TargetType="TabItem" BasedOn="{StaticResource {x:Type TabItem}}">
+                                    <Setter Property="Padding" Value="20,2"></Setter>
+                                </Style>
+                            </TabControl.Resources>
+                            <TabItem Header="PROCESS PARAMETERS" Margin="-100 0 0 0 ">
+                                <local:ProcessParametersView x:Name="processParametersView" WidthLilquidFactors="{Binding ElementName=calibrationDataView,Path=ActualWidth}"/>
+                            </TabItem>
+                            <TabItem Header="COLOR CONVERSION" Margin="-100 0 0 0 ">
                                 <Grid>
-                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 20">
-                                        <ItemsControl ItemsSource="{Binding ActiveProcessParametersTableView}">
-                                            <ItemsControl.ItemsPanel>
-                                                <ItemsPanelTemplate>
-                                                    <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" />
-                                                </ItemsPanelTemplate>
-                                            </ItemsControl.ItemsPanel>
-                                            <ItemsControl.ItemTemplate>
-                                                <DataTemplate>
-                                                    <DockPanel>
-                                                        <Button DockPanel.Dock="Right" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" VerticalAlignment="Bottom" ToolTip="Remove table" Width="30" Margin="10 0 0 10" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RemoveProcessParametersTableCommand}" CommandParameter="{Binding}">
-                                                            <materialDesign:PackIcon Kind="Delete" Width="24" Height="24" Foreground="#FF7D7D" />
-                                                        </Button>
-
-                                                        <Grid Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessTableDropped">
-                                                            <Border Padding="5" BorderThickness="1" Margin="20 5 0 5" BorderBrush="{StaticResource DarkGrayBrush}" Background="{StaticResource TransparentBackgroundBrush100}">
-                                                                <Grid>
-                                                                    <DockPanel Width="300">
-                                                                        <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox>
-
-                                                                        <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Padding="5">
-                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}">
-                                                                                <editors:ParameterizedEditor.ItemsPanel>
-                                                                                    <ItemsPanelTemplate>
-                                                                                        <StackPanel IsItemsHost="True" />
-                                                                                    </ItemsPanelTemplate>
-                                                                                </editors:ParameterizedEditor.ItemsPanel>
-                                                                                <editors:ParameterizedEditor.DoubleTemplate>
-                                                                                    <DataTemplate>
-                                                                                        <DockPanel>
-                                                                                            <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11"></TextBlock>
-                                                                                            <mahapps:NumericUpDown HorizontalAlignment="Right" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Right" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown>
-                                                                                        </DockPanel>
-                                                                                    </DataTemplate>
-                                                                                </editors:ParameterizedEditor.DoubleTemplate>
-                                                                            </editors:ParameterizedEditor>
-                                                                        </ScrollViewer>
-                                                                    </DockPanel>
-                                                                </Grid>
-                                                            </Border>
-
-                                                            <dragAndDrop:DragThumb Background="Transparent" Cursor="SizeAll" ToolTip="Drag and drop" Margin="0 3 -1 0" HorizontalAlignment="Right" VerticalAlignment="Top">
-                                                                <materialDesign:PackIcon HorizontalAlignment="Right" VerticalAlignment="Top" IsHitTestVisible="False" Kind="Drag" Width="32" Height="32" Background="Transparent" />
-                                                            </dragAndDrop:DragThumb>
-                                                        </Grid>
-                                                    </DockPanel>
-                                                </DataTemplate>
-                                            </ItemsControl.ItemTemplate>
-                                        </ItemsControl>
-                                    </StackPanel>
-
-                                    <dragAndDrop:DraggingSurface x:Name="draggingSurface" ClipToBounds="True" />
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"></ColumnDefinition>
+                                        <ColumnDefinition Width="260"></ColumnDefinition>
+                                    </Grid.ColumnDefinitions>
+                                    <local:ColorConversionView x:Name="colorConversionView" Margin="0 0 0 0"  Grid.Column="0" DataContext="{Binding ColorConversionViewVM}"/>
+                                    <DockPanel Grid.Column="1">
+                                        <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="16 0" Padding="5" CornerRadius="5">
+                                            <Border.Effect>
+                                                <DropShadowEffect Opacity="0.4" />
+                                            </Border.Effect>
+                                            <Grid>
+                                                <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">CCT</TextBlock>
+                                            </Grid>
+                                        </Border>
+                                        <Grid DockPanel.Dock="Top" Background="#35B5B5B5" Margin="20 0">
+                                            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                <Grid>
+                                                    <StackPanel Orientation="Vertical" HorizontalAlignment="Left">
+                                                        <Image Source="../Images/data-table.png" Height="80" Opacity="0.8" ></Image>
+                                                        <StackPanel VerticalAlignment="Center" Width="200" Margin="5 20 5 10">
+
+                                                            <ComboBox materialDesign:HintAssist.Hint="No CCT Defined" Margin="0 5 0 0" HorizontalContentAlignment="Center" ItemsSource="{Binding CCTS}" SelectedItem="{Binding SelectedCCT}" DisplayMemberPath="FileName" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+                                                            <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
+                                                                <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
+                                                                    <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
+                                                                        <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
+                                                                        <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
+                                                                    </StackPanel>
+                                                                </Button>
+                                                                <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportForwardDataCommand}">
+                                                                    <StackPanel Orientation="Horizontal">
+                                                                        <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
+                                                                        <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
+                                                                    </StackPanel>
+                                                                </Button>
+                                                            </UniformGrid>
+                                                        </StackPanel>
+                                                    </StackPanel>
+                                                </Grid>
+                                            </StackPanel>
+                                        </Grid>
+                                    </DockPanel>
                                 </Grid>
-                            </DockPanel>
-
-                            <DockPanel Grid.Column="1">
+                                <!--<local:ColorConversionView x:Name="colorConversionView" />-->
+                            </TabItem>
+                        </TabControl>
+                    </Grid>
+                    <Grid Grid.Row="1">
+                        <Grid >
+                            <DockPanel>
                                 <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
                                     <Border.Effect>
                                         <DropShadowEffect Opacity="0.4" />
                                     </Border.Effect>
                                     <Grid>
-                                        <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">COLOR CONVERSION TABLE (CCT)</TextBlock>
+                                        <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">CALIBRATION DATA</TextBlock>
+                                        <Button ToolTip="Create excel file template" FontSize="11" Foreground="{StaticResource DarkGrayBrush200}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" VerticalAlignment="Bottom" Padding="0" Command="{Binding CreateCalibrationDataExcelTemplateCommand}" Margin="0 0 5 0">
+                                            <StackPanel Orientation="Horizontal">
+                                                <materialDesign:PackIcon Kind="FileExcel" Foreground="{StaticResource DimGrayBrush}" Width="16" Height="26" />
+                                                <TextBlock VerticalAlignment="Center" Margin="5 0 0 0">Create Empty Excel Template</TextBlock>
+                                            </StackPanel>
+                                        </Button>
                                     </Grid>
                                 </Border>
-                                <Grid DockPanel.Dock="Top" Background="#35B5B5B5" Margin="24 0">
-                                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                                        <Grid>
-                                            <StackPanel Orientation="Horizontal">
-                                                <materialDesign:PackIcon Kind="ArrowLeftBoldHexagonOutline" VerticalAlignment="Center" Width="40" Height="40" />
-                                                <Image Source="../Images/data-table.png" Height="80" Opacity="0.8"></Image>
-                                                <StackPanel VerticalAlignment="Center" Width="300" Margin="10 0 0 0">
 
-                                                    <ComboBox materialDesign:HintAssist.Hint="No CCT Defined" Margin="0 5 0 0" HorizontalContentAlignment="Center" ItemsSource="{Binding CCTS}" SelectedItem="{Binding SelectedCCT}" DisplayMemberPath="FileName" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-                                                    <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
-                                                        <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
-                                                            <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
-                                                                <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
-                                                                <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
-                                                            </StackPanel>
-                                                        </Button>
-                                                        <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportForwardDataCommand}">
-                                                            <StackPanel Orientation="Horizontal">
-                                                                <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
-                                                                <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
-                                                            </StackPanel>
-                                                        </Button>
-                                                    </UniformGrid>
-                                                </StackPanel>
-                                            </StackPanel>
-                                        </Grid>
-                                    </StackPanel>
-                                </Grid>
+                                <ScrollViewer x:Name="calibrationDataScrollViewer" ScrollChanged="calibrationDataScrollViewer_ScrollChanged" VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Auto" Margin="15 0 20 0">
+                                    <local:CalibrationDataView x:Name="calibrationDataView" Margin="0 10 0 0" DataContext="{Binding CalibrationDataViewVM}" />
+                                </ScrollViewer>
                             </DockPanel>
                         </Grid>
-
-                    </Grid>
-
-
-                    <Grid Grid.Row="1">
-
-                        <DockPanel>
-
-                                <Grid>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="120"/>
-                                        <RowDefinition Height="1*"/>
-                                    </Grid.RowDefinitions>
-                                    <Grid  Margin="0 0 0 0">
-                                        <DockPanel>
-                                        <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
-                                                <Border.Effect>
-                                                    <DropShadowEffect Opacity="0.4" />
-                                                </Border.Effect>
-                                                <Grid>
-                                                    <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">LIQUID FACTORS</TextBlock>
-
-                                                    <Button ToolTip="Add new liquid factor" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" VerticalAlignment="Bottom" Width="30" Padding="0" Command="{Binding AddLiquidFactorCommand}">
-                                                        <materialDesign:PackIcon Kind="Plus" Foreground="#0AC30A" Width="24" Height="24" />
-                                                    </Button>
-                                                </Grid>
-                                            </Border>
-
-                                        <ScrollViewer x:Name="liquidsFactorsScrollViewer" VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Hidden" Margin="15 0 20 0">
-                                            <ItemsControl Width="{Binding ElementName=calibrationDataView,Path=ActualWidth}" ItemsSource="{Binding LiquidTypesRmls}" Margin="0 10 0 0">
-                                                <ItemsControl.ItemsPanel>
-                                                    <ItemsPanelTemplate>
-                                                        <UniformGrid IsItemsHost="True" Rows="1"></UniformGrid>
-                                                    </ItemsPanelTemplate>
-                                                </ItemsControl.ItemsPanel>
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate DataType="{x:Type observables:LiquidTypesRml}">
-                                                        <Grid Margin="20 0 20 0" MaxWidth="230">
-
-                                                            <Button HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Remove liquid factor" Width="30" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RemoveLiquidFactorCommand}" CommandParameter="{Binding}">
-                                                                <materialDesign:PackIcon Kind="Delete" Foreground="#FF7D7D" />
-                                                            </Button>
-
-                                                            <StackPanel Margin="0 0 10 0">
-                                                                <TextBlock HorizontalAlignment="Center" FontSize="10" Foreground="{StaticResource MainWindow.Foreground}" Text="{Binding LiquidType.Name}"></TextBlock>
-                                                                <Grid Width="58" Height="48" Margin="0 5 0 0">
-                                                                    <shapes:Hexagon StrokeThickness="1" Stroke="Gray">
-                                                                        <shapes:Hexagon.Fill>
-                                                                            <LinearGradientBrush Opacity="0.7" >
-                                                                                <GradientStop Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
-                                                                                <GradientStop Color="White" Offset="1"/>
-                                                                            </LinearGradientBrush>
-                                                                        </shapes:Hexagon.Fill>
-                                                                    </shapes:Hexagon>
-
-                                                                    <TextBox Style="{x:Null}" Background="Transparent" Foreground="{StaticResource Hexagon.ForegroundBrush}" BorderThickness="0" Text="{Binding MaxNlPerCm}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  FontStyle="Italic"></TextBox>
-                                                                </Grid>
-                                                            </StackPanel>
-                                                        </Grid>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
-                                        </ScrollViewer>
-                                    </DockPanel>
-                                    </Grid>
-
-                                    <Grid Grid.Row="2">
-                                        <DockPanel>
-
-                                        <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="5" CornerRadius="5">
-                                                <Border.Effect>
-                                                    <DropShadowEffect Opacity="0.4" />
-                                                </Border.Effect>
-                                                <Grid>
-                                                    <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">CALIBRATION DATA</TextBlock>
-                                                <Button ToolTip="Create excel file template" FontSize="11" Foreground="{StaticResource DarkGrayBrush200}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" VerticalAlignment="Bottom" Padding="0" Command="{Binding CreateCalibrationDataExcelTemplateCommand}" Margin="0 0 5 0">
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <materialDesign:PackIcon Kind="FileExcel" Foreground="{StaticResource DimGrayBrush}" Width="16" Height="26" />
-                                                        <TextBlock VerticalAlignment="Center" Margin="5 0 0 0">Create Empty Excel Template</TextBlock>
-                                                    </StackPanel>
-                                                </Button>
-                                                </Grid>
-                                            </Border>
-
-                                        <ScrollViewer x:Name="calibrationDataScrollViewer" ScrollChanged="calibrationDataScrollViewer_ScrollChanged" VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Auto" Margin="15 0 20 0">
-                                            <colorLabViews:CalibrationDataView x:Name="calibrationDataView" Margin="0 10 0 0" DataContext="{Binding CalibrationDataViewVM}" />
-                                        </ScrollViewer>
-                                    </DockPanel>
-                                    </Grid>
-                                </Grid>
-                        </DockPanel>
                     </Grid>
                 </Grid>
             </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml.cs
index 2a5d317c6..aa4803bd0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml.cs
@@ -25,32 +25,18 @@ namespace Tango.MachineStudio.RML.Views
     {
         private MainViewVM _vm;
 
-        public DraggingSurface DraggingSurface
-        {
-            get { return (DraggingSurface)GetValue(DraggingSurfaceProperty); }
-            set { SetValue(DraggingSurfaceProperty, value); }
-        }
-        public static readonly DependencyProperty DraggingSurfaceProperty =
-            DependencyProperty.Register("DraggingSurface", typeof(DraggingSurface), typeof(RmlView), new PropertyMetadata(null));
-
-
         public RmlView()
         {
             InitializeComponent();
-            DraggingSurface = draggingSurface;
             Loaded += (_, __) => { _vm = DataContext as MainViewVM; };
         }
 
-        private void OnProcessTableDropped(object sender, DropEventArgs e)
-        {
-            ProcessParametersTable dragged = e.Draggable.DataContext as ProcessParametersTable;
-            ProcessParametersTable dropped = e.Droppable.DataContext as ProcessParametersTable;
-            _vm.OnProcessParametersTableDropped(dragged, dropped);
-        }
-
         private void calibrationDataScrollViewer_ScrollChanged(object sender, ScrollChangedEventArgs e)
         {
-            liquidsFactorsScrollViewer.ScrollToHorizontalOffset(e.HorizontalOffset);
+            if(processParametersView.IsVisible)
+            {
+                processParametersView.liquidsFactorsScrollViewer.ScrollToHorizontalOffset(e.HorizontalOffset);
+            }
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index 00eaf0b18..b2a6be101 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -5497,6 +5497,7 @@ Global
 		{12CC222B-D0F5-4048-B790-D283235F540D} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
 		{C8F14D59-B18D-469C-8B1B-2D23072ED16A} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
 		{43A25F41-EE8C-4A29-94D2-4CBC603E6B29} = {03937A28-630D-49B6-8344-6980FF7BF7DD}
+		{C81ED1A3-D18C-4D80-A8F5-061994A14A60} = {CD2513CC-7596-498C-957D-DE6473561A1C}
 		{90B53209-C60C-4655-B28D-A1B3E1044BA3} = {EC62BC9C-F2FE-4333-B7E4-110E38D43958}
 		{F079FB0A-A8ED-4216-B6A5-345756751A04} = {EC62BC9C-F2FE-4333-B7E4-110E38D43958}
 		{43ECCD8D-EE54-44EF-A51A-D77E3DF7263F} = {4443B71C-216E-4D4C-8D19-868F50803813}
@@ -5553,12 +5554,12 @@ Global
 		{C421E1D8-9B67-4A87-8E9F-8214721FA9AD} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		BuildVersion_UseGlobalSettings = False
-		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
-		BuildVersion_StartDate = 2000/1/1
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_UpdateAssemblyVersion = True
-		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
 		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_UseGlobalSettings = False
 	EndGlobalSection
 EndGlobal
-- 
cgit v1.3.1