From c5713f263db2aa8eda95e13c14ed31d1335b6bc0 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 8 Jul 2019 17:50:11 +0300
Subject: Refactoring of all color catalogs objects !!!

---
 .../Modules/Tango.MachineStudio.Catalogs/CatalogsModule.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/CatalogsModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/CatalogsModule.cs
index 389a2cb5d..5c17bf32e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/CatalogsModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/CatalogsModule.cs
@@ -51,7 +51,7 @@ namespace Tango.MachineStudio.Catalogs
         {
             get
             {
-                return Permissions.RunCatalogsModule;
+                return Permissions.RunColorCaptureModule;
             }
         }
 
-- 
cgit v1.3.1


From fe5c32241d8a976f0770dacb998380ab1cf70ce4 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 9 Jul 2019 16:56:19 +0300
Subject: Implemented MS color catalogs.

---
 Software/DB/PPC/Tango.mdf                          |  Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      |  Bin 53673984 -> 53673984 bytes
 Software/DB/Tango.mdf                              |  Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          |  Bin 22675456 -> 22675456 bytes
 .../Tango.MachineStudio.Catalogs.csproj            |    1 -
 .../ViewModels/CatalogVM.cs                        |   24 -
 .../ViewModels/MainViewVM.cs                       |  290 ++-
 .../Views/CatalogView.xaml                         |  208 +-
 .../Views/CatalogView.xaml.cs                      |    8 +-
 .../Views/CatalogsView.xaml                        |   20 +-
 .../Views/CatalogsView.xaml.cs                     |    4 +-
 .../Views/MainView.xaml                            |    2 +-
 .../Views/MainView.xaml.cs                         |    2 +
 .../Tango.BL/Builders/ColorCatalogBuilder.cs       |   11 +-
 .../Tango.BL/DTO/ColorCatalogDTOBase.cs            |   24 +
 .../Tango.BL/DTO/ColorCatalogsGroupDTOBase.cs      |    8 -
 .../Tango.BL/DTO/ColorCatalogsItemDTOBase.cs       |    8 -
 .../DTO/ColorCatalogsItemsRecipeDTOBase.cs         |   48 -
 .../Tango.BL/Entities/ColorCatalog.cs              |   18 +-
 .../Tango.BL/Entities/ColorCatalogBase.cs          |  190 ++
 .../Tango.BL/Entities/ColorCatalogsGroup.cs        |    6 +-
 .../Tango.BL/Entities/ColorCatalogsGroupBase.cs    |   38 -
 .../Tango.BL/Entities/ColorCatalogsItem.cs         |   25 +-
 .../Tango.BL/Entities/ColorCatalogsItemBase.cs     |   38 -
 .../Tango.BL/Entities/ColorCatalogsItemsRecipe.cs  |   19 +-
 .../Entities/ColorCatalogsItemsRecipeBase.cs       |  228 --
 .../Tango.BL/Enumerations/CatalogDesignType.cs     |   13 +
 .../Tango.BL/Enumerations/ColorCatalogsItems.cs    | 2515 ++++++++++++++++++++
 Software/Visual_Studio/Tango.BL/Tango.BL.csproj    |    3 +-
 .../Tango.DAL.Remote/DB/COLOR_CATALOGS.cs          |    5 +
 .../Tango.DAL.Remote/DB/COLOR_CATALOGS_GROUPS.cs   |    1 -
 .../Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs    |    1 -
 .../DB/COLOR_CATALOGS_ITEMS_RECIPES.cs             |    6 -
 .../Tango.DAL.Remote/DB/RemoteADO.edmx             |   39 +-
 .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram     |  140 +-
 35 files changed, 3404 insertions(+), 539 deletions(-)
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/CatalogVM.cs
 create mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/CatalogDesignType.cs

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index 308f4a6bb..09bee49bd 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index f5a1953ef..44dd2e360 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 86f399d14..dc977b21b 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index ccedb8cb8..02187322a 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Tango.MachineStudio.Catalogs.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Tango.MachineStudio.Catalogs.csproj
index 1d29166be..e90e00b41 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Tango.MachineStudio.Catalogs.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Tango.MachineStudio.Catalogs.csproj
@@ -69,7 +69,6 @@
   <ItemGroup>
     <Compile Include="Contracts\IMainView.cs" />
     <Compile Include="ViewModelLocator.cs" />
-    <Compile Include="ViewModels\CatalogVM.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="Views\CatalogView.xaml.cs">
       <DependentUpon>CatalogView.xaml</DependentUpon>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/CatalogVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/CatalogVM.cs
deleted file mode 100644
index 7d9c79ada..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/CatalogVM.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using Tango.Core;
-
-namespace Tango.MachineStudio.Catalogs.ViewModels
-{
-    public class CatalogVM : ExtendedObject
-    {
-        public ColorSpace ColorSpace { get; set; }
-
-        public List<Rml> SupportedMedia { get; set; }
-
-        public int Colors { get; set; }
-
-        public CatalogVM()
-        {
-            SupportedMedia = new List<Rml>();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
index 6b1c82e0f..a10e944f9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
@@ -1,17 +1,301 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL;
+using Tango.BL.Entities;
 using Tango.MachineStudio.Common;
+using System.Data.Entity;
+using Tango.MachineStudio.Catalogs.Contracts;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.Core.Commands;
+using Tango.BL.Builders;
 
 namespace Tango.MachineStudio.Catalogs.ViewModels
 {
-    public class MainViewVM : StudioViewModel
+    public class MainViewVM : StudioViewModel<IMainView>
     {
-        public override void OnApplicationReady()
+        private ObservablesContext _catalogsContext;
+        private ObservablesContext _activeCatalogContext;
+        private INotificationProvider _notification;
+
+        #region Properties
+
+        private ObservableCollection<ColorCatalog> _catalogs;
+        /// <summary>
+        /// Gets or sets the catalogs.
+        /// </summary>
+        public ObservableCollection<ColorCatalog> Catalogs
+        {
+            get { return _catalogs; }
+            set { _catalogs = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ColorCatalog _selectedCatalog;
+        /// <summary>
+        /// Gets or sets the selected catalog.
+        /// </summary>
+        public ColorCatalog SelectedCatalog
+        {
+            get { return _selectedCatalog; }
+            set { _selectedCatalog = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
+        private ColorCatalog _activeCatalog;
+        /// <summary>
+        /// Gets or sets the active catalog.
+        /// </summary>
+        public ColorCatalog ActiveCatalog
+        {
+            get { return _activeCatalog; }
+            set { _activeCatalog = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ColorCatalogsGroup _selectedGroup;
+        /// <summary>
+        /// Gets or sets the selected group.
+        /// </summary>
+        public ColorCatalogsGroup SelectedGroup
+        {
+            get { return _selectedGroup; }
+            set { _selectedGroup = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ColorCatalogsItem _selectedItem;
+        /// <summary>
+        /// Gets or sets the selected item.
+        /// </summary>
+        public ColorCatalogsItem SelectedItem
+        {
+            get { return _selectedItem; }
+            set { _selectedItem = value; RaisePropertyChangedAuto(); }
+        }
+
+        private List<Rml> _rmls;
+        /// <summary>
+        /// Gets or sets the RMLS.
+        /// </summary>
+        public List<Rml> RMLS
+        {
+            get { return _rmls; }
+            set { _rmls = value; RaisePropertyChangedAuto(); }
+        }
+
+        #endregion
+
+        #region Commands
+
+        /// <summary>
+        /// Gets or sets the new catalog command.
+        /// </summary>
+        public RelayCommand NewCatalogCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the delete catalog command.
+        /// </summary>
+        public RelayCommand DeleteCatalogCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the edit catalog command.
+        /// </summary>
+        public RelayCommand EditCatalogCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the back to catalogs command.
+        /// </summary>
+        public RelayCommand BackToCatalogsCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the save active catalog command.
+        /// </summary>
+        public RelayCommand SaveActiveCatalogCommand { get; set; }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MainViewVM"/> class.
+        /// </summary>
+        public MainViewVM()
+        {
+            Catalogs = new ObservableCollection<ColorCatalog>();
+            _catalogsContext = ObservablesContext.CreateDefault();
+
+            EditCatalogCommand = new RelayCommand(EditSelectedCatalog, () => SelectedCatalog != null);
+            NewCatalogCommand = new RelayCommand(CreateNewCatalog);
+            DeleteCatalogCommand = new RelayCommand(DeleteSelectedCatalog, () => SelectedCatalog != null);
+            BackToCatalogsCommand = new RelayCommand(BackToCatalogs);
+            SaveActiveCatalogCommand = new RelayCommand(SaveActiveCatalog);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MainViewVM"/> class.
+        /// </summary>
+        /// <param name="notificationProvider">The notification provider.</param>
+        public MainViewVM(INotificationProvider notificationProvider) : this()
+        {
+            _notification = notificationProvider;
+        }
+
+        #endregion
+
+        #region Edit / Delete / Create Catalog
+
+        public async Task LoadCatalogs()
+        {
+            using (_notification.PushTaskItem("Loading color catalogs..."))
+            {
+                IsFree = false;
+                Catalogs = (await _catalogsContext.ColorCatalogs.Include(x => x.ColorCatalogsGroups.Select(g => g.ColorCatalogsItems)).ToListAsync()).ToSynchronizedObservableCollection();
+                SelectedCatalog = null;
+                IsFree = true;
+            }
+        }
+
+        public async void EditSelectedCatalog()
+        {
+            if (SelectedCatalog != null)
+            {
+                using (_notification.PushTaskItem("Loading selected catalog..."))
+                {
+                    try
+                    {
+                        IsFree = false;
+
+                        if (_activeCatalogContext != null)
+                        {
+                            _activeCatalogContext.Dispose();
+                        }
+
+                        _activeCatalogContext = ObservablesContext.CreateDefault();
+
+                        ActiveCatalog = await new ColorCatalogBuilder(_activeCatalogContext).Set(SelectedCatalog.Guid).WithGroups().WithItems().WithRecipes().BuildAsync();
+                        SelectedGroup = ActiveCatalog.ColorCatalogsGroups.FirstOrDefault();
+                        RMLS = await _activeCatalogContext.Rmls.ToListAsync();
+
+                        if (SelectedGroup != null)
+                        {
+                            SelectedItem = SelectedGroup.ColorCatalogsItems.FirstOrDefault();
+                        }
+
+                        View.NavigateTo(CatalogsNavigationView.CatalogView);
+                    }
+                    catch (Exception ex)
+                    {
+                        _notification.ShowError($"An error occurred while trying to load the selected catalog.\n{ex.Message}");
+                        LogManager.Log(ex, $"Error loading selected catalog '{SelectedCatalog.Name}'.");
+                    }
+                    finally
+                    {
+                        IsFree = true;
+                    }
+                }
+            }
+        }
+
+        private async void DeleteSelectedCatalog()
+        {
+            if (SelectedCatalog != null)
+            {
+                if (_notification.ShowQuestion("Are you sure you want to delete the selected catalog ?"))
+                {
+                    using (_notification.PushTaskItem("Deleting selected catalog..."))
+                    {
+                        try
+                        {
+                            IsFree = false;
+                            await SelectedCatalog.DeleteCascadeAsync(_catalogsContext);
+                            SelectedCatalog = null;
+                        }
+                        catch (Exception ex)
+                        {
+                            _notification.ShowError($"An error occurred while trying to delete the selected catalog.\n{ex.Message}");
+                            LogManager.Log(ex, $"Error deleting catalog {SelectedCatalog.Name}.");
+                        }
+                        finally
+                        {
+                            IsFree = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        private async void CreateNewCatalog()
+        {
+            String name = _notification.ShowTextInput("Please enter a catalog name", "Catalog name");
+            if (!String.IsNullOrWhiteSpace(name))
+            {
+                using (_notification.PushTaskItem("Generating catalog..."))
+                {
+                    try
+                    {
+                        IsFree = false;
+                        ColorCatalog newCatalog = new ColorCatalog();
+                        newCatalog.Name = name;
+                        newCatalog.Description = name;
+                        newCatalog.Company = "Twine";
+                        _catalogsContext.ColorCatalogs.Add(newCatalog);
+                        await _catalogsContext.SaveChangesAsync();
+                        SelectedCatalog = newCatalog;
+                        EditSelectedCatalog();
+                    }
+                    catch (Exception ex)
+                    {
+                        _notification.ShowError($"An error occurred while trying to create the catalog.\n{ex.Message}");
+                        LogManager.Log(ex, $"Error creating new catalog.");
+                    }
+                    finally
+                    {
+                        IsFree = true;
+                    }
+                }
+            }
+        }
+
+        private async void SaveActiveCatalog()
+        {
+            if (ActiveCatalog != null)
+            {
+                using (_notification.PushTaskItem("Updating catalog..."))
+                {
+                    try
+                    {
+                        IsFree = false;
+                        await _activeCatalogContext.SaveChangesAsync();
+                        await LoadCatalogs();
+                        _notification.ShowInfo("Catalog updated successfully.");
+                    }
+                    catch (Exception ex)
+                    {
+                        _notification.ShowError($"An error occurred while trying to update the catalog.\n{ex.Message}");
+                        LogManager.Log(ex, $"Error updating catalog {ActiveCatalog.Name}.");
+                    }
+                    finally
+                    {
+                        IsFree = true;
+                    }
+                }
+            }
+        }
+
+        private void BackToCatalogs()
+        {
+            View.NavigateTo(CatalogsNavigationView.CatalogsView);
+        }
+
+        #endregion
+
+        #region Application Ready
+
+        public async override void OnApplicationReady()
         {
-            
+            await LoadCatalogs();
         }
+
+        #endregion
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml
index 17198b866..8dc6b5d02 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml
@@ -1,14 +1,214 @@
-<UserControl x:Class="Tango.MachineStudio.Catalogs.Views.CatalogsView"
+<UserControl x:Class="Tango.MachineStudio.Catalogs.Views.CatalogView"
              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:vm="clr-namespace:Tango.MachineStudio.Catalogs.ViewModels"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:global="clr-namespace:Tango.MachineStudio.Catalogs"
              xmlns:local="clr-namespace:Tango.MachineStudio.Catalogs.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" Foreground="#BBBBBB" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
-    <Grid>
-            
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" Foreground="#232323" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+
+    <UserControl.Resources>
+        <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
+
+        <Style x:Key="EditableGrid" TargetType="DataGrid" BasedOn="{StaticResource {x:Type DataGrid}}">
+            <Setter Property="AutoGenerateColumns" Value="False"></Setter>
+        </Style>
+
+        <Style x:Key="EditableCell" TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type DataGridCell}">
+                        <Grid Background="{TemplateBinding Background}">
+                            <ContentPresenter VerticalAlignment="Center" Margin="8" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+            <Style.Triggers>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="BorderThickness" Value="0"/>
+                    <Setter Property="BorderBrush" Value="Cyan"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+
+    </UserControl.Resources>
+
+    <Grid Margin="20">
+        <DockPanel>
+            <Grid DockPanel.Dock="Top">
+                <StackPanel Orientation="Horizontal">
+                    <Button Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Command="{Binding BackToCatalogsCommand}">
+                        <materialDesign:PackIcon Kind="ArrowLeft" Width="50" Height="50" Foreground="#202020" ToolTip="Back to RML list" />
+                    </Button>
+                    <TextBlock Text="{Binding ActiveCatalog.Name}" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="34"></TextBlock>
+                </StackPanel>
+
+                <Button HorizontalAlignment="Right" Width="170" Height="45" VerticalAlignment="Center" Command="{Binding SaveActiveCatalogCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
+                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
+                    </StackPanel>
+                </Button>
+            </Grid>
+
+            <Grid Margin="0 20">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="113*"/>
+                    <RowDefinition Height="358*"/>
+                </Grid.RowDefinitions>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="302*"/>
+                        <ColumnDefinition Width="399*"/>
+                        <ColumnDefinition Width="1179*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Grid Margin="10">
+                        <materialDesign:Card Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
+                            <Border Padding="20">
+                                <DockPanel>
+                                    <TextBlock DockPanel.Dock="Top" FontSize="16">PROPERTIES</TextBlock>
+                                    <controls:TableGrid RowHeight="35">
+                                        <TextBlock Text="Company:" ></TextBlock>
+                                        <TextBox Text="{Binding ActiveCatalog.Company}"></TextBox>
+
+                                        <TextBlock Text="Name:" ></TextBlock>
+                                        <TextBox Text="{Binding ActiveCatalog.Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+
+                                        <TextBlock Text="Description:" ></TextBlock>
+                                        <TextBox Text="{Binding ActiveCatalog.Description}"></TextBox>
+
+                                        <TextBlock Text="Design:" ></TextBlock>
+                                        <ComboBox ItemsSource="{Binding Source={x:Type enumerations:CatalogDesignType},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveCatalog.Design}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
+
+                                    </controls:TableGrid>
+                                </DockPanel>
+                            </Border>
+                        </materialDesign:Card>
+                    </Grid>
+
+                    <Grid Grid.Column="1" Margin="10">
+                        <materialDesign:Card Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
+                            <Border Padding="20">
+                                <DockPanel>
+                                    <TextBlock DockPanel.Dock="Top" FontSize="16">DESIGN CONTENT</TextBlock>
+
+                                </DockPanel>
+                            </Border>
+                        </materialDesign:Card>
+                    </Grid>
+
+                    <Grid Grid.ColumnSpan="3">
+
+                    </Grid>
+                </Grid>
+
+                <Grid Grid.Row="1" Margin="0 20 0 0">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="300"/>
+                            <ColumnDefinition Width="930"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+
+                        
+                            <DockPanel Margin="10">
+                            <TextBlock DockPanel.Dock="Top" FontSize="16">CATALOG GROUPS</TextBlock>
+
+                            <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
+                                <DataGrid Style="{StaticResource EditableGrid}" CellStyle="{StaticResource EditableCell}" ItemsSource="{Binding ActiveCatalog.ColorCatalogsGroups}" SelectedItem="{Binding SelectedGroup}">
+                                    <DataGrid.Columns>
+                                        <DataGridTemplateColumn Header="" Width="Auto">
+                                            <DataGridTemplateColumn.CellTemplate>
+                                                <DataTemplate>
+                                                    <Ellipse Width="30" Height="30">
+                                                        <Ellipse.Fill>
+                                                            <SolidColorBrush Color="{Binding Color}" />
+                                                        </Ellipse.Fill>
+                                                    </Ellipse>
+                                                </DataTemplate>
+                                            </DataGridTemplateColumn.CellTemplate>
+                                        </DataGridTemplateColumn>
+                                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="1*" />
+                                    </DataGrid.Columns>
+                                </DataGrid>
+                            </materialDesign:Card>
+                        </DockPanel>
+
+
+                        <DockPanel Margin="10" Grid.Column="1">
+                            <TextBlock DockPanel.Dock="Top" FontSize="16">
+                                <Run>GROUP COLORS</Run>
+                                <Run>(</Run><Run Text="{Binding SelectedGroup.ColorCatalogsItems.Count,Mode=OneWay}"></Run><Run>)</Run>
+                            </TextBlock>
+                            <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
+                            <DataGrid Style="{StaticResource EditableGrid}" CellStyle="{StaticResource EditableCell}" ItemsSource="{Binding SelectedGroup.ColorCatalogsItems}" SelectedItem="{Binding SelectedItem}">
+                                <DataGrid.Columns>
+                                    <DataGridTemplateColumn Header="" Width="Auto">
+                                        <DataGridTemplateColumn.CellTemplate>
+                                            <DataTemplate>
+                                                <Ellipse Width="25" Height="25">
+                                                    <Ellipse.Fill>
+                                                        <SolidColorBrush Color="{Binding Color}" />
+                                                    </Ellipse.Fill>
+                                                </Ellipse>
+                                            </DataTemplate>
+                                        </DataGridTemplateColumn.CellTemplate>
+                                    </DataGridTemplateColumn>
+                                    <DataGridTextColumn Header="CODE" Binding="{Binding Code}" Width="Auto" />
+                                    <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
+
+                                    <DataGridTextColumn Header="R" Binding="{Binding Red,UpdateSourceTrigger=PropertyChanged}" Width="Auto" />
+                                    <DataGridTextColumn Header="G" Binding="{Binding Green,UpdateSourceTrigger=PropertyChanged}" Width="Auto" />
+                                    <DataGridTextColumn Header="B" Binding="{Binding Blue,UpdateSourceTrigger=PropertyChanged}" Width="Auto" />
+
+                                    <DataGridTextColumn Header="L" Binding="{Binding L}" Width="65" />
+                                    <DataGridTextColumn Header="A" Binding="{Binding A}" Width="65" />
+                                    <DataGridTextColumn Header="B" Binding="{Binding B}" Width="65" />
+
+                                    <DataGridTextColumn Header="CYAN" Binding="{Binding Cyan}" Width="65" />
+                                    <DataGridTextColumn Header="MAGENTA" Binding="{Binding Magenta}" Width="80" />
+                                    <DataGridTextColumn Header="YELLOW" Binding="{Binding Yellow}" Width="70" />
+                                    <DataGridTextColumn Header="BLACK" Binding="{Binding Black}" Width="65" />
+
+                                    <DataGridTextColumn Header="REGION" Binding="{Binding ProcessParametersTableIndex}" Width="Auto" />
+                                </DataGrid.Columns>
+                            </DataGrid>
+                            </materialDesign:Card>
+                        </DockPanel>
+
+                        <DockPanel Margin="10" Grid.Column="2">
+                            <TextBlock DockPanel.Dock="Top" FontSize="16">
+                                <Run>COLOR MEDIA RECIPES</Run>
+                                <Run>(</Run><Run Text="{Binding SelectedItem.ColorCatalogsItemsRecipes.Count,Mode=OneWay}"></Run><Run>)</Run>
+                            </TextBlock>
+                            <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
+                                <DataGrid Style="{StaticResource EditableGrid}" CellStyle="{StaticResource EditableCell}" ItemsSource="{Binding SelectedItem.ColorCatalogsItemsRecipes}">
+                                    <DataGrid.Columns>
+                                        <materialDesign:MaterialDataGridComboBoxColumn Header="MEDIA" Width="180" SortMemberPath="Name" ItemsSourceBinding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RMLS}" SelectedItemBinding="{Binding Rml}" DisplayMemberPath="Name" />
+                                        <DataGridTextColumn Header="CYAN" Binding="{Binding Cyan}" Width="80" />
+                                        <DataGridTextColumn Header="MAGENTA" Binding="{Binding Magenta}" Width="80" />
+                                        <DataGridTextColumn Header="YELLOW" Binding="{Binding Yellow}" Width="80" />
+                                        <DataGridTextColumn Header="BLACK" Binding="{Binding Black}" Width="80" />
+                                        <DataGridTextColumn Header="REGION" Binding="{Binding ProcessParametersTableIndex}" Width="Auto" />
+                                    </DataGrid.Columns>
+                                </DataGrid>
+                            </materialDesign:Card>
+                        </DockPanel>
+                    </Grid>
+                </Grid>
+            </Grid>
+        </DockPanel>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml.cs
index 02418b677..ad44d4c18 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml.cs
@@ -12,17 +12,21 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Tango.MachineStudio.Catalogs.ViewModels;
 
 namespace Tango.MachineStudio.Catalogs.Views
 {
     /// <summary>
     /// Interaction logic for CatalogsView.xaml
     /// </summary>
-    public partial class CatalogsView : UserControl
+    public partial class CatalogView : UserControl
     {
-        public CatalogsView()
+        private MainViewVM _vm;
+
+        public CatalogView()
         {
             InitializeComponent();
+            Loaded += (_, __) => _vm = DataContext as MainViewVM;
         }
     }
 }
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 e324fb8d7..dca9c0e96 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
@@ -1,4 +1,4 @@
-<UserControl x:Class="Tango.MachineStudio.Catalogs.Views.CatalogView"
+<UserControl x:Class="Tango.MachineStudio.Catalogs.Views.CatalogsView"
              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" 
@@ -20,17 +20,17 @@
     <Grid>
         <DockPanel Margin="100" MaxWidth="1200">
             <Grid DockPanel.Dock="Top">
-                <Image Source="../Images/catalogs.png" Width="300" Margin="10" />
+                <Image Source="../Images/catalogs.png" Width="200" Margin="10" />
             </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="#FF7575" BorderBrush="#FF7575" 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 AddRmlCommand}">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" 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>
@@ -38,7 +38,7 @@
                     </Button>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Button Margin="50 0 0 0" MinWidth="200" Height="60" Command="{Binding ManageRmlCommand}">
+                    <Button Margin="50 0 0 0" MinWidth="200" Height="60" Command="{Binding EditCatalogCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="Pencil" Width="24" Height="24" />
                             <TextBlock Margin="10 0 0 0" FontSize="18">EDIT</TextBlock>
@@ -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 Rmls}" SelectedItem="{Binding SelectedRML}">
+                <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.CellStyle>
                         <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                             <Setter Property="BorderThickness" Value="0"/>
@@ -63,10 +63,12 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>-->
+                        <DataGridTextColumn Header="COMPANY" Binding="{Binding Name}" Width="Auto" />
                         <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
-                        <DataGridTextColumn Header="DESCRIPTION" Binding="{Binding Description}" Width="Auto" />
-                        <DataGridTextColumn Header="COLORS" Binding="{Binding Description}" Width="Auto" />
-                        <DataGridTextColumn Header="SUPPORTED MEDIA" Binding="{Binding Description}" Width="Auto" />
+                        <DataGridTextColumn Header="DESCRIPTION" Binding="{Binding Name}" Width="Auto" />
+                        <DataGridTextColumn Header="DESIGN" Binding="{Binding Design}" Width="Auto" />
+                        <DataGridTextColumn Header="GROUPS" Binding="{Binding ColorCatalogsGroups.Count}" Width="Auto" />
+                        <DataGridTextColumn Header="COLORS" Binding="{Binding TotalColors}" Width="Auto" />
                         <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" />
                     </DataGrid.Columns>
                 </DataGrid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogsView.xaml.cs
index 302ff59f7..02418b677 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogsView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogsView.xaml.cs
@@ -18,9 +18,9 @@ namespace Tango.MachineStudio.Catalogs.Views
     /// <summary>
     /// Interaction logic for CatalogsView.xaml
     /// </summary>
-    public partial class CatalogView : UserControl
+    public partial class CatalogsView : UserControl
     {
-        public CatalogView()
+        public CatalogsView()
         {
             InitializeComponent();
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/MainView.xaml
index 3a1d04e3d..140a616e1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/MainView.xaml
@@ -9,7 +9,7 @@
              xmlns:global="clr-namespace:Tango.MachineStudio.Catalogs"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" Foreground="#BBBBBB" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
-    <Grid>
+    <Grid IsEnabled="{Binding IsFree}">
         <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide">
             <local:CatalogsView />
             <local:CatalogView/>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/MainView.xaml.cs
index c94282ca1..fdfd23c2b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/MainView.xaml.cs
@@ -12,6 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Tango.Core.DI;
 using Tango.MachineStudio.Catalogs.Contracts;
 
 namespace Tango.MachineStudio.Catalogs.Views
@@ -24,6 +25,7 @@ namespace Tango.MachineStudio.Catalogs.Views
         public MainView()
         {
             InitializeComponent();
+            TangoIOC.Default.Register<IMainView>(this);
         }
 
         public void NavigateTo(CatalogsNavigationView view)
diff --git a/Software/Visual_Studio/Tango.BL/Builders/ColorCatalogBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/ColorCatalogBuilder.cs
index 801f2c474..00903ccef 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/ColorCatalogBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/ColorCatalogBuilder.cs
@@ -31,13 +31,20 @@ namespace Tango.BL.Builders
             });
         }
 
-        public virtual ColorCatalogBuilder WithRecipes(Rml rml)
+        public virtual ColorCatalogBuilder WithRecipes(Rml rml = null)
         {
             return AddStep(3, () =>
             {
                 foreach (var item in Entity.ColorCatalogsGroups.SelectMany(x => x.ColorCatalogsItems))
                 {
-                    Context.ColorCatalogsItemsRecipes.Where(x => x.ColorCatalogsItemGuid == item.Guid && x.RmlGuid == rml.Guid).ToList();
+                    if (rml != null)
+                    {
+                        Context.ColorCatalogsItemsRecipes.Where(x => x.ColorCatalogsItemGuid == item.Guid && x.RmlGuid == rml.Guid).ToList();
+                    }
+                    else
+                    {
+                        Context.ColorCatalogsItemsRecipes.Where(x => x.ColorCatalogsItemGuid == item.Guid).ToList();
+                    }
                 }
             });
         }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTOBase.cs
index a4bd83d05..2643b1d29 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTOBase.cs
@@ -21,6 +21,14 @@ namespace Tango.BL.DTO
     public abstract class ColorCatalogDTOBase : ObservableEntityDTO<ColorCatalogDTO, ColorCatalog>
     {
 
+        /// <summary>
+        /// company
+        /// </summary>
+        public String Company 
+        {
+            get; set; 
+        }
+
         /// <summary>
         /// name
         /// </summary>
@@ -29,5 +37,21 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// description
+        /// </summary>
+        public String Description 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// design type
+        /// </summary>
+        public Int32 DesignType 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTOBase.cs
index 2e45d771d..e3c94a67e 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTOBase.cs
@@ -29,14 +29,6 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
-        /// <summary>
-        /// description
-        /// </summary>
-        public String Description 
-        {
-            get; set; 
-        }
-
         /// <summary>
         /// color catalog guid
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs
index ff6d57e51..37ad4c7c5 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs
@@ -45,14 +45,6 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
-        /// <summary>
-        /// description
-        /// </summary>
-        public String Description 
-        {
-            get; set; 
-        }
-
         /// <summary>
         /// cyan
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemsRecipeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemsRecipeDTOBase.cs
index d7f21c463..9fbaa3de7 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemsRecipeDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemsRecipeDTOBase.cs
@@ -69,54 +69,6 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
-        /// <summary>
-        /// red
-        /// </summary>
-        public Int32 Red 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// green
-        /// </summary>
-        public Int32 Green 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// blue
-        /// </summary>
-        public Int32 Blue 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// l
-        /// </summary>
-        public Double L 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// a
-        /// </summary>
-        public Double A 
-        {
-            get; set; 
-        }
-
-        /// <summary>
-        /// b
-        /// </summary>
-        public Double B 
-        {
-            get; set; 
-        }
-
         /// <summary>
         /// process parameters table index
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs
index 5b9e02f7f..572caa6bb 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalog.cs
@@ -1,14 +1,30 @@
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
+using Tango.BL.Enumerations;
 
 namespace Tango.BL.Entities
 {
     public partial class ColorCatalog : ColorCatalogBase
     {
-     
+        [JsonIgnore]
+        [NotMapped]
+        public int TotalColors
+        {
+            get { return ColorCatalogsGroups.SelectMany(x => x.ColorCatalogsItems).Count(); }
+        }
+
+        [JsonIgnore]
+        [NotMapped]
+        public CatalogDesignType Design
+        {
+            get { return (CatalogDesignType)DesignType; }
+            set { DesignType = (int)value; }
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs
index 2004147c6..48f23115e 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs
@@ -25,10 +25,47 @@ namespace Tango.BL.Entities
     public abstract class ColorCatalogBase : ObservableEntity<ColorCatalog>
     {
 
+        public event EventHandler<String> CompanyChanged;
+
         public event EventHandler<String> NameChanged;
 
+        public event EventHandler<String> DescriptionChanged;
+
+        public event EventHandler<Int32> DesignTypeChanged;
+
+        public event EventHandler<Byte[]> LogoChanged;
+
+        public event EventHandler<Byte[]> ImageChanged;
+
         public event EventHandler<SynchronizedObservableCollection<ColorCatalogsGroup>> ColorCatalogsGroupsChanged;
 
+        protected String _company;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogbase company.
+        /// </summary>
+
+        [Column("COMPANY")]
+
+        public  String Company
+        {
+            get 
+            {
+                return _company; 
+            }
+
+            set 
+            {
+                if (_company != value)
+                {
+                    _company = value;
+
+                    OnCompanyChanged(value);
+
+                }
+            }
+        }
+
         protected String _name;
 
         /// <summary>
@@ -56,6 +93,114 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected String _description;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogbase description.
+        /// </summary>
+
+        [Column("DESCRIPTION")]
+
+        public  String Description
+        {
+            get 
+            {
+                return _description; 
+            }
+
+            set 
+            {
+                if (_description != value)
+                {
+                    _description = value;
+
+                    OnDescriptionChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _designtype;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogbase design type.
+        /// </summary>
+
+        [Column("DESIGN_TYPE")]
+
+        public  Int32 DesignType
+        {
+            get 
+            {
+                return _designtype; 
+            }
+
+            set 
+            {
+                if (_designtype != value)
+                {
+                    _designtype = value;
+
+                    OnDesignTypeChanged(value);
+
+                }
+            }
+        }
+
+        protected Byte[] _logo;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogbase logo.
+        /// </summary>
+
+        [Column("LOGO")]
+
+        public  Byte[] Logo
+        {
+            get 
+            {
+                return _logo; 
+            }
+
+            set 
+            {
+                if (_logo != value)
+                {
+                    _logo = value;
+
+                    OnLogoChanged(value);
+
+                }
+            }
+        }
+
+        protected Byte[] _image;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogbase image.
+        /// </summary>
+
+        [Column("IMAGE")]
+
+        public  Byte[] Image
+        {
+            get 
+            {
+                return _image; 
+            }
+
+            set 
+            {
+                if (_image != value)
+                {
+                    _image = value;
+
+                    OnImageChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<ColorCatalogsGroup> _colorcatalogsgroups;
 
         /// <summary>
@@ -81,6 +226,15 @@ namespace Tango.BL.Entities
             }
         }
 
+        /// <summary>
+        /// Called when the Company has changed.
+        /// </summary>
+        protected virtual void OnCompanyChanged(String company)
+        {
+            CompanyChanged?.Invoke(this, company);
+            RaisePropertyChanged(nameof(Company));
+        }
+
         /// <summary>
         /// Called when the Name has changed.
         /// </summary>
@@ -90,6 +244,42 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(Name));
         }
 
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Called when the DesignType has changed.
+        /// </summary>
+        protected virtual void OnDesignTypeChanged(Int32 designtype)
+        {
+            DesignTypeChanged?.Invoke(this, designtype);
+            RaisePropertyChanged(nameof(DesignType));
+        }
+
+        /// <summary>
+        /// Called when the Logo has changed.
+        /// </summary>
+        protected virtual void OnLogoChanged(Byte[] logo)
+        {
+            LogoChanged?.Invoke(this, logo);
+            RaisePropertyChanged(nameof(Logo));
+        }
+
+        /// <summary>
+        /// Called when the Image has changed.
+        /// </summary>
+        protected virtual void OnImageChanged(Byte[] image)
+        {
+            ImageChanged?.Invoke(this, image);
+            RaisePropertyChanged(nameof(Image));
+        }
+
         /// <summary>
         /// Called when the ColorCatalogsGroups has changed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroup.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroup.cs
index 9096b3a7a..9d7845d17 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroup.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroup.cs
@@ -1,5 +1,7 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,6 +11,8 @@ namespace Tango.BL.Entities
 {
     public class ColorCatalogsGroup : ColorCatalogsGroupBase
     {
+        [JsonIgnore]
+        [NotMapped]
         public Color Color
         {
             get
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs
index 113d22764..b3580769c 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs
@@ -27,8 +27,6 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> NameChanged;
 
-        public event EventHandler<String> DescriptionChanged;
-
         public event EventHandler<ColorCatalog> ColorCatalogChanged;
 
         public event EventHandler<SynchronizedObservableCollection<ColorCatalogsItem>> ColorCatalogsItemsChanged;
@@ -60,33 +58,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected String _description;
-
-        /// <summary>
-        /// Gets or sets the colorcatalogsgroupbase description.
-        /// </summary>
-
-        [Column("DESCRIPTION")]
-
-        public  String Description
-        {
-            get 
-            {
-                return _description; 
-            }
-
-            set 
-            {
-                if (_description != value)
-                {
-                    _description = value;
-
-                    OnDescriptionChanged(value);
-
-                }
-            }
-        }
-
         protected String _colorcatalogguid;
 
         /// <summary>
@@ -179,15 +150,6 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(Name));
         }
 
-        /// <summary>
-        /// Called when the Description has changed.
-        /// </summary>
-        protected virtual void OnDescriptionChanged(String description)
-        {
-            DescriptionChanged?.Invoke(this, description);
-            RaisePropertyChanged(nameof(Description));
-        }
-
         /// <summary>
         /// Called when the ColorCatalog has changed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItem.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItem.cs
index 98820e835..ba60501a3 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItem.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItem.cs
@@ -1,5 +1,7 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,13 +11,32 @@ namespace Tango.BL.Entities
 {
     public class ColorCatalogsItem : ColorCatalogsItemBase
     {
-        private Color _color;
         /// <summary>
         /// Gets the catalog item color.
         /// </summary>
+        [JsonIgnore]
+        [NotMapped]
         public Color Color
         {
             get { return Color.FromRgb((byte)Red, (byte)Green, (byte)Blue); }
         }
+
+        protected override void OnRedChanged(int red)
+        {
+            base.OnRedChanged(red);
+            RaisePropertyChanged(nameof(Color));
+        }
+
+        protected override void OnGreenChanged(int green)
+        {
+            base.OnGreenChanged(green);
+            RaisePropertyChanged(nameof(Color));
+        }
+
+        protected override void OnBlueChanged(int blue)
+        {
+            base.OnBlueChanged(blue);
+            RaisePropertyChanged(nameof(Color));
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs
index febeddfd0..d3497fe1a 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs
@@ -29,8 +29,6 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> NameChanged;
 
-        public event EventHandler<String> DescriptionChanged;
-
         public event EventHandler<Double> CyanChanged;
 
         public event EventHandler<Double> MagentaChanged;
@@ -139,33 +137,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected String _description;
-
-        /// <summary>
-        /// Gets or sets the colorcatalogsitembase description.
-        /// </summary>
-
-        [Column("DESCRIPTION")]
-
-        public  String Description
-        {
-            get 
-            {
-                return _description; 
-            }
-
-            set 
-            {
-                if (_description != value)
-                {
-                    _description = value;
-
-                    OnDescriptionChanged(value);
-
-                }
-            }
-        }
-
         protected Double _cyan;
 
         /// <summary>
@@ -563,15 +534,6 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(Name));
         }
 
-        /// <summary>
-        /// Called when the Description has changed.
-        /// </summary>
-        protected virtual void OnDescriptionChanged(String description)
-        {
-            DescriptionChanged?.Invoke(this, description);
-            RaisePropertyChanged(nameof(Description));
-        }
-
         /// <summary>
         /// Called when the Cyan has changed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipe.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipe.cs
index c1cf7911d..48add3553 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipe.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipe.cs
@@ -1,5 +1,7 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,21 +11,6 @@ namespace Tango.BL.Entities
 {
     public class ColorCatalogsItemsRecipe : ColorCatalogsItemsRecipeBase
     {
-        private Color _color;
-        /// <summary>
-        /// Gets the recipe color.
-        /// </summary>
-        public Color Color
-        {
-            get { return Color.FromRgb((byte)Red, (byte)Green, (byte)Blue); }
-        }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ColorCatalog" /> class.
-        /// </summary>
-        public ColorCatalogsItemsRecipe() : base()
-        {
-
-        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs
index 6fa94c23e..89d0a6061 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs
@@ -33,18 +33,6 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Double> BlackChanged;
 
-        public event EventHandler<Int32> RedChanged;
-
-        public event EventHandler<Int32> GreenChanged;
-
-        public event EventHandler<Int32> BlueChanged;
-
-        public event EventHandler<Double> LChanged;
-
-        public event EventHandler<Double> AChanged;
-
-        public event EventHandler<Double> BChanged;
-
         public event EventHandler<Int32> ProcessParametersTableIndexChanged;
 
         public event EventHandler<ColorCatalogsItem> ColorCatalogsItemChanged;
@@ -211,168 +199,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Int32 _red;
-
-        /// <summary>
-        /// Gets or sets the colorcatalogsitemsrecipebase red.
-        /// </summary>
-
-        [Column("RED")]
-
-        public  Int32 Red
-        {
-            get 
-            {
-                return _red; 
-            }
-
-            set 
-            {
-                if (_red != value)
-                {
-                    _red = value;
-
-                    OnRedChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _green;
-
-        /// <summary>
-        /// Gets or sets the colorcatalogsitemsrecipebase green.
-        /// </summary>
-
-        [Column("GREEN")]
-
-        public  Int32 Green
-        {
-            get 
-            {
-                return _green; 
-            }
-
-            set 
-            {
-                if (_green != value)
-                {
-                    _green = value;
-
-                    OnGreenChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _blue;
-
-        /// <summary>
-        /// Gets or sets the colorcatalogsitemsrecipebase blue.
-        /// </summary>
-
-        [Column("BLUE")]
-
-        public  Int32 Blue
-        {
-            get 
-            {
-                return _blue; 
-            }
-
-            set 
-            {
-                if (_blue != value)
-                {
-                    _blue = value;
-
-                    OnBlueChanged(value);
-
-                }
-            }
-        }
-
-        protected Double _l;
-
-        /// <summary>
-        /// Gets or sets the colorcatalogsitemsrecipebase l.
-        /// </summary>
-
-        [Column("L")]
-
-        public  Double L
-        {
-            get 
-            {
-                return _l; 
-            }
-
-            set 
-            {
-                if (_l != value)
-                {
-                    _l = value;
-
-                    OnLChanged(value);
-
-                }
-            }
-        }
-
-        protected Double _a;
-
-        /// <summary>
-        /// Gets or sets the colorcatalogsitemsrecipebase a.
-        /// </summary>
-
-        [Column("A")]
-
-        public  Double A
-        {
-            get 
-            {
-                return _a; 
-            }
-
-            set 
-            {
-                if (_a != value)
-                {
-                    _a = value;
-
-                    OnAChanged(value);
-
-                }
-            }
-        }
-
-        protected Double _b;
-
-        /// <summary>
-        /// Gets or sets the colorcatalogsitemsrecipebase b.
-        /// </summary>
-
-        [Column("B")]
-
-        public  Double B
-        {
-            get 
-            {
-                return _b; 
-            }
-
-            set 
-            {
-                if (_b != value)
-                {
-                    _b = value;
-
-                    OnBChanged(value);
-
-                }
-            }
-        }
-
         protected Int32 _processparameterstableindex;
 
         /// <summary>
@@ -500,60 +326,6 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(Black));
         }
 
-        /// <summary>
-        /// Called when the Red has changed.
-        /// </summary>
-        protected virtual void OnRedChanged(Int32 red)
-        {
-            RedChanged?.Invoke(this, red);
-            RaisePropertyChanged(nameof(Red));
-        }
-
-        /// <summary>
-        /// Called when the Green has changed.
-        /// </summary>
-        protected virtual void OnGreenChanged(Int32 green)
-        {
-            GreenChanged?.Invoke(this, green);
-            RaisePropertyChanged(nameof(Green));
-        }
-
-        /// <summary>
-        /// Called when the Blue has changed.
-        /// </summary>
-        protected virtual void OnBlueChanged(Int32 blue)
-        {
-            BlueChanged?.Invoke(this, blue);
-            RaisePropertyChanged(nameof(Blue));
-        }
-
-        /// <summary>
-        /// Called when the L has changed.
-        /// </summary>
-        protected virtual void OnLChanged(Double l)
-        {
-            LChanged?.Invoke(this, l);
-            RaisePropertyChanged(nameof(L));
-        }
-
-        /// <summary>
-        /// Called when the A has changed.
-        /// </summary>
-        protected virtual void OnAChanged(Double a)
-        {
-            AChanged?.Invoke(this, a);
-            RaisePropertyChanged(nameof(A));
-        }
-
-        /// <summary>
-        /// Called when the B has changed.
-        /// </summary>
-        protected virtual void OnBChanged(Double b)
-        {
-            BChanged?.Invoke(this, b);
-            RaisePropertyChanged(nameof(B));
-        }
-
         /// <summary>
         /// Called when the ProcessParametersTableIndex has changed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/CatalogDesignType.cs b/Software/Visual_Studio/Tango.BL/Enumerations/CatalogDesignType.cs
new file mode 100644
index 000000000..f6e19d8bc
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/CatalogDesignType.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Enumerations
+{
+    public enum CatalogDesignType
+    {
+        Default = 0,
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/ColorCatalogsItems.cs b/Software/Visual_Studio/Tango.BL/Enumerations/ColorCatalogsItems.cs
index 9508218f9..5fae7e974 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/ColorCatalogsItems.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/ColorCatalogsItems.cs
@@ -18,5 +18,2520 @@ namespace Tango.BL.Enumerations
 {
     public enum ColorCatalogsItems
     {
+
+        /// <summary>
+        /// (Favorites7)
+        /// </summary>
+        [Description("Favorites7")]
+        Favorites7 = 407,
+
+        /// <summary>
+        /// (Grey6)
+        /// </summary>
+        [Description("Grey6")]
+        Grey6 = 367,
+
+        /// <summary>
+        /// (Blue51)
+        /// </summary>
+        [Description("Blue51")]
+        Blue51 = 300,
+
+        /// <summary>
+        /// (Yellow32)
+        /// </summary>
+        [Description("Yellow32")]
+        Yellow32 = 130,
+
+        /// <summary>
+        /// (Blue63)
+        /// </summary>
+        [Description("Blue63")]
+        Blue63 = 312,
+
+        /// <summary>
+        /// (Favorites13)
+        /// </summary>
+        [Description("Favorites13")]
+        Favorites13 = 413,
+
+        /// <summary>
+        /// (Pink35)
+        /// </summary>
+        [Description("Pink35")]
+        Pink35 = 35,
+
+        /// <summary>
+        /// (Grey14)
+        /// </summary>
+        [Description("Grey14")]
+        Grey14 = 375,
+
+        /// <summary>
+        /// (Green33)
+        /// </summary>
+        [Description("Green33")]
+        Green33 = 173,
+
+        /// <summary>
+        /// (Favorites19)
+        /// </summary>
+        [Description("Favorites19")]
+        Favorites19 = 419,
+
+        /// <summary>
+        /// (Green100)
+        /// </summary>
+        [Description("Green100")]
+        Green100 = 240,
+
+        /// <summary>
+        /// (Pink41)
+        /// </summary>
+        [Description("Pink41")]
+        Pink41 = 41,
+
+        /// <summary>
+        /// (Green68)
+        /// </summary>
+        [Description("Green68")]
+        Green68 = 208,
+
+        /// <summary>
+        /// (Violet27)
+        /// </summary>
+        [Description("Violet27")]
+        Violet27 = 352,
+
+        /// <summary>
+        /// (Violet13)
+        /// </summary>
+        [Description("Violet13")]
+        Violet13 = 338,
+
+        /// <summary>
+        /// (Red13)
+        /// </summary>
+        [Description("Red13")]
+        Red13 = 56,
+
+        /// <summary>
+        /// (Pink9)
+        /// </summary>
+        [Description("Pink9")]
+        Pink9 = 9,
+
+        /// <summary>
+        /// (Grey1)
+        /// </summary>
+        [Description("Grey1")]
+        Grey1 = 362,
+
+        /// <summary>
+        /// (Pink11)
+        /// </summary>
+        [Description("Pink11")]
+        Pink11 = 11,
+
+        /// <summary>
+        /// (Green24)
+        /// </summary>
+        [Description("Green24")]
+        Green24 = 164,
+
+        /// <summary>
+        /// (Pink23)
+        /// </summary>
+        [Description("Pink23")]
+        Pink23 = 23,
+
+        /// <summary>
+        /// (Violet21)
+        /// </summary>
+        [Description("Violet21")]
+        Violet21 = 346,
+
+        /// <summary>
+        /// (Favorites16)
+        /// </summary>
+        [Description("Favorites16")]
+        Favorites16 = 416,
+
+        /// <summary>
+        /// (Red6)
+        /// </summary>
+        [Description("Red6")]
+        Red6 = 49,
+
+        /// <summary>
+        /// (Yellow18)
+        /// </summary>
+        [Description("Yellow18")]
+        Yellow18 = 116,
+
+        /// <summary>
+        /// (Brown1)
+        /// </summary>
+        [Description("Brown1")]
+        Brown1 = 382,
+
+        /// <summary>
+        /// (Green67)
+        /// </summary>
+        [Description("Green67")]
+        Green67 = 207,
+
+        /// <summary>
+        /// (Blue32)
+        /// </summary>
+        [Description("Blue32")]
+        Blue32 = 281,
+
+        /// <summary>
+        /// (Pink31)
+        /// </summary>
+        [Description("Pink31")]
+        Pink31 = 31,
+
+        /// <summary>
+        /// (Pink38)
+        /// </summary>
+        [Description("Pink38")]
+        Pink38 = 38,
+
+        /// <summary>
+        /// (Violet7)
+        /// </summary>
+        [Description("Violet7")]
+        Violet7 = 332,
+
+        /// <summary>
+        /// (Brown10)
+        /// </summary>
+        [Description("Brown10")]
+        Brown10 = 391,
+
+        /// <summary>
+        /// (Pink5)
+        /// </summary>
+        [Description("Pink5")]
+        Pink5 = 5,
+
+        /// <summary>
+        /// (Orange21)
+        /// </summary>
+        [Description("Orange21")]
+        Orange21 = 92,
+
+        /// <summary>
+        /// (Green22)
+        /// </summary>
+        [Description("Green22")]
+        Green22 = 162,
+
+        /// <summary>
+        /// (Grey5)
+        /// </summary>
+        [Description("Grey5")]
+        Grey5 = 366,
+
+        /// <summary>
+        /// (Green10)
+        /// </summary>
+        [Description("Green10")]
+        Green10 = 150,
+
+        /// <summary>
+        /// (Favorites10)
+        /// </summary>
+        [Description("Favorites10")]
+        Favorites10 = 410,
+
+        /// <summary>
+        /// (Blue54)
+        /// </summary>
+        [Description("Blue54")]
+        Blue54 = 303,
+
+        /// <summary>
+        /// (Orange13)
+        /// </summary>
+        [Description("Orange13")]
+        Orange13 = 84,
+
+        /// <summary>
+        /// (Green46)
+        /// </summary>
+        [Description("Green46")]
+        Green46 = 186,
+
+        /// <summary>
+        /// (Green37)
+        /// </summary>
+        [Description("Green37")]
+        Green37 = 177,
+
+        /// <summary>
+        /// (Blue7)
+        /// </summary>
+        [Description("Blue7")]
+        Blue7 = 256,
+
+        /// <summary>
+        /// (Blue44)
+        /// </summary>
+        [Description("Blue44")]
+        Blue44 = 293,
+
+        /// <summary>
+        /// (Pink25)
+        /// </summary>
+        [Description("Pink25")]
+        Pink25 = 25,
+
+        /// <summary>
+        /// (Blue74)
+        /// </summary>
+        [Description("Blue74")]
+        Blue74 = 323,
+
+        /// <summary>
+        /// (Favorites1)
+        /// </summary>
+        [Description("Favorites1")]
+        Favorites1 = 401,
+
+        /// <summary>
+        /// (Blue31)
+        /// </summary>
+        [Description("Blue31")]
+        Blue31 = 280,
+
+        /// <summary>
+        /// (Yellow35)
+        /// </summary>
+        [Description("Yellow35")]
+        Yellow35 = 133,
+
+        /// <summary>
+        /// (Green6)
+        /// </summary>
+        [Description("Green6")]
+        Green6 = 146,
+
+        /// <summary>
+        /// (Pink24)
+        /// </summary>
+        [Description("Pink24")]
+        Pink24 = 24,
+
+        /// <summary>
+        /// (Violet8)
+        /// </summary>
+        [Description("Violet8")]
+        Violet8 = 333,
+
+        /// <summary>
+        /// (Orange12)
+        /// </summary>
+        [Description("Orange12")]
+        Orange12 = 83,
+
+        /// <summary>
+        /// (Red18)
+        /// </summary>
+        [Description("Red18")]
+        Red18 = 61,
+
+        /// <summary>
+        /// (Red28)
+        /// </summary>
+        [Description("Red28")]
+        Red28 = 71,
+
+        /// <summary>
+        /// (Blue21)
+        /// </summary>
+        [Description("Blue21")]
+        Blue21 = 270,
+
+        /// <summary>
+        /// (Blue28)
+        /// </summary>
+        [Description("Blue28")]
+        Blue28 = 277,
+
+        /// <summary>
+        /// (Yellow23)
+        /// </summary>
+        [Description("Yellow23")]
+        Yellow23 = 121,
+
+        /// <summary>
+        /// (Yellow16)
+        /// </summary>
+        [Description("Yellow16")]
+        Yellow16 = 114,
+
+        /// <summary>
+        /// (Grey2)
+        /// </summary>
+        [Description("Grey2")]
+        Grey2 = 363,
+
+        /// <summary>
+        /// (Blue10)
+        /// </summary>
+        [Description("Blue10")]
+        Blue10 = 259,
+
+        /// <summary>
+        /// (Blue19)
+        /// </summary>
+        [Description("Blue19")]
+        Blue19 = 268,
+
+        /// <summary>
+        /// (Blue52)
+        /// </summary>
+        [Description("Blue52")]
+        Blue52 = 301,
+
+        /// <summary>
+        /// (Violet4)
+        /// </summary>
+        [Description("Violet4")]
+        Violet4 = 329,
+
+        /// <summary>
+        /// (Orange17)
+        /// </summary>
+        [Description("Orange17")]
+        Orange17 = 88,
+
+        /// <summary>
+        /// (Pink12)
+        /// </summary>
+        [Description("Pink12")]
+        Pink12 = 12,
+
+        /// <summary>
+        /// (Pink26)
+        /// </summary>
+        [Description("Pink26")]
+        Pink26 = 26,
+
+        /// <summary>
+        /// (Red26)
+        /// </summary>
+        [Description("Red26")]
+        Red26 = 69,
+
+        /// <summary>
+        /// (Green27)
+        /// </summary>
+        [Description("Green27")]
+        Green27 = 167,
+
+        /// <summary>
+        /// (Blue50)
+        /// </summary>
+        [Description("Blue50")]
+        Blue50 = 299,
+
+        /// <summary>
+        /// (Yellow42)
+        /// </summary>
+        [Description("Yellow42")]
+        Yellow42 = 140,
+
+        /// <summary>
+        /// (Red9)
+        /// </summary>
+        [Description("Red9")]
+        Red9 = 52,
+
+        /// <summary>
+        /// (Green8)
+        /// </summary>
+        [Description("Green8")]
+        Green8 = 148,
+
+        /// <summary>
+        /// (Orange20)
+        /// </summary>
+        [Description("Orange20")]
+        Orange20 = 91,
+
+        /// <summary>
+        /// (Green63)
+        /// </summary>
+        [Description("Green63")]
+        Green63 = 203,
+
+        /// <summary>
+        /// (Green103)
+        /// </summary>
+        [Description("Green103")]
+        Green103 = 243,
+
+        /// <summary>
+        /// (Blue22)
+        /// </summary>
+        [Description("Blue22")]
+        Blue22 = 271,
+
+        /// <summary>
+        /// (Green25)
+        /// </summary>
+        [Description("Green25")]
+        Green25 = 165,
+
+        /// <summary>
+        /// (Yellow10)
+        /// </summary>
+        [Description("Yellow10")]
+        Yellow10 = 108,
+
+        /// <summary>
+        /// (Yellow27)
+        /// </summary>
+        [Description("Yellow27")]
+        Yellow27 = 125,
+
+        /// <summary>
+        /// (Orange16)
+        /// </summary>
+        [Description("Orange16")]
+        Orange16 = 87,
+
+        /// <summary>
+        /// (Grey19)
+        /// </summary>
+        [Description("Grey19")]
+        Grey19 = 380,
+
+        /// <summary>
+        /// (Pink16)
+        /// </summary>
+        [Description("Pink16")]
+        Pink16 = 16,
+
+        /// <summary>
+        /// (Violet6)
+        /// </summary>
+        [Description("Violet6")]
+        Violet6 = 331,
+
+        /// <summary>
+        /// (Favorites6)
+        /// </summary>
+        [Description("Favorites6")]
+        Favorites6 = 406,
+
+        /// <summary>
+        /// (Orange19)
+        /// </summary>
+        [Description("Orange19")]
+        Orange19 = 90,
+
+        /// <summary>
+        /// (Grey8)
+        /// </summary>
+        [Description("Grey8")]
+        Grey8 = 369,
+
+        /// <summary>
+        /// (Blue9)
+        /// </summary>
+        [Description("Blue9")]
+        Blue9 = 258,
+
+        /// <summary>
+        /// (Green76)
+        /// </summary>
+        [Description("Green76")]
+        Green76 = 216,
+
+        /// <summary>
+        /// (Violet17)
+        /// </summary>
+        [Description("Violet17")]
+        Violet17 = 342,
+
+        /// <summary>
+        /// (Violet28)
+        /// </summary>
+        [Description("Violet28")]
+        Violet28 = 353,
+
+        /// <summary>
+        /// (Blue39)
+        /// </summary>
+        [Description("Blue39")]
+        Blue39 = 288,
+
+        /// <summary>
+        /// (Orange11)
+        /// </summary>
+        [Description("Orange11")]
+        Orange11 = 82,
+
+        /// <summary>
+        /// (Blue47)
+        /// </summary>
+        [Description("Blue47")]
+        Blue47 = 296,
+
+        /// <summary>
+        /// (Brown11)
+        /// </summary>
+        [Description("Brown11")]
+        Brown11 = 392,
+
+        /// <summary>
+        /// (Green9)
+        /// </summary>
+        [Description("Green9")]
+        Green9 = 149,
+
+        /// <summary>
+        /// (Blue71)
+        /// </summary>
+        [Description("Blue71")]
+        Blue71 = 320,
+
+        /// <summary>
+        /// (Orange7)
+        /// </summary>
+        [Description("Orange7")]
+        Orange7 = 78,
+
+        /// <summary>
+        /// (Green58)
+        /// </summary>
+        [Description("Green58")]
+        Green58 = 198,
+
+        /// <summary>
+        /// (Blue56)
+        /// </summary>
+        [Description("Blue56")]
+        Blue56 = 305,
+
+        /// <summary>
+        /// (Red10)
+        /// </summary>
+        [Description("Red10")]
+        Red10 = 53,
+
+        /// <summary>
+        /// (Green69)
+        /// </summary>
+        [Description("Green69")]
+        Green69 = 209,
+
+        /// <summary>
+        /// (Yellow11)
+        /// </summary>
+        [Description("Yellow11")]
+        Yellow11 = 109,
+
+        /// <summary>
+        /// (Red3)
+        /// </summary>
+        [Description("Red3")]
+        Red3 = 46,
+
+        /// <summary>
+        /// (Grey13)
+        /// </summary>
+        [Description("Grey13")]
+        Grey13 = 374,
+
+        /// <summary>
+        /// (Pink32)
+        /// </summary>
+        [Description("Pink32")]
+        Pink32 = 32,
+
+        /// <summary>
+        /// (Yellow8)
+        /// </summary>
+        [Description("Yellow8")]
+        Yellow8 = 106,
+
+        /// <summary>
+        /// (Green18)
+        /// </summary>
+        [Description("Green18")]
+        Green18 = 158,
+
+        /// <summary>
+        /// (Green97)
+        /// </summary>
+        [Description("Green97")]
+        Green97 = 237,
+
+        /// <summary>
+        /// (Yellow41)
+        /// </summary>
+        [Description("Yellow41")]
+        Yellow41 = 139,
+
+        /// <summary>
+        /// (Green60)
+        /// </summary>
+        [Description("Green60")]
+        Green60 = 200,
+
+        /// <summary>
+        /// (Green53)
+        /// </summary>
+        [Description("Green53")]
+        Green53 = 193,
+
+        /// <summary>
+        /// (Red15)
+        /// </summary>
+        [Description("Red15")]
+        Red15 = 58,
+
+        /// <summary>
+        /// (Pink39)
+        /// </summary>
+        [Description("Pink39")]
+        Pink39 = 39,
+
+        /// <summary>
+        /// (Blue48)
+        /// </summary>
+        [Description("Blue48")]
+        Blue48 = 297,
+
+        /// <summary>
+        /// (Orange18)
+        /// </summary>
+        [Description("Orange18")]
+        Orange18 = 89,
+
+        /// <summary>
+        /// (Green4)
+        /// </summary>
+        [Description("Green4")]
+        Green4 = 144,
+
+        /// <summary>
+        /// (Blue33)
+        /// </summary>
+        [Description("Blue33")]
+        Blue33 = 282,
+
+        /// <summary>
+        /// (Blue15)
+        /// </summary>
+        [Description("Blue15")]
+        Blue15 = 264,
+
+        /// <summary>
+        /// (Green50)
+        /// </summary>
+        [Description("Green50")]
+        Green50 = 190,
+
+        /// <summary>
+        /// (Green40)
+        /// </summary>
+        [Description("Green40")]
+        Green40 = 180,
+
+        /// <summary>
+        /// (Red19)
+        /// </summary>
+        [Description("Red19")]
+        Red19 = 62,
+
+        /// <summary>
+        /// (Blue3)
+        /// </summary>
+        [Description("Blue3")]
+        Blue3 = 252,
+
+        /// <summary>
+        /// (Pink8)
+        /// </summary>
+        [Description("Pink8")]
+        Pink8 = 8,
+
+        /// <summary>
+        /// (Pink6)
+        /// </summary>
+        [Description("Pink6")]
+        Pink6 = 6,
+
+        /// <summary>
+        /// (Orange9)
+        /// </summary>
+        [Description("Orange9")]
+        Orange9 = 80,
+
+        /// <summary>
+        /// (Blue38)
+        /// </summary>
+        [Description("Blue38")]
+        Blue38 = 287,
+
+        /// <summary>
+        /// (Grey16)
+        /// </summary>
+        [Description("Grey16")]
+        Grey16 = 377,
+
+        /// <summary>
+        /// (Green93)
+        /// </summary>
+        [Description("Green93")]
+        Green93 = 233,
+
+        /// <summary>
+        /// (Brown16)
+        /// </summary>
+        [Description("Brown16")]
+        Brown16 = 397,
+
+        /// <summary>
+        /// (Pink29)
+        /// </summary>
+        [Description("Pink29")]
+        Pink29 = 29,
+
+        /// <summary>
+        /// (Blue43)
+        /// </summary>
+        [Description("Blue43")]
+        Blue43 = 292,
+
+        /// <summary>
+        /// (Yellow21)
+        /// </summary>
+        [Description("Yellow21")]
+        Yellow21 = 119,
+
+        /// <summary>
+        /// (Brown4)
+        /// </summary>
+        [Description("Brown4")]
+        Brown4 = 385,
+
+        /// <summary>
+        /// (Green83)
+        /// </summary>
+        [Description("Green83")]
+        Green83 = 223,
+
+        /// <summary>
+        /// (Green94)
+        /// </summary>
+        [Description("Green94")]
+        Green94 = 234,
+
+        /// <summary>
+        /// (Brown14)
+        /// </summary>
+        [Description("Brown14")]
+        Brown14 = 395,
+
+        /// <summary>
+        /// (Green108)
+        /// </summary>
+        [Description("Green108")]
+        Green108 = 248,
+
+        /// <summary>
+        /// (Red4)
+        /// </summary>
+        [Description("Red4")]
+        Red4 = 47,
+
+        /// <summary>
+        /// (Pink37)
+        /// </summary>
+        [Description("Pink37")]
+        Pink37 = 37,
+
+        /// <summary>
+        /// (Blue60)
+        /// </summary>
+        [Description("Blue60")]
+        Blue60 = 309,
+
+        /// <summary>
+        /// (Green90)
+        /// </summary>
+        [Description("Green90")]
+        Green90 = 230,
+
+        /// <summary>
+        /// (Blue13)
+        /// </summary>
+        [Description("Blue13")]
+        Blue13 = 262,
+
+        /// <summary>
+        /// (Blue64)
+        /// </summary>
+        [Description("Blue64")]
+        Blue64 = 313,
+
+        /// <summary>
+        /// (Blue29)
+        /// </summary>
+        [Description("Blue29")]
+        Blue29 = 278,
+
+        /// <summary>
+        /// (Green91)
+        /// </summary>
+        [Description("Green91")]
+        Green91 = 231,
+
+        /// <summary>
+        /// (Green51)
+        /// </summary>
+        [Description("Green51")]
+        Green51 = 191,
+
+        /// <summary>
+        /// (Blue40)
+        /// </summary>
+        [Description("Blue40")]
+        Blue40 = 289,
+
+        /// <summary>
+        /// (Green81)
+        /// </summary>
+        [Description("Green81")]
+        Green81 = 221,
+
+        /// <summary>
+        /// (Blue2)
+        /// </summary>
+        [Description("Blue2")]
+        Blue2 = 251,
+
+        /// <summary>
+        /// (Grey7)
+        /// </summary>
+        [Description("Grey7")]
+        Grey7 = 368,
+
+        /// <summary>
+        /// (Favorites17)
+        /// </summary>
+        [Description("Favorites17")]
+        Favorites17 = 417,
+
+        /// <summary>
+        /// (Brown17)
+        /// </summary>
+        [Description("Brown17")]
+        Brown17 = 398,
+
+        /// <summary>
+        /// (Green1)
+        /// </summary>
+        [Description("Green1")]
+        Green1 = 141,
+
+        /// <summary>
+        /// (Yellow17)
+        /// </summary>
+        [Description("Yellow17")]
+        Yellow17 = 115,
+
+        /// <summary>
+        /// (Pink28)
+        /// </summary>
+        [Description("Pink28")]
+        Pink28 = 28,
+
+        /// <summary>
+        /// (Blue26)
+        /// </summary>
+        [Description("Blue26")]
+        Blue26 = 275,
+
+        /// <summary>
+        /// (Brown6)
+        /// </summary>
+        [Description("Brown6")]
+        Brown6 = 387,
+
+        /// <summary>
+        /// (Green42)
+        /// </summary>
+        [Description("Green42")]
+        Green42 = 182,
+
+        /// <summary>
+        /// (Pink42)
+        /// </summary>
+        [Description("Pink42")]
+        Pink42 = 42,
+
+        /// <summary>
+        /// (Blue61)
+        /// </summary>
+        [Description("Blue61")]
+        Blue61 = 310,
+
+        /// <summary>
+        /// (Pink18)
+        /// </summary>
+        [Description("Pink18")]
+        Pink18 = 18,
+
+        /// <summary>
+        /// (Green105)
+        /// </summary>
+        [Description("Green105")]
+        Green105 = 245,
+
+        /// <summary>
+        /// (Red7)
+        /// </summary>
+        [Description("Red7")]
+        Red7 = 50,
+
+        /// <summary>
+        /// (Green19)
+        /// </summary>
+        [Description("Green19")]
+        Green19 = 159,
+
+        /// <summary>
+        /// (Violet31)
+        /// </summary>
+        [Description("Violet31")]
+        Violet31 = 356,
+
+        /// <summary>
+        /// (Brown8)
+        /// </summary>
+        [Description("Brown8")]
+        Brown8 = 389,
+
+        /// <summary>
+        /// (Favorites9)
+        /// </summary>
+        [Description("Favorites9")]
+        Favorites9 = 409,
+
+        /// <summary>
+        /// (Yellow19)
+        /// </summary>
+        [Description("Yellow19")]
+        Yellow19 = 117,
+
+        /// <summary>
+        /// (Green107)
+        /// </summary>
+        [Description("Green107")]
+        Green107 = 247,
+
+        /// <summary>
+        /// (Red22)
+        /// </summary>
+        [Description("Red22")]
+        Red22 = 65,
+
+        /// <summary>
+        /// (Yellow36)
+        /// </summary>
+        [Description("Yellow36")]
+        Yellow36 = 134,
+
+        /// <summary>
+        /// (Blue16)
+        /// </summary>
+        [Description("Blue16")]
+        Blue16 = 265,
+
+        /// <summary>
+        /// (Pink7)
+        /// </summary>
+        [Description("Pink7")]
+        Pink7 = 7,
+
+        /// <summary>
+        /// (Violet35)
+        /// </summary>
+        [Description("Violet35")]
+        Violet35 = 360,
+
+        /// <summary>
+        /// (Favorites18)
+        /// </summary>
+        [Description("Favorites18")]
+        Favorites18 = 418,
+
+        /// <summary>
+        /// (Green96)
+        /// </summary>
+        [Description("Green96")]
+        Green96 = 236,
+
+        /// <summary>
+        /// (Orange10)
+        /// </summary>
+        [Description("Orange10")]
+        Orange10 = 81,
+
+        /// <summary>
+        /// (Pink10)
+        /// </summary>
+        [Description("Pink10")]
+        Pink10 = 10,
+
+        /// <summary>
+        /// (Green14)
+        /// </summary>
+        [Description("Green14")]
+        Green14 = 154,
+
+        /// <summary>
+        /// (Pink33)
+        /// </summary>
+        [Description("Pink33")]
+        Pink33 = 33,
+
+        /// <summary>
+        /// (Blue12)
+        /// </summary>
+        [Description("Blue12")]
+        Blue12 = 261,
+
+        /// <summary>
+        /// (Blue34)
+        /// </summary>
+        [Description("Blue34")]
+        Blue34 = 283,
+
+        /// <summary>
+        /// (Green3)
+        /// </summary>
+        [Description("Green3")]
+        Green3 = 143,
+
+        /// <summary>
+        /// (Green101)
+        /// </summary>
+        [Description("Green101")]
+        Green101 = 241,
+
+        /// <summary>
+        /// (Pink3)
+        /// </summary>
+        [Description("Pink3")]
+        Pink3 = 3,
+
+        /// <summary>
+        /// (Blue27)
+        /// </summary>
+        [Description("Blue27")]
+        Blue27 = 276,
+
+        /// <summary>
+        /// (Grey4)
+        /// </summary>
+        [Description("Grey4")]
+        Grey4 = 365,
+
+        /// <summary>
+        /// (Violet23)
+        /// </summary>
+        [Description("Violet23")]
+        Violet23 = 348,
+
+        /// <summary>
+        /// (Blue30)
+        /// </summary>
+        [Description("Blue30")]
+        Blue30 = 279,
+
+        /// <summary>
+        /// (Blue45)
+        /// </summary>
+        [Description("Blue45")]
+        Blue45 = 294,
+
+        /// <summary>
+        /// (Yellow34)
+        /// </summary>
+        [Description("Yellow34")]
+        Yellow34 = 132,
+
+        /// <summary>
+        /// (Orange15)
+        /// </summary>
+        [Description("Orange15")]
+        Orange15 = 86,
+
+        /// <summary>
+        /// (Grey3)
+        /// </summary>
+        [Description("Grey3")]
+        Grey3 = 364,
+
+        /// <summary>
+        /// (Favorites2)
+        /// </summary>
+        [Description("Favorites2")]
+        Favorites2 = 402,
+
+        /// <summary>
+        /// (Green26)
+        /// </summary>
+        [Description("Green26")]
+        Green26 = 166,
+
+        /// <summary>
+        /// (Red23)
+        /// </summary>
+        [Description("Red23")]
+        Red23 = 66,
+
+        /// <summary>
+        /// (Violet15)
+        /// </summary>
+        [Description("Violet15")]
+        Violet15 = 340,
+
+        /// <summary>
+        /// (Green30)
+        /// </summary>
+        [Description("Green30")]
+        Green30 = 170,
+
+        /// <summary>
+        /// (Green35)
+        /// </summary>
+        [Description("Green35")]
+        Green35 = 175,
+
+        /// <summary>
+        /// (Blue20)
+        /// </summary>
+        [Description("Blue20")]
+        Blue20 = 269,
+
+        /// <summary>
+        /// (Green49)
+        /// </summary>
+        [Description("Green49")]
+        Green49 = 189,
+
+        /// <summary>
+        /// (Green66)
+        /// </summary>
+        [Description("Green66")]
+        Green66 = 206,
+
+        /// <summary>
+        /// (Green21)
+        /// </summary>
+        [Description("Green21")]
+        Green21 = 161,
+
+        /// <summary>
+        /// (Green11)
+        /// </summary>
+        [Description("Green11")]
+        Green11 = 151,
+
+        /// <summary>
+        /// (Green43)
+        /// </summary>
+        [Description("Green43")]
+        Green43 = 183,
+
+        /// <summary>
+        /// (Pink19)
+        /// </summary>
+        [Description("Pink19")]
+        Pink19 = 19,
+
+        /// <summary>
+        /// (Green102)
+        /// </summary>
+        [Description("Green102")]
+        Green102 = 242,
+
+        /// <summary>
+        /// (Grey18)
+        /// </summary>
+        [Description("Grey18")]
+        Grey18 = 379,
+
+        /// <summary>
+        /// (Red14)
+        /// </summary>
+        [Description("Red14")]
+        Red14 = 57,
+
+        /// <summary>
+        /// (Green64)
+        /// </summary>
+        [Description("Green64")]
+        Green64 = 204,
+
+        /// <summary>
+        /// (Pink13)
+        /// </summary>
+        [Description("Pink13")]
+        Pink13 = 13,
+
+        /// <summary>
+        /// (Yellow30)
+        /// </summary>
+        [Description("Yellow30")]
+        Yellow30 = 128,
+
+        /// <summary>
+        /// (Violet29)
+        /// </summary>
+        [Description("Violet29")]
+        Violet29 = 354,
+
+        /// <summary>
+        /// (Green87)
+        /// </summary>
+        [Description("Green87")]
+        Green87 = 227,
+
+        /// <summary>
+        /// (Blue24)
+        /// </summary>
+        [Description("Blue24")]
+        Blue24 = 273,
+
+        /// <summary>
+        /// (Grey9)
+        /// </summary>
+        [Description("Grey9")]
+        Grey9 = 370,
+
+        /// <summary>
+        /// (Green20)
+        /// </summary>
+        [Description("Green20")]
+        Green20 = 160,
+
+        /// <summary>
+        /// (Orange2)
+        /// </summary>
+        [Description("Orange2")]
+        Orange2 = 73,
+
+        /// <summary>
+        /// (Red12)
+        /// </summary>
+        [Description("Red12")]
+        Red12 = 55,
+
+        /// <summary>
+        /// (Grey12)
+        /// </summary>
+        [Description("Grey12")]
+        Grey12 = 373,
+
+        /// <summary>
+        /// (Grey11)
+        /// </summary>
+        [Description("Grey11")]
+        Grey11 = 372,
+
+        /// <summary>
+        /// (Blue76)
+        /// </summary>
+        [Description("Blue76")]
+        Blue76 = 325,
+
+        /// <summary>
+        /// (Violet25)
+        /// </summary>
+        [Description("Violet25")]
+        Violet25 = 350,
+
+        /// <summary>
+        /// (Green31)
+        /// </summary>
+        [Description("Green31")]
+        Green31 = 171,
+
+        /// <summary>
+        /// (Green70)
+        /// </summary>
+        [Description("Green70")]
+        Green70 = 210,
+
+        /// <summary>
+        /// (Red11)
+        /// </summary>
+        [Description("Red11")]
+        Red11 = 54,
+
+        /// <summary>
+        /// (Blue69)
+        /// </summary>
+        [Description("Blue69")]
+        Blue69 = 318,
+
+        /// <summary>
+        /// (Blue55)
+        /// </summary>
+        [Description("Blue55")]
+        Blue55 = 304,
+
+        /// <summary>
+        /// (Yellow39)
+        /// </summary>
+        [Description("Yellow39")]
+        Yellow39 = 137,
+
+        /// <summary>
+        /// (Green13)
+        /// </summary>
+        [Description("Green13")]
+        Green13 = 153,
+
+        /// <summary>
+        /// (Violet33)
+        /// </summary>
+        [Description("Violet33")]
+        Violet33 = 358,
+
+        /// <summary>
+        /// (Violet26)
+        /// </summary>
+        [Description("Violet26")]
+        Violet26 = 351,
+
+        /// <summary>
+        /// (Grey20)
+        /// </summary>
+        [Description("Grey20")]
+        Grey20 = 381,
+
+        /// <summary>
+        /// (Yellow28)
+        /// </summary>
+        [Description("Yellow28")]
+        Yellow28 = 126,
+
+        /// <summary>
+        /// (Brown19)
+        /// </summary>
+        [Description("Brown19")]
+        Brown19 = 400,
+
+        /// <summary>
+        /// (Green23)
+        /// </summary>
+        [Description("Green23")]
+        Green23 = 163,
+
+        /// <summary>
+        /// (Pink43)
+        /// </summary>
+        [Description("Pink43")]
+        Pink43 = 43,
+
+        /// <summary>
+        /// (Violet11)
+        /// </summary>
+        [Description("Violet11")]
+        Violet11 = 336,
+
+        /// <summary>
+        /// (Blue72)
+        /// </summary>
+        [Description("Blue72")]
+        Blue72 = 321,
+
+        /// <summary>
+        /// (Pink22)
+        /// </summary>
+        [Description("Pink22")]
+        Pink22 = 22,
+
+        /// <summary>
+        /// (Green106)
+        /// </summary>
+        [Description("Green106")]
+        Green106 = 246,
+
+        /// <summary>
+        /// (Green89)
+        /// </summary>
+        [Description("Green89")]
+        Green89 = 229,
+
+        /// <summary>
+        /// (Green86)
+        /// </summary>
+        [Description("Green86")]
+        Green86 = 226,
+
+        /// <summary>
+        /// (Blue67)
+        /// </summary>
+        [Description("Blue67")]
+        Blue67 = 316,
+
+        /// <summary>
+        /// (Green75)
+        /// </summary>
+        [Description("Green75")]
+        Green75 = 215,
+
+        /// <summary>
+        /// (Green62)
+        /// </summary>
+        [Description("Green62")]
+        Green62 = 202,
+
+        /// <summary>
+        /// (Pink21)
+        /// </summary>
+        [Description("Pink21")]
+        Pink21 = 21,
+
+        /// <summary>
+        /// (Green79)
+        /// </summary>
+        [Description("Green79")]
+        Green79 = 219,
+
+        /// <summary>
+        /// (Violet12)
+        /// </summary>
+        [Description("Violet12")]
+        Violet12 = 337,
+
+        /// <summary>
+        /// (Violet24)
+        /// </summary>
+        [Description("Violet24")]
+        Violet24 = 349,
+
+        /// <summary>
+        /// (Yellow7)
+        /// </summary>
+        [Description("Yellow7")]
+        Yellow7 = 105,
+
+        /// <summary>
+        /// (Green72)
+        /// </summary>
+        [Description("Green72")]
+        Green72 = 212,
+
+        /// <summary>
+        /// (Favorites11)
+        /// </summary>
+        [Description("Favorites11")]
+        Favorites11 = 411,
+
+        /// <summary>
+        /// (Red24)
+        /// </summary>
+        [Description("Red24")]
+        Red24 = 67,
+
+        /// <summary>
+        /// (Pink15)
+        /// </summary>
+        [Description("Pink15")]
+        Pink15 = 15,
+
+        /// <summary>
+        /// (Green15)
+        /// </summary>
+        [Description("Green15")]
+        Green15 = 155,
+
+        /// <summary>
+        /// (Green41)
+        /// </summary>
+        [Description("Green41")]
+        Green41 = 181,
+
+        /// <summary>
+        /// (Yellow25)
+        /// </summary>
+        [Description("Yellow25")]
+        Yellow25 = 123,
+
+        /// <summary>
+        /// (Green104)
+        /// </summary>
+        [Description("Green104")]
+        Green104 = 244,
+
+        /// <summary>
+        /// (Yellow33)
+        /// </summary>
+        [Description("Yellow33")]
+        Yellow33 = 131,
+
+        /// <summary>
+        /// (Green78)
+        /// </summary>
+        [Description("Green78")]
+        Green78 = 218,
+
+        /// <summary>
+        /// (Favorites8)
+        /// </summary>
+        [Description("Favorites8")]
+        Favorites8 = 408,
+
+        /// <summary>
+        /// (Blue58)
+        /// </summary>
+        [Description("Blue58")]
+        Blue58 = 307,
+
+        /// <summary>
+        /// (Yellow14)
+        /// </summary>
+        [Description("Yellow14")]
+        Yellow14 = 112,
+
+        /// <summary>
+        /// (Orange26)
+        /// </summary>
+        [Description("Orange26")]
+        Orange26 = 97,
+
+        /// <summary>
+        /// (Yellow31)
+        /// </summary>
+        [Description("Yellow31")]
+        Yellow31 = 129,
+
+        /// <summary>
+        /// (Green29)
+        /// </summary>
+        [Description("Green29")]
+        Green29 = 169,
+
+        /// <summary>
+        /// (Yellow3)
+        /// </summary>
+        [Description("Yellow3")]
+        Yellow3 = 101,
+
+        /// <summary>
+        /// (Green92)
+        /// </summary>
+        [Description("Green92")]
+        Green92 = 232,
+
+        /// <summary>
+        /// (Pink4)
+        /// </summary>
+        [Description("Pink4")]
+        Pink4 = 4,
+
+        /// <summary>
+        /// (Green84)
+        /// </summary>
+        [Description("Green84")]
+        Green84 = 224,
+
+        /// <summary>
+        /// (Blue62)
+        /// </summary>
+        [Description("Blue62")]
+        Blue62 = 311,
+
+        /// <summary>
+        /// (Violet22)
+        /// </summary>
+        [Description("Violet22")]
+        Violet22 = 347,
+
+        /// <summary>
+        /// (Green95)
+        /// </summary>
+        [Description("Green95")]
+        Green95 = 235,
+
+        /// <summary>
+        /// (Pink30)
+        /// </summary>
+        [Description("Pink30")]
+        Pink30 = 30,
+
+        /// <summary>
+        /// (Pink20)
+        /// </summary>
+        [Description("Pink20")]
+        Pink20 = 20,
+
+        /// <summary>
+        /// (Yellow9)
+        /// </summary>
+        [Description("Yellow9")]
+        Yellow9 = 107,
+
+        /// <summary>
+        /// (Green59)
+        /// </summary>
+        [Description("Green59")]
+        Green59 = 199,
+
+        /// <summary>
+        /// (Favorites14)
+        /// </summary>
+        [Description("Favorites14")]
+        Favorites14 = 414,
+
+        /// <summary>
+        /// (Blue1)
+        /// </summary>
+        [Description("Blue1")]
+        Blue1 = 250,
+
+        /// <summary>
+        /// (Pink14)
+        /// </summary>
+        [Description("Pink14")]
+        Pink14 = 14,
+
+        /// <summary>
+        /// (Green57)
+        /// </summary>
+        [Description("Green57")]
+        Green57 = 197,
+
+        /// <summary>
+        /// (Green98)
+        /// </summary>
+        [Description("Green98")]
+        Green98 = 238,
+
+        /// <summary>
+        /// (Pink34)
+        /// </summary>
+        [Description("Pink34")]
+        Pink34 = 34,
+
+        /// <summary>
+        /// (Blue75)
+        /// </summary>
+        [Description("Blue75")]
+        Blue75 = 324,
+
+        /// <summary>
+        /// (Favorites5)
+        /// </summary>
+        [Description("Favorites5")]
+        Favorites5 = 405,
+
+        /// <summary>
+        /// (Blue57)
+        /// </summary>
+        [Description("Blue57")]
+        Blue57 = 306,
+
+        /// <summary>
+        /// (Orange22)
+        /// </summary>
+        [Description("Orange22")]
+        Orange22 = 93,
+
+        /// <summary>
+        /// (Blue14)
+        /// </summary>
+        [Description("Blue14")]
+        Blue14 = 263,
+
+        /// <summary>
+        /// (Blue25)
+        /// </summary>
+        [Description("Blue25")]
+        Blue25 = 274,
+
+        /// <summary>
+        /// (Yellow29)
+        /// </summary>
+        [Description("Yellow29")]
+        Yellow29 = 127,
+
+        /// <summary>
+        /// (Green39)
+        /// </summary>
+        [Description("Green39")]
+        Green39 = 179,
+
+        /// <summary>
+        /// (Green61)
+        /// </summary>
+        [Description("Green61")]
+        Green61 = 201,
+
+        /// <summary>
+        /// (Orange25)
+        /// </summary>
+        [Description("Orange25")]
+        Orange25 = 96,
+
+        /// <summary>
+        /// (Violet9)
+        /// </summary>
+        [Description("Violet9")]
+        Violet9 = 334,
+
+        /// <summary>
+        /// (Green36)
+        /// </summary>
+        [Description("Green36")]
+        Green36 = 176,
+
+        /// <summary>
+        /// (Red25)
+        /// </summary>
+        [Description("Red25")]
+        Red25 = 68,
+
+        /// <summary>
+        /// (Yellow26)
+        /// </summary>
+        [Description("Yellow26")]
+        Yellow26 = 124,
+
+        /// <summary>
+        /// (Yellow2)
+        /// </summary>
+        [Description("Yellow2")]
+        Yellow2 = 100,
+
+        /// <summary>
+        /// (Blue4)
+        /// </summary>
+        [Description("Blue4")]
+        Blue4 = 253,
+
+        /// <summary>
+        /// (Violet10)
+        /// </summary>
+        [Description("Violet10")]
+        Violet10 = 335,
+
+        /// <summary>
+        /// (Violet20)
+        /// </summary>
+        [Description("Violet20")]
+        Violet20 = 345,
+
+        /// <summary>
+        /// (Pink1)
+        /// </summary>
+        [Description("Pink1")]
+        Pink1 = 1,
+
+        /// <summary>
+        /// (Blue65)
+        /// </summary>
+        [Description("Blue65")]
+        Blue65 = 314,
+
+        /// <summary>
+        /// (Red1)
+        /// </summary>
+        [Description("Red1")]
+        Red1 = 44,
+
+        /// <summary>
+        /// (Green17)
+        /// </summary>
+        [Description("Green17")]
+        Green17 = 157,
+
+        /// <summary>
+        /// (Orange27)
+        /// </summary>
+        [Description("Orange27")]
+        Orange27 = 98,
+
+        /// <summary>
+        /// (Green45)
+        /// </summary>
+        [Description("Green45")]
+        Green45 = 185,
+
+        /// <summary>
+        /// (Green32)
+        /// </summary>
+        [Description("Green32")]
+        Green32 = 172,
+
+        /// <summary>
+        /// (Blue53)
+        /// </summary>
+        [Description("Blue53")]
+        Blue53 = 302,
+
+        /// <summary>
+        /// (Pink17)
+        /// </summary>
+        [Description("Pink17")]
+        Pink17 = 17,
+
+        /// <summary>
+        /// (Violet34)
+        /// </summary>
+        [Description("Violet34")]
+        Violet34 = 359,
+
+        /// <summary>
+        /// (Yellow15)
+        /// </summary>
+        [Description("Yellow15")]
+        Yellow15 = 113,
+
+        /// <summary>
+        /// (Brown7)
+        /// </summary>
+        [Description("Brown7")]
+        Brown7 = 388,
+
+        /// <summary>
+        /// (Brown18)
+        /// </summary>
+        [Description("Brown18")]
+        Brown18 = 399,
+
+        /// <summary>
+        /// (Orange1)
+        /// </summary>
+        [Description("Orange1")]
+        Orange1 = 72,
+
+        /// <summary>
+        /// (Violet5)
+        /// </summary>
+        [Description("Violet5")]
+        Violet5 = 330,
+
+        /// <summary>
+        /// (Green56)
+        /// </summary>
+        [Description("Green56")]
+        Green56 = 196,
+
+        /// <summary>
+        /// (Green73)
+        /// </summary>
+        [Description("Green73")]
+        Green73 = 213,
+
+        /// <summary>
+        /// (Violet19)
+        /// </summary>
+        [Description("Violet19")]
+        Violet19 = 344,
+
+        /// <summary>
+        /// (Red16)
+        /// </summary>
+        [Description("Red16")]
+        Red16 = 59,
+
+        /// <summary>
+        /// (Violet18)
+        /// </summary>
+        [Description("Violet18")]
+        Violet18 = 343,
+
+        /// <summary>
+        /// (Orange14)
+        /// </summary>
+        [Description("Orange14")]
+        Orange14 = 85,
+
+        /// <summary>
+        /// (Pink36)
+        /// </summary>
+        [Description("Pink36")]
+        Pink36 = 36,
+
+        /// <summary>
+        /// (Yellow1)
+        /// </summary>
+        [Description("Yellow1")]
+        Yellow1 = 99,
+
+        /// <summary>
+        /// (Blue68)
+        /// </summary>
+        [Description("Blue68")]
+        Blue68 = 317,
+
+        /// <summary>
+        /// (Brown5)
+        /// </summary>
+        [Description("Brown5")]
+        Brown5 = 386,
+
+        /// <summary>
+        /// (Red20)
+        /// </summary>
+        [Description("Red20")]
+        Red20 = 63,
+
+        /// <summary>
+        /// (Yellow40)
+        /// </summary>
+        [Description("Yellow40")]
+        Yellow40 = 138,
+
+        /// <summary>
+        /// (Orange4)
+        /// </summary>
+        [Description("Orange4")]
+        Orange4 = 75,
+
+        /// <summary>
+        /// (Yellow13)
+        /// </summary>
+        [Description("Yellow13")]
+        Yellow13 = 111,
+
+        /// <summary>
+        /// (Orange3)
+        /// </summary>
+        [Description("Orange3")]
+        Orange3 = 74,
+
+        /// <summary>
+        /// (Yellow24)
+        /// </summary>
+        [Description("Yellow24")]
+        Yellow24 = 122,
+
+        /// <summary>
+        /// (Violet36)
+        /// </summary>
+        [Description("Violet36")]
+        Violet36 = 361,
+
+        /// <summary>
+        /// (Brown13)
+        /// </summary>
+        [Description("Brown13")]
+        Brown13 = 394,
+
+        /// <summary>
+        /// (Green55)
+        /// </summary>
+        [Description("Green55")]
+        Green55 = 195,
+
+        /// <summary>
+        /// (Yellow38)
+        /// </summary>
+        [Description("Yellow38")]
+        Yellow38 = 136,
+
+        /// <summary>
+        /// (Blue46)
+        /// </summary>
+        [Description("Blue46")]
+        Blue46 = 295,
+
+        /// <summary>
+        /// (Violet16)
+        /// </summary>
+        [Description("Violet16")]
+        Violet16 = 341,
+
+        /// <summary>
+        /// (Blue70)
+        /// </summary>
+        [Description("Blue70")]
+        Blue70 = 319,
+
+        /// <summary>
+        /// (Orange23)
+        /// </summary>
+        [Description("Orange23")]
+        Orange23 = 94,
+
+        /// <summary>
+        /// (Brown9)
+        /// </summary>
+        [Description("Brown9")]
+        Brown9 = 390,
+
+        /// <summary>
+        /// (Blue37)
+        /// </summary>
+        [Description("Blue37")]
+        Blue37 = 286,
+
+        /// <summary>
+        /// (Green48)
+        /// </summary>
+        [Description("Green48")]
+        Green48 = 188,
+
+        /// <summary>
+        /// (Green54)
+        /// </summary>
+        [Description("Green54")]
+        Green54 = 194,
+
+        /// <summary>
+        /// (Green99)
+        /// </summary>
+        [Description("Green99")]
+        Green99 = 239,
+
+        /// <summary>
+        /// (Yellow4)
+        /// </summary>
+        [Description("Yellow4")]
+        Yellow4 = 102,
+
+        /// <summary>
+        /// (Blue8)
+        /// </summary>
+        [Description("Blue8")]
+        Blue8 = 257,
+
+        /// <summary>
+        /// (Red21)
+        /// </summary>
+        [Description("Red21")]
+        Red21 = 64,
+
+        /// <summary>
+        /// (Green77)
+        /// </summary>
+        [Description("Green77")]
+        Green77 = 217,
+
+        /// <summary>
+        /// (Favorites12)
+        /// </summary>
+        [Description("Favorites12")]
+        Favorites12 = 412,
+
+        /// <summary>
+        /// (Pink2)
+        /// </summary>
+        [Description("Pink2")]
+        Pink2 = 2,
+
+        /// <summary>
+        /// (Green7)
+        /// </summary>
+        [Description("Green7")]
+        Green7 = 147,
+
+        /// <summary>
+        /// (Green82)
+        /// </summary>
+        [Description("Green82")]
+        Green82 = 222,
+
+        /// <summary>
+        /// (Green109)
+        /// </summary>
+        [Description("Green109")]
+        Green109 = 249,
+
+        /// <summary>
+        /// (Violet30)
+        /// </summary>
+        [Description("Violet30")]
+        Violet30 = 355,
+
+        /// <summary>
+        /// (Pink27)
+        /// </summary>
+        [Description("Pink27")]
+        Pink27 = 27,
+
+        /// <summary>
+        /// (Violet2)
+        /// </summary>
+        [Description("Violet2")]
+        Violet2 = 327,
+
+        /// <summary>
+        /// (Orange24)
+        /// </summary>
+        [Description("Orange24")]
+        Orange24 = 95,
+
+        /// <summary>
+        /// (Yellow22)
+        /// </summary>
+        [Description("Yellow22")]
+        Yellow22 = 120,
+
+        /// <summary>
+        /// (Green71)
+        /// </summary>
+        [Description("Green71")]
+        Green71 = 211,
+
+        /// <summary>
+        /// (Blue42)
+        /// </summary>
+        [Description("Blue42")]
+        Blue42 = 291,
+
+        /// <summary>
+        /// (Orange6)
+        /// </summary>
+        [Description("Orange6")]
+        Orange6 = 77,
+
+        /// <summary>
+        /// (Blue41)
+        /// </summary>
+        [Description("Blue41")]
+        Blue41 = 290,
+
+        /// <summary>
+        /// (Grey10)
+        /// </summary>
+        [Description("Grey10")]
+        Grey10 = 371,
+
+        /// <summary>
+        /// (Blue23)
+        /// </summary>
+        [Description("Blue23")]
+        Blue23 = 272,
+
+        /// <summary>
+        /// (Green88)
+        /// </summary>
+        [Description("Green88")]
+        Green88 = 228,
+
+        /// <summary>
+        /// (Green44)
+        /// </summary>
+        [Description("Green44")]
+        Green44 = 184,
+
+        /// <summary>
+        /// (Violet14)
+        /// </summary>
+        [Description("Violet14")]
+        Violet14 = 339,
+
+        /// <summary>
+        /// (Blue73)
+        /// </summary>
+        [Description("Blue73")]
+        Blue73 = 322,
+
+        /// <summary>
+        /// (Grey17)
+        /// </summary>
+        [Description("Grey17")]
+        Grey17 = 378,
+
+        /// <summary>
+        /// (Brown2)
+        /// </summary>
+        [Description("Brown2")]
+        Brown2 = 383,
+
+        /// <summary>
+        /// (Green2)
+        /// </summary>
+        [Description("Green2")]
+        Green2 = 142,
+
+        /// <summary>
+        /// (Green52)
+        /// </summary>
+        [Description("Green52")]
+        Green52 = 192,
+
+        /// <summary>
+        /// (Blue18)
+        /// </summary>
+        [Description("Blue18")]
+        Blue18 = 267,
+
+        /// <summary>
+        /// (Green47)
+        /// </summary>
+        [Description("Green47")]
+        Green47 = 187,
+
+        /// <summary>
+        /// (Pink40)
+        /// </summary>
+        [Description("Pink40")]
+        Pink40 = 40,
+
+        /// <summary>
+        /// (Red2)
+        /// </summary>
+        [Description("Red2")]
+        Red2 = 45,
+
+        /// <summary>
+        /// (Blue66)
+        /// </summary>
+        [Description("Blue66")]
+        Blue66 = 315,
+
+        /// <summary>
+        /// (Green65)
+        /// </summary>
+        [Description("Green65")]
+        Green65 = 205,
+
+        /// <summary>
+        /// (Green85)
+        /// </summary>
+        [Description("Green85")]
+        Green85 = 225,
+
+        /// <summary>
+        /// (Yellow37)
+        /// </summary>
+        [Description("Yellow37")]
+        Yellow37 = 135,
+
+        /// <summary>
+        /// (Green34)
+        /// </summary>
+        [Description("Green34")]
+        Green34 = 174,
+
+        /// <summary>
+        /// (Green38)
+        /// </summary>
+        [Description("Green38")]
+        Green38 = 178,
+
+        /// <summary>
+        /// (Green28)
+        /// </summary>
+        [Description("Green28")]
+        Green28 = 168,
+
+        /// <summary>
+        /// (Blue6)
+        /// </summary>
+        [Description("Blue6")]
+        Blue6 = 255,
+
+        /// <summary>
+        /// (Orange8)
+        /// </summary>
+        [Description("Orange8")]
+        Orange8 = 79,
+
+        /// <summary>
+        /// (Favorites3)
+        /// </summary>
+        [Description("Favorites3")]
+        Favorites3 = 403,
+
+        /// <summary>
+        /// (Favorites4)
+        /// </summary>
+        [Description("Favorites4")]
+        Favorites4 = 404,
+
+        /// <summary>
+        /// (Green16)
+        /// </summary>
+        [Description("Green16")]
+        Green16 = 156,
+
+        /// <summary>
+        /// (Green74)
+        /// </summary>
+        [Description("Green74")]
+        Green74 = 214,
+
+        /// <summary>
+        /// (Violet32)
+        /// </summary>
+        [Description("Violet32")]
+        Violet32 = 357,
+
+        /// <summary>
+        /// (Violet3)
+        /// </summary>
+        [Description("Violet3")]
+        Violet3 = 328,
+
+        /// <summary>
+        /// (Red17)
+        /// </summary>
+        [Description("Red17")]
+        Red17 = 60,
+
+        /// <summary>
+        /// (Grey15)
+        /// </summary>
+        [Description("Grey15")]
+        Grey15 = 376,
+
+        /// <summary>
+        /// (Violet1)
+        /// </summary>
+        [Description("Violet1")]
+        Violet1 = 326,
+
+        /// <summary>
+        /// (Yellow12)
+        /// </summary>
+        [Description("Yellow12")]
+        Yellow12 = 110,
+
+        /// <summary>
+        /// (Favorites15)
+        /// </summary>
+        [Description("Favorites15")]
+        Favorites15 = 415,
+
+        /// <summary>
+        /// (Blue49)
+        /// </summary>
+        [Description("Blue49")]
+        Blue49 = 298,
+
+        /// <summary>
+        /// (Orange5)
+        /// </summary>
+        [Description("Orange5")]
+        Orange5 = 76,
+
+        /// <summary>
+        /// (Blue17)
+        /// </summary>
+        [Description("Blue17")]
+        Blue17 = 266,
+
+        /// <summary>
+        /// (Yellow6)
+        /// </summary>
+        [Description("Yellow6")]
+        Yellow6 = 104,
+
+        /// <summary>
+        /// (Red27)
+        /// </summary>
+        [Description("Red27")]
+        Red27 = 70,
+
+        /// <summary>
+        /// (Yellow5)
+        /// </summary>
+        [Description("Yellow5")]
+        Yellow5 = 103,
+
+        /// <summary>
+        /// (Brown3)
+        /// </summary>
+        [Description("Brown3")]
+        Brown3 = 384,
+
+        /// <summary>
+        /// (Blue35)
+        /// </summary>
+        [Description("Blue35")]
+        Blue35 = 284,
+
+        /// <summary>
+        /// (Blue11)
+        /// </summary>
+        [Description("Blue11")]
+        Blue11 = 260,
+
+        /// <summary>
+        /// (Brown12)
+        /// </summary>
+        [Description("Brown12")]
+        Brown12 = 393,
+
+        /// <summary>
+        /// (Blue59)
+        /// </summary>
+        [Description("Blue59")]
+        Blue59 = 308,
+
+        /// <summary>
+        /// (Green5)
+        /// </summary>
+        [Description("Green5")]
+        Green5 = 145,
+
+        /// <summary>
+        /// (Blue5)
+        /// </summary>
+        [Description("Blue5")]
+        Blue5 = 254,
+
+        /// <summary>
+        /// (Red8)
+        /// </summary>
+        [Description("Red8")]
+        Red8 = 51,
+
+        /// <summary>
+        /// (Green12)
+        /// </summary>
+        [Description("Green12")]
+        Green12 = 152,
+
+        /// <summary>
+        /// (Green80)
+        /// </summary>
+        [Description("Green80")]
+        Green80 = 220,
+
+        /// <summary>
+        /// (Yellow20)
+        /// </summary>
+        [Description("Yellow20")]
+        Yellow20 = 118,
+
+        /// <summary>
+        /// (Brown15)
+        /// </summary>
+        [Description("Brown15")]
+        Brown15 = 396,
+
+        /// <summary>
+        /// (Red5)
+        /// </summary>
+        [Description("Red5")]
+        Red5 = 48,
+
+        /// <summary>
+        /// (Blue36)
+        /// </summary>
+        [Description("Blue36")]
+        Blue36 = 285,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index 4fc88f8e4..5e4acb626 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -350,6 +350,7 @@
     <Compile Include="Entities\UserBase.cs" />
     <Compile Include="Entities\UsersRoleBase.cs" />
     <Compile Include="Entities\WindingMethodBase.cs" />
+    <Compile Include="Enumerations\CatalogDesignType.cs" />
     <Compile Include="Enumerations\ColorCatalogsItems.cs" />
     <Compile Include="IObservableEntityDTO.cs" />
     <Compile Include="ObservableEntityDTO.cs" />
@@ -558,7 +559,7 @@
   </Target>
   <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.DAL.Remote/DB/COLOR_CATALOGS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs
index e7a14cdbc..b6e719700 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs
@@ -23,7 +23,12 @@ namespace Tango.DAL.Remote.DB
         public int ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
+        public string COMPANY { get; set; }
         public string NAME { get; set; }
+        public string DESCRIPTION { get; set; }
+        public int DESIGN_TYPE { get; set; }
+        public byte[] LOGO { get; set; }
+        public byte[] IMAGE { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<COLOR_CATALOGS_GROUPS> COLOR_CATALOGS_GROUPS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_GROUPS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_GROUPS.cs
index e5a7d2c6a..099be4890 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_GROUPS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_GROUPS.cs
@@ -24,7 +24,6 @@ namespace Tango.DAL.Remote.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public string NAME { get; set; }
-        public string DESCRIPTION { get; set; }
         public string COLOR_CATALOG_GUID { get; set; }
     
         public virtual COLOR_CATALOGS COLOR_CATALOGS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs
index 6cdd50bf4..23c53f5df 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs
@@ -27,7 +27,6 @@ namespace Tango.DAL.Remote.DB
         public string COLOR_CATALOGS_GROUP_GUID { get; set; }
         public int CODE { get; set; }
         public string NAME { get; set; }
-        public string DESCRIPTION { get; set; }
         public double CYAN { get; set; }
         public double MAGENTA { get; set; }
         public double YELLOW { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS_RECIPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS_RECIPES.cs
index babd070b6..8dc52fba7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS_RECIPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS_RECIPES.cs
@@ -23,12 +23,6 @@ namespace Tango.DAL.Remote.DB
         public double MAGENTA { get; set; }
         public double YELLOW { get; set; }
         public double BLACK { get; set; }
-        public int RED { get; set; }
-        public int GREEN { get; set; }
-        public int BLUE { get; set; }
-        public double L { get; set; }
-        public double A { get; set; }
-        public double B { get; set; }
         public int PROCESS_PARAMETERS_TABLE_INDEX { get; set; }
     
         public virtual COLOR_CATALOGS_ITEMS COLOR_CATALOGS_ITEMS { 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 82b591238..f1ab52353 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -136,7 +136,12 @@
           <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="COMPANY" Type="nvarchar" MaxLength="100" Nullable="false" />
           <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" />
+          <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" />
+          <Property Name="DESIGN_TYPE" Type="int" Nullable="false" />
+          <Property Name="LOGO" Type="image" />
+          <Property Name="IMAGE" Type="image" />
         </EntityType>
         <EntityType Name="COLOR_CATALOGS_GROUPS">
           <Key>
@@ -146,7 +151,6 @@
           <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" />
-          <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" />
           <Property Name="COLOR_CATALOG_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
         <EntityType Name="COLOR_CATALOGS_ITEMS">
@@ -159,7 +163,6 @@
           <Property Name="COLOR_CATALOGS_GROUP_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="CODE" Type="int" Nullable="false" />
           <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" />
-          <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" />
           <Property Name="CYAN" Type="float" Nullable="false" />
           <Property Name="MAGENTA" Type="float" Nullable="false" />
           <Property Name="YELLOW" Type="float" Nullable="false" />
@@ -185,12 +188,6 @@
           <Property Name="MAGENTA" Type="float" Nullable="false" />
           <Property Name="YELLOW" Type="float" Nullable="false" />
           <Property Name="BLACK" Type="float" Nullable="false" />
-          <Property Name="RED" Type="int" Nullable="false" />
-          <Property Name="GREEN" Type="int" Nullable="false" />
-          <Property Name="BLUE" Type="int" Nullable="false" />
-          <Property Name="L" Type="float" Nullable="false" />
-          <Property Name="A" Type="float" Nullable="false" />
-          <Property Name="B" Type="float" Nullable="false" />
           <Property Name="PROCESS_PARAMETERS_TABLE_INDEX" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="COLOR_SPACES">
@@ -3070,7 +3067,12 @@
           <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="COMPANY" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="DESCRIPTION" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="DESIGN_TYPE" Type="Int32" Nullable="false" />
+          <Property Name="LOGO" Type="Binary" MaxLength="Max" FixedLength="false" />
+          <Property Name="IMAGE" Type="Binary" MaxLength="Max" FixedLength="false" />
           <NavigationProperty Name="COLOR_CATALOGS_GROUPS" Relationship="RemoteModel.FK_COLOR_CATALOGS_GROUPS_COLOR_CATALOGS" FromRole="COLOR_CATALOGS" ToRole="COLOR_CATALOGS_GROUPS" />
         </EntityType>
         <EntityType Name="COLOR_CATALOGS_GROUPS">
@@ -3081,7 +3083,6 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
-          <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
           <Property Name="COLOR_CATALOG_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="COLOR_CATALOGS" Relationship="RemoteModel.FK_COLOR_CATALOGS_GROUPS_COLOR_CATALOGS" FromRole="COLOR_CATALOGS_GROUPS" ToRole="COLOR_CATALOGS" />
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_COLOR_CATALOGS_GROUPS" FromRole="COLOR_CATALOGS_GROUPS" ToRole="COLOR_CATALOGS_ITEMS" />
@@ -3096,7 +3097,6 @@
           <Property Name="COLOR_CATALOGS_GROUP_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="CODE" Type="Int32" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
-          <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
           <Property Name="CYAN" Type="Double" Nullable="false" />
           <Property Name="MAGENTA" Type="Double" Nullable="false" />
           <Property Name="YELLOW" Type="Double" Nullable="false" />
@@ -3125,12 +3125,6 @@
           <Property Name="MAGENTA" Type="Double" Nullable="false" />
           <Property Name="YELLOW" Type="Double" Nullable="false" />
           <Property Name="BLACK" Type="Double" Nullable="false" />
-          <Property Name="RED" Type="Int32" Nullable="false" />
-          <Property Name="GREEN" Type="Int32" Nullable="false" />
-          <Property Name="BLUE" Type="Int32" Nullable="false" />
-          <Property Name="L" Type="Double" Nullable="false" />
-          <Property Name="A" Type="Double" Nullable="false" />
-          <Property Name="B" Type="Double" Nullable="false" />
           <Property Name="PROCESS_PARAMETERS_TABLE_INDEX" Type="Int32" Nullable="false" />
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_COLOR_CATALOGS_ITEMS" FromRole="COLOR_CATALOGS_ITEMS_RECIPES" ToRole="COLOR_CATALOGS_ITEMS" />
           <NavigationProperty Name="RML" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_RMLS" FromRole="COLOR_CATALOGS_ITEMS_RECIPES" ToRole="RML" />
@@ -5345,7 +5339,12 @@
           <EntitySetMapping Name="COLOR_CATALOGS">
             <EntityTypeMapping TypeName="RemoteModel.COLOR_CATALOGS">
               <MappingFragment StoreEntitySet="COLOR_CATALOGS">
+                <ScalarProperty Name="IMAGE" ColumnName="IMAGE" />
+                <ScalarProperty Name="LOGO" ColumnName="LOGO" />
+                <ScalarProperty Name="DESIGN_TYPE" ColumnName="DESIGN_TYPE" />
+                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="COMPANY" ColumnName="COMPANY" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
                 <ScalarProperty Name="ID" ColumnName="ID" />
@@ -5356,7 +5355,6 @@
             <EntityTypeMapping TypeName="RemoteModel.COLOR_CATALOGS_GROUPS">
               <MappingFragment StoreEntitySet="COLOR_CATALOGS_GROUPS">
                 <ScalarProperty Name="COLOR_CATALOG_GUID" ColumnName="COLOR_CATALOG_GUID" />
-                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -5378,7 +5376,6 @@
                 <ScalarProperty Name="YELLOW" ColumnName="YELLOW" />
                 <ScalarProperty Name="MAGENTA" ColumnName="MAGENTA" />
                 <ScalarProperty Name="CYAN" ColumnName="CYAN" />
-                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <ScalarProperty Name="COLOR_CATALOGS_GROUP_GUID" ColumnName="COLOR_CATALOGS_GROUP_GUID" />
@@ -5392,12 +5389,6 @@
             <EntityTypeMapping TypeName="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES">
               <MappingFragment StoreEntitySet="COLOR_CATALOGS_ITEMS_RECIPES">
                 <ScalarProperty Name="PROCESS_PARAMETERS_TABLE_INDEX" ColumnName="PROCESS_PARAMETERS_TABLE_INDEX" />
-                <ScalarProperty Name="B" ColumnName="B" />
-                <ScalarProperty Name="A" ColumnName="A" />
-                <ScalarProperty Name="L" ColumnName="L" />
-                <ScalarProperty Name="BLUE" ColumnName="BLUE" />
-                <ScalarProperty Name="GREEN" ColumnName="GREEN" />
-                <ScalarProperty Name="RED" ColumnName="RED" />
                 <ScalarProperty Name="BLACK" ColumnName="BLACK" />
                 <ScalarProperty Name="YELLOW" ColumnName="YELLOW" />
                 <ScalarProperty Name="MAGENTA" ColumnName="MAGENTA" />
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 8c28d9441..aea8eff7d 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="3.75" PointY="38.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="3.75" PointY="76.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="63.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="3.75" PointY="66.125" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15" PointY="23" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="83" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="23.75" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="52.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="8.25" PointY="39.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="10.5" PointY="38.875" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="12.75" PointY="37.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="28.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6" PointY="15.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6" PointY="68.875" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3.75" PointY="34.25" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="8.25" PointY="34.375" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3.75" PointY="42.875" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6" PointY="42.25" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="69.125" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="13.25" PointY="16.25" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="24.25" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="18.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="6.75" PointY="65.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="9" PointY="68.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="90.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="9" PointY="76.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="3.75" PointY="79.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6" PointY="73.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="9.75" PointY="84.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="12" PointY="78.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="9.75" PointY="80.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="12" PointY="70.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="64.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12" PointY="66.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="72" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="6.75" PointY="86.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9" PointY="72.375" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6" PointY="79.625" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="42.625" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="12.75" PointY="22.125" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="10.5" PointY="20.625" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="21.375" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="16.625" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="20" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="10.5" PointY="16.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6" PointY="12.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="8.25" PointY="21.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="15.5" PointY="18.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="33.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="30.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="27.25" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="46.625" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6" PointY="36.375" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="11.25" PointY="5" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="56.25" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="57.875" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="21" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="11.25" PointY="8.875" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.5" PointY="9" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="12.75" PointY="25.75" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="8.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="17.5" PointY="23.75" />
+        <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="10.5" PointY="12.25" />
+        <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="0.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="2.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="4.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="6.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="15" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="13.5" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="8.25" PointY="31.25" />
+        <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" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" />
-- 
cgit v1.3.1


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.

---
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 53673984 -> 53673984 bytes
 .../ViewModels/MainViewVM.cs                       |   2 +-
 .../Views/MainView.xaml                            |   2 +-
 .../Views/MachineJobSelectionView.xaml             |   6 ----
 .../ViewModels/MainViewVM.cs                       |   3 ++
 .../Tango.MachineStudio.RML/Images/data-table.png  | Bin 0 -> 1238 bytes
 .../Tango.MachineStudio.RML.csproj                 |   3 ++
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     |  37 +++++++++++++++++++++
 .../Tango.BL/Entities/Configuration.cs             |   2 +-
 10 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/data-table.png

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index 1fcb444d4..de93111bb 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index 3aef11f9e..3d7256880 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
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 c33ef1f86..a106ea184 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
@@ -628,7 +628,7 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
 
         #region RML
 
-        private async void InvalidateLiquidFactorsCalibrationData()
+        public async void InvalidateLiquidFactorsCalibrationData()
         {
             if (SelectedRML != null && SelectedMachine != null)
             {
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 fe4edcb8b..d78424d4e 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
@@ -141,7 +141,7 @@
                 <Grid>
                     <Grid Margin="10 10 10 0" Height="135" Visibility="{Binding IsHosted,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                         <StackPanel HorizontalAlignment="Left" Margin="20 0 0 0">
-                            <TextBlock Margin="0 0 0 0" FontSize="20" TextAlignment="Left">COLOR ADJUSTMENT DATA</TextBlock>
+                            <TextBlock Margin="0 0 0 0" FontSize="20" TextAlignment="Left">COLOR CONVERSION TABLE (CCT)</TextBlock>
                             <Grid>
                                 <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
                                     <materialDesign:PackIcon Kind="ArrowLeftBoldHexagonOutline" VerticalAlignment="Center" Width="40" Height="40" />
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 ab97d7858..0ba2e39d4 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
@@ -55,12 +55,6 @@
                         </autoComplete:AutoCompleteTextBox>
                     </DockPanel>
                     <designer:MachineView Width="600" IsHitTestVisible="False" Margin="0 40 0 0" DataContext="{Binding SelectedMachine}" />
-                    <Button Command="{Binding EditMachineCommand}" HorizontalAlignment="Right" Margin="0 10 20 20" Style="{StaticResource MaterialDesignFlatButton}">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon VerticalAlignment="Center" Kind="Pencil"></materialDesign:PackIcon>
-                            <TextBlock Margin="10 0 0 0">EDIT</TextBlock>
-                        </StackPanel>
-                    </Button>
                 </StackPanel>
             </Grid>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 15033e295..935cfe5ee 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -239,6 +239,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         public void DropIdsPack(IdsPack idsPack1, IdsPack idsPack2)
         {
             ActiveMachine.Configuration.IdsPacks.Swap(idsPack1, idsPack2);
+            ColorLabVM.InvalidateLiquidFactorsCalibrationData();
         }
 
         /// <summary>
@@ -333,6 +334,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         {
             idsPack.LiquidType = liquidType;
             idsPack.LiquidTypeGuid = liquidType.Guid;
+            ColorLabVM.InvalidateLiquidFactorsCalibrationData();
         }
 
         /// <summary>
@@ -358,6 +360,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         {
             ActiveMachineAdapter.Context.IdsPacks.Remove(SelectedIds);
             SelectedIds = null;
+            ColorLabVM.InvalidateLiquidFactorsCalibrationData();
         }
 
         /// <summary>
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" />
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs b/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs
index 0ff26d450..c6b823385 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Configuration.cs
@@ -36,7 +36,7 @@ namespace Tango.BL.Entities
                 throw new NullReferenceException("The specified RML cannot be null.");
             }
 
-            return NoneEmptyIdsPacks.Where(x => rml.LiquidTypesRmls.ToList().Exists(y => y.LiquidType.Guid == x.LiquidType.Guid)).OrderBy(x => x.PackIndex).ToList();
+            return NoneEmptyIdsPacks.Where(x => rml.LiquidTypesRmls.ToList().Exists(y => x.LiquidType != null && y.LiquidType.Guid == x.LiquidType.Guid)).OrderBy(x => x.PackIndex).ToList();
         }
 
         /// <summary>
-- 
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')

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 3987f9cab0cb3d0d15d0ba784db14be4472f45ca Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 23 Jul 2019 11:33:41 +0300
Subject: Implemented color catalogs module.

---
 .../Tango.MachineStudio.Catalogs/CatalogsModule.cs |   2 +-
 .../ObservableCollectionToViewSourceConverter.cs   |  49 ++++
 .../Excel/ColorGroup.cs                            |  16 ++
 .../Excel/ColorItem.cs                             |  29 +++
 .../Excel/ColorRecipe.cs                           |  21 ++
 .../Tango.MachineStudio.Catalogs/Excel/Media.cs    |  13 +
 .../Tango.MachineStudio.Catalogs.csproj            |  10 +
 .../Templates/ExportTemplate - BACKUP.xlsx         | Bin 0 -> 20347 bytes
 .../Templates/ExportTemplate - bad.xlsx            | Bin 0 -> 20904 bytes
 .../Templates/ExportTemplate.xlsx                  | Bin 0 -> 21324 bytes
 .../ViewModels/MainViewVM.cs                       | 281 +++++++++++++++++++++
 .../Views/CatalogView.xaml                         | 104 ++++----
 .../Views/CatalogView.xaml.cs                      |  27 ++
 .../Tango.BL/Builders/ColorCatalogBuilder.cs       |  21 +-
 .../Tango.BL/DTO/ColorCatalogsGroupDTOBase.cs      |   8 +
 .../Tango.BL/DTO/ColorCatalogsItemDTOBase.cs       |   8 +
 .../Tango.BL/Entities/ColorCatalogsGroup.cs        |  12 +
 .../Tango.BL/Entities/ColorCatalogsGroupBase.cs    |  38 +++
 .../Tango.BL/Entities/ColorCatalogsItem.cs         |  12 +
 .../Tango.BL/Entities/ColorCatalogsItemBase.cs     |  38 +++
 .../Tango.BL/Entities/ColorCatalogsItemsRecipe.cs  |   5 +
 .../Tango.BL/Enumerations/Permissions.cs           |   6 +
 .../ObservableCollectionExtensions.cs              |   1 +
 .../Tango.DAL.Remote/DB/COLOR_CATALOGS_GROUPS.cs   |   1 +
 .../Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs    |   1 +
 .../Tango.DAL.Remote/DB/RemoteADO.edmx             |   6 +
 .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram     | 146 +++++------
 .../Visual_Studio/Tango.Documents/ExcelReader.cs   |   6 +-
 .../Visual_Studio/Tango.Documents/ExcelWriter.cs   |  94 ++++++-
 29 files changed, 820 insertions(+), 135 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Converters/ObservableCollectionToViewSourceConverter.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorGroup.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorRecipe.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/Media.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate - BACKUP.xlsx
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate - bad.xlsx
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/CatalogsModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/CatalogsModule.cs
index 5c17bf32e..389a2cb5d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/CatalogsModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/CatalogsModule.cs
@@ -51,7 +51,7 @@ namespace Tango.MachineStudio.Catalogs
         {
             get
             {
-                return Permissions.RunColorCaptureModule;
+                return Permissions.RunCatalogsModule;
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Converters/ObservableCollectionToViewSourceConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Converters/ObservableCollectionToViewSourceConverter.cs
new file mode 100644
index 000000000..050539741
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Converters/ObservableCollectionToViewSourceConverter.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Tango.MachineStudio.Catalogs.Converters
+{
+    public class ObservableCollectionToViewSourceConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            String sortMember = parameter != null ? parameter.ToString() : null;
+            IList list = value as IList;
+            if (list != null)
+            {
+                var view = CollectionViewSource.GetDefaultView(list);
+                view.SortDescriptions.Clear();
+
+                //Delay because the DataGrid clears the sort description after source change.
+                Task.Factory.StartNew(() =>
+                {
+                    Thread.Sleep(10);
+
+                    Application.Current.Dispatcher.BeginInvoke(new Action(() =>
+                    {
+                        view.SortDescriptions.Add(new SortDescription(sortMember, ListSortDirection.Ascending));
+                        view.Refresh();
+                    }));
+                });
+                return view;
+            }
+
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorGroup.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorGroup.cs
new file mode 100644
index 000000000..852311883
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorGroup.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+
+namespace Tango.MachineStudio.Catalogs.Excel
+{
+    public class ColorGroup
+    {
+        public Color GroupColor { get; set; }
+        public String GroupName { get; set; }
+        public int GroupIndex { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs
new file mode 100644
index 000000000..9d5011325
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+
+namespace Tango.MachineStudio.Catalogs.Excel
+{
+    public class ColorItem
+    {
+        public Color ItemColor { get; set; }
+        public String Group { get; set; }
+        public int Code { get; set; }
+        public String Name { get; set; }
+        public int ItemIndex { get; set; }
+        public int Red { get; set; }
+        public int Green { get; set; }
+        public int Blue { get; set; }
+        public double L { get; set; }
+        public double A { get; set; }
+        public double B { get; set; }
+        public double Cyan { get; set; }
+        public double Magenta { get; set; }
+        public double Yellow { get; set; }
+        public double Black { get; set; }
+        public int Region { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorRecipe.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorRecipe.cs
new file mode 100644
index 000000000..724652cd4
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorRecipe.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+
+namespace Tango.MachineStudio.Catalogs.Excel
+{
+    public class ColorRecipe
+    {
+        public Color R_Color { get; set; }
+        public String R_Name { get; set; }
+        public String R_Media { get; set; }
+        public double R_Cyan { get; set; }
+        public double R_Magenta { get; set; }
+        public double R_Yellow { get; set; }
+        public double R_Black { get; set; }
+        public int R_Region { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/Media.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/Media.cs
new file mode 100644
index 000000000..d65b1a986
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/Media.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.MachineStudio.Catalogs.Excel
+{
+    public class Media
+    {
+        public String MediaName { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Tango.MachineStudio.Catalogs.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Tango.MachineStudio.Catalogs.csproj
index e90e00b41..5473c28bc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Tango.MachineStudio.Catalogs.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Tango.MachineStudio.Catalogs.csproj
@@ -68,6 +68,11 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Contracts\IMainView.cs" />
+    <Compile Include="Converters\ObservableCollectionToViewSourceConverter.cs" />
+    <Compile Include="Excel\ColorGroup.cs" />
+    <Compile Include="Excel\ColorItem.cs" />
+    <Compile Include="Excel\ColorRecipe.cs" />
+    <Compile Include="Excel\Media.cs" />
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="Views\CatalogView.xaml.cs">
@@ -120,6 +125,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <EmbeddedResource Include="Templates\ExportTemplate.xlsx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
@@ -134,6 +140,10 @@
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Documents\Tango.Documents.csproj">
+      <Project>{ca87a608-7b17-4c98-88f2-42abee10f4c1}</Project>
+      <Name>Tango.Documents</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.Logging\Tango.Logging.csproj">
       <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project>
       <Name>Tango.Logging</Name>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate - BACKUP.xlsx b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate - BACKUP.xlsx
new file mode 100644
index 000000000..44abd31db
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate - BACKUP.xlsx differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate - bad.xlsx b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate - bad.xlsx
new file mode 100644
index 000000000..d95727038
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate - bad.xlsx differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx
new file mode 100644
index 000000000..e57422725
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
index a10e944f9..6494b9d2c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
@@ -12,6 +12,11 @@ using Tango.MachineStudio.Catalogs.Contracts;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.Core.Commands;
 using Tango.BL.Builders;
+using Tango.Documents;
+using Microsoft.Win32;
+using Tango.Core.Helpers;
+using System.IO;
+using Tango.MachineStudio.Catalogs.Excel;
 
 namespace Tango.MachineStudio.Catalogs.ViewModels
 {
@@ -112,6 +117,16 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
         /// </summary>
         public RelayCommand SaveActiveCatalogCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the export excel command.
+        /// </summary>
+        public RelayCommand ExportExcelCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the import excel command.
+        /// </summary>
+        public RelayCommand ImportExcelCommand { get; set; }
+
         #endregion
 
         #region Constructors
@@ -129,6 +144,8 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
             DeleteCatalogCommand = new RelayCommand(DeleteSelectedCatalog, () => SelectedCatalog != null);
             BackToCatalogsCommand = new RelayCommand(BackToCatalogs);
             SaveActiveCatalogCommand = new RelayCommand(SaveActiveCatalog);
+            ExportExcelCommand = new RelayCommand(ExportCatalogToExcel);
+            ImportExcelCommand = new RelayCommand(ImportCatalogFromExcel);
         }
 
         /// <summary>
@@ -256,6 +273,21 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
             }
         }
 
+        public void OnGroupDeleted(ColorCatalogsGroup group)
+        {
+            group.Delete(_activeCatalogContext);
+        }
+
+        public void OnItemDeleted(ColorCatalogsItem item)
+        {
+            item.Delete(_activeCatalogContext);
+        }
+
+        public void OnRecipeDeleted(ColorCatalogsItemsRecipe recipe)
+        {
+            recipe.Delete(_activeCatalogContext);
+        }
+
         private async void SaveActiveCatalog()
         {
             if (ActiveCatalog != null)
@@ -289,6 +321,255 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
 
         #endregion
 
+        #region Export / Import Excel
+
+        public void ExportCatalogToExcel()
+        {
+            SaveFileDialog dlg = new SaveFileDialog();
+            dlg.Filter = "Excel Documents|*.xlsx";
+            if (dlg.ShowDialog().Value)
+            {
+                using (_notification.PushTaskItem("Exporting catalog to file..."))
+                {
+                    Task.Factory.StartNew(() =>
+                    {
+                        try
+                        {
+                            IsFree = false;
+
+                            Stream stream = null;
+                            bool dispose = false;
+                            String file = AssemblyHelper.GetCurrentAssemblyFolder() + "\\Templates\\ExportTemplate.xlsx";
+
+                            if (File.Exists(file))
+                            {
+                                stream = File.OpenRead(file);
+                                dispose = true;
+                            }
+                            else
+                            {
+                                stream = EmbeddedResourceHelper.GetEmbeddedResourceStream("Tango.MachineStudio.Catalogs.Templates.ExportTemplate.xlsx");
+                            }
+
+                            byte[] data = new byte[stream.Length];
+                            stream.Read(data, 0, data.Length);
+                            File.WriteAllBytes(dlg.FileName, data);
+
+                            if (dispose)
+                            {
+                                stream.Dispose();
+                            }
+
+                            ExcelWriter writer = new ExcelWriter(dlg.FileName);
+
+                            List<Media> medias = RMLS.Select(x => new Media()
+                            {
+                                MediaName = x.Name,
+                            }).ToList();
+
+                            writer.WriteData(medias, "RML");
+
+                            List<ColorGroup> groups = ActiveCatalog.ColorCatalogsGroups.Select(x => new ColorGroup()
+                            {
+                                GroupColor = x.Color,
+                                GroupName = x.Name,
+                                GroupIndex = x.GroupIndex,
+                            }).ToList();
+
+                            writer.WriteData(groups, "Groups");
+
+                            List<ColorItem> items = ActiveCatalog.ColorCatalogsGroups.SelectMany(x => x.ColorCatalogsItems).Select(x => new ColorItem()
+                            {
+
+                                ItemColor = x.Color,
+                                Group = x.ColorCatalogsGroup.Name,
+                                Code = x.Code,
+                                Name = x.Name,
+                                ItemIndex = x.ItemIndex,
+                                Red = x.Red,
+                                Green = x.Green,
+                                Blue = x.Blue,
+                                L = x.L,
+                                A = x.A,
+                                B = x.B,
+                                Cyan = x.Cyan,
+                                Magenta = x.Magenta,
+                                Yellow = x.Yellow,
+                                Black = x.Black,
+                                Region = x.ProcessParametersTableIndex,
+
+                            }).ToList();
+
+                            writer.WriteData(items, "Colors");
+
+                            List<ColorRecipe> recipes = ActiveCatalog.ColorCatalogsGroups.SelectMany(x => x.ColorCatalogsItems).SelectMany(x => x.ColorCatalogsItemsRecipes).Select(x => new ColorRecipe()
+                            {
+
+                                R_Color = x.ColorCatalogsItem.Color,
+                                R_Name = x.ColorCatalogsItem.Name,
+                                R_Media = x.Rml.Name,
+                                R_Cyan = x.Cyan,
+                                R_Magenta = x.Magenta,
+                                R_Yellow = x.Yellow,
+                                R_Black = x.Black,
+                                R_Region = x.ProcessParametersTableIndex,
+
+
+                            }).ToList();
+
+                            writer.WriteData(recipes, "Recipes");
+
+                            writer.Dispose();
+
+                            InvokeUI(() =>
+                            {
+                                _notification.ShowInfo("Catalog exported successfully.");
+                            });
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, $"Error exporting color catalog to {dlg.FileName}");
+
+                            InvokeUI(() =>
+                            {
+                                _notification.ShowError($"An error occurred while trying to export the catalog. Make sure the selected excel file is closed and data is valid.\n{ex.FlattenMessage()}");
+                            });
+                        }
+                        finally
+                        {
+                            IsFree = true;
+                        }
+                    });
+                }
+            }
+        }
+
+        public void ImportCatalogFromExcel()
+        {
+            OpenFileDialog dlg = new OpenFileDialog();
+            dlg.Filter = "Excel Documents|*.xlsx";
+            if (dlg.ShowDialog().Value)
+            {
+                using (_notification.PushTaskItem("Merging catalog from file..."))
+                {
+                    Task.Factory.StartNew(() =>
+                    {
+                        try
+                        {
+                            ExcelReader reader = new ExcelReader(dlg.FileName);
+                            var groups = reader.GetData<ColorGroup>("Groups");
+                            reader.Dispose();
+
+                            reader = new ExcelReader(dlg.FileName);
+                            var colors = reader.GetData<ColorItem>("Colors");
+                            reader.Dispose();
+
+                            reader = new ExcelReader(dlg.FileName);
+                            var recipes = reader.GetData<ColorRecipe>("Recipes");
+                            reader.Dispose();
+
+                            foreach (var group in groups.Where(x => !ActiveCatalog.ColorCatalogsGroups.ToList().Exists(y => y.Name == x.GroupName)))
+                            {
+                                ColorCatalogsGroup newGroup = new ColorCatalogsGroup();
+                                newGroup.Name = group.GroupName;
+                                newGroup.GroupIndex = group.GroupIndex;
+                                ActiveCatalog.ColorCatalogsGroups.Add(newGroup);
+                            }
+
+                            foreach (var item in colors)
+                            {
+                                var existinItem = ActiveCatalog.ColorCatalogsGroups.SelectMany(x => x.ColorCatalogsItems).SingleOrDefault(x => x.Code == item.Code);
+                                var group = ActiveCatalog.ColorCatalogsGroups.SingleOrDefault(x => x.Name == item.Group);
+
+                                bool inserting = false;
+
+                                if (existinItem == null)
+                                {
+                                    existinItem = new ColorCatalogsItem();
+                                    inserting = true;
+                                }
+                                else
+                                {
+                                    if (existinItem.ColorCatalogsGroup != group)
+                                    {
+                                        existinItem.ColorCatalogsGroup.ColorCatalogsItems.Remove(existinItem);
+                                        group.ColorCatalogsItems.Add(existinItem);
+                                    }
+                                }
+
+                                existinItem.ColorCatalogsGroup = group;
+                                existinItem.Code = item.Code;
+                                existinItem.Name = item.Name;
+                                existinItem.ItemIndex = item.ItemIndex;
+                                existinItem.Red = item.Red;
+                                existinItem.Green = item.Green;
+                                existinItem.Blue = item.Blue;
+                                existinItem.L = item.L;
+                                existinItem.A = item.A;
+                                existinItem.B = item.B;
+                                existinItem.Cyan = item.Cyan;
+                                existinItem.Magenta = item.Magenta;
+                                existinItem.Yellow = item.Yellow;
+                                existinItem.Black = item.Black;
+                                existinItem.ProcessParametersTableIndex = item.Region;
+
+                                if (inserting)
+                                {
+                                    _activeCatalogContext.ColorCatalogsItems.Add(existinItem);
+                                }
+                            }
+
+                            foreach (var recipe in recipes)
+                            {
+                                var existingRecipe = ActiveCatalog.ColorCatalogsGroups.SelectMany(x => x.ColorCatalogsItems).SelectMany(x => x.ColorCatalogsItemsRecipes).SingleOrDefault(x => x.ColorCatalogsItem.Name == recipe.R_Name && x.Rml.Name == recipe.R_Media);
+
+                                bool inserting = false;
+
+                                if (existingRecipe == null)
+                                {
+                                    existingRecipe = new ColorCatalogsItemsRecipe();
+                                    existingRecipe.Rml = RMLS.SingleOrDefault(x => x.Name == recipe.R_Media);
+                                    existingRecipe.ColorCatalogsItem = ActiveCatalog.ColorCatalogsGroups.SelectMany(x => x.ColorCatalogsItems).SingleOrDefault(x => x.Name == recipe.R_Name);
+                                    inserting = true;
+                                }
+
+                                existingRecipe.Cyan = recipe.R_Cyan;
+                                existingRecipe.Magenta = recipe.R_Magenta;
+                                existingRecipe.Yellow = recipe.R_Yellow;
+                                existingRecipe.Black = recipe.R_Black;
+                                existingRecipe.ProcessParametersTableIndex = recipe.R_Region;
+
+                                if (inserting)
+                                {
+                                    _activeCatalogContext.ColorCatalogsItemsRecipes.Add(existingRecipe);
+                                }
+                            }
+
+                            InvokeUI(() =>
+                            {
+                                _notification.ShowInfo("Catalog imported successfully.");
+                            });
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, $"Error importing color catalog to {dlg.FileName}");
+
+                            InvokeUI(() =>
+                            {
+                                _notification.ShowError($"An error occurred while trying to merge the catalog. Please check your data.\n{ex.FlattenMessage()}");
+                            });
+                        }
+                        finally
+                        {
+                            IsFree = true;
+                        }
+                    });
+                }
+            }
+        }
+
+        #endregion
+
         #region Application Ready
 
         public async override void OnApplicationReady()
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml
index 8dc6b5d02..9f3dd701a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:vm="clr-namespace:Tango.MachineStudio.Catalogs.ViewModels"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:localConverters="clr-namespace:Tango.MachineStudio.Catalogs.Converters"
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
@@ -16,6 +17,7 @@
 
     <UserControl.Resources>
         <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
+        <localConverters:ObservableCollectionToViewSourceConverter x:Key="ObservableCollectionToViewSourceConverter" />
 
         <Style x:Key="EditableGrid" TargetType="DataGrid" BasedOn="{StaticResource {x:Type DataGrid}}">
             <Setter Property="AutoGenerateColumns" Value="False"></Setter>
@@ -54,12 +56,26 @@
                     <TextBlock Text="{Binding ActiveCatalog.Name}" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="34"></TextBlock>
                 </StackPanel>
 
-                <Button HorizontalAlignment="Right" Width="170" Height="45" VerticalAlignment="Center" Command="{Binding SaveActiveCatalogCommand}">
-                    <StackPanel Orientation="Horizontal">
-                        <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
-                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
-                    </StackPanel>
-                </Button>
+                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                    <Button Background="#65C682" BorderBrush="#65C682" Width="170" Height="45" VerticalAlignment="Center" Command="{Binding ImportExcelCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Import" Width="24" Height="24" />
+                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">IMPORT EXCEL</TextBlock>
+                        </StackPanel>
+                    </Button>
+                    <Button Margin="10 0 0 0" Background="#65C682" BorderBrush="#65C682" Width="170" Height="45" VerticalAlignment="Center" Command="{Binding ExportExcelCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Export" Width="24" Height="24" />
+                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">EXPORT EXCEL</TextBlock>
+                        </StackPanel>
+                    </Button>
+                    <Button Margin="10 0 0 0" Width="170" Height="45" VerticalAlignment="Center" Command="{Binding SaveActiveCatalogCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
+                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
             </Grid>
 
             <Grid Margin="0 20">
@@ -122,12 +138,12 @@
                             <ColumnDefinition Width="1*"/>
                         </Grid.ColumnDefinitions>
 
-                        
-                            <DockPanel Margin="10">
+
+                        <DockPanel Margin="10">
                             <TextBlock DockPanel.Dock="Top" FontSize="16">CATALOG GROUPS</TextBlock>
 
                             <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
-                                <DataGrid Style="{StaticResource EditableGrid}" CellStyle="{StaticResource EditableCell}" ItemsSource="{Binding ActiveCatalog.ColorCatalogsGroups}" SelectedItem="{Binding SelectedGroup}">
+                                <DataGrid x:Name="gridGroups" Style="{StaticResource EditableGrid}" CellStyle="{StaticResource EditableCell}" ItemsSource="{Binding ActiveCatalog.ColorCatalogsGroups}" SelectedItem="{Binding SelectedGroup}" CanUserDeleteRows="False" PreviewKeyDown="OnGroupsGrid_PreviewKeyDown">
                                     <DataGrid.Columns>
                                         <DataGridTemplateColumn Header="" Width="Auto">
                                             <DataGridTemplateColumn.CellTemplate>
@@ -140,7 +156,8 @@
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
-                                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="1*" />
+                                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="150" />
+                                        <DataGridTextColumn Header="IDX" Binding="{Binding GroupIndex}" Width="1*" SortMemberPath="GroupIndex" SortDirection="Ascending" />
                                     </DataGrid.Columns>
                                 </DataGrid>
                             </materialDesign:Card>
@@ -153,38 +170,39 @@
                                 <Run>(</Run><Run Text="{Binding SelectedGroup.ColorCatalogsItems.Count,Mode=OneWay}"></Run><Run>)</Run>
                             </TextBlock>
                             <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
-                            <DataGrid Style="{StaticResource EditableGrid}" CellStyle="{StaticResource EditableCell}" ItemsSource="{Binding SelectedGroup.ColorCatalogsItems}" SelectedItem="{Binding SelectedItem}">
-                                <DataGrid.Columns>
-                                    <DataGridTemplateColumn Header="" Width="Auto">
-                                        <DataGridTemplateColumn.CellTemplate>
-                                            <DataTemplate>
-                                                <Ellipse Width="25" Height="25">
-                                                    <Ellipse.Fill>
-                                                        <SolidColorBrush Color="{Binding Color}" />
-                                                    </Ellipse.Fill>
-                                                </Ellipse>
-                                            </DataTemplate>
-                                        </DataGridTemplateColumn.CellTemplate>
-                                    </DataGridTemplateColumn>
-                                    <DataGridTextColumn Header="CODE" Binding="{Binding Code}" Width="Auto" />
-                                    <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
-
-                                    <DataGridTextColumn Header="R" Binding="{Binding Red,UpdateSourceTrigger=PropertyChanged}" Width="Auto" />
-                                    <DataGridTextColumn Header="G" Binding="{Binding Green,UpdateSourceTrigger=PropertyChanged}" Width="Auto" />
-                                    <DataGridTextColumn Header="B" Binding="{Binding Blue,UpdateSourceTrigger=PropertyChanged}" Width="Auto" />
-
-                                    <DataGridTextColumn Header="L" Binding="{Binding L}" Width="65" />
-                                    <DataGridTextColumn Header="A" Binding="{Binding A}" Width="65" />
-                                    <DataGridTextColumn Header="B" Binding="{Binding B}" Width="65" />
-
-                                    <DataGridTextColumn Header="CYAN" Binding="{Binding Cyan}" Width="65" />
-                                    <DataGridTextColumn Header="MAGENTA" Binding="{Binding Magenta}" Width="80" />
-                                    <DataGridTextColumn Header="YELLOW" Binding="{Binding Yellow}" Width="70" />
-                                    <DataGridTextColumn Header="BLACK" Binding="{Binding Black}" Width="65" />
-
-                                    <DataGridTextColumn Header="REGION" Binding="{Binding ProcessParametersTableIndex}" Width="Auto" />
-                                </DataGrid.Columns>
-                            </DataGrid>
+                                <DataGrid x:Name="gridItems" Style="{StaticResource EditableGrid}" CellStyle="{StaticResource EditableCell}" ItemsSource="{Binding SelectedGroup.ColorCatalogsItems,Converter={StaticResource ObservableCollectionToViewSourceConverter},ConverterParameter='ItemIndex'}" SelectedItem="{Binding SelectedItem}" PreviewKeyDown="OnItemsGrid_PreviewKeyDown">
+                                    <DataGrid.Columns>
+                                        <DataGridTemplateColumn Header="" Width="Auto">
+                                            <DataGridTemplateColumn.CellTemplate>
+                                                <DataTemplate>
+                                                    <Ellipse Width="25" Height="25">
+                                                        <Ellipse.Fill>
+                                                            <SolidColorBrush Color="{Binding Color}" />
+                                                        </Ellipse.Fill>
+                                                    </Ellipse>
+                                                </DataTemplate>
+                                            </DataGridTemplateColumn.CellTemplate>
+                                        </DataGridTemplateColumn>
+                                        <DataGridTextColumn Header="CODE" Binding="{Binding Code}" Width="Auto" />
+                                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
+                                        <DataGridTextColumn Header="IDX" Binding="{Binding ItemIndex}" Width="Auto" />
+
+                                        <DataGridTextColumn Header="R" Binding="{Binding Red,UpdateSourceTrigger=PropertyChanged}" Width="Auto" />
+                                        <DataGridTextColumn Header="G" Binding="{Binding Green,UpdateSourceTrigger=PropertyChanged}" Width="Auto" />
+                                        <DataGridTextColumn Header="B" Binding="{Binding Blue,UpdateSourceTrigger=PropertyChanged}" Width="Auto" />
+
+                                        <DataGridTextColumn Header="L" Binding="{Binding L}" Width="65" />
+                                        <DataGridTextColumn Header="A" Binding="{Binding A}" Width="65" />
+                                        <DataGridTextColumn Header="B" Binding="{Binding B}" Width="65" />
+
+                                        <DataGridTextColumn Header="CYAN" Binding="{Binding Cyan}" Width="65" />
+                                        <DataGridTextColumn Header="MAGENTA" Binding="{Binding Magenta}" Width="80" />
+                                        <DataGridTextColumn Header="YELLOW" Binding="{Binding Yellow}" Width="70" />
+                                        <DataGridTextColumn Header="BLACK" Binding="{Binding Black}" Width="65" />
+
+                                        <DataGridTextColumn Header="REGION" Binding="{Binding ProcessParametersTableIndex}" Width="Auto" />
+                                    </DataGrid.Columns>
+                                </DataGrid>
                             </materialDesign:Card>
                         </DockPanel>
 
@@ -194,7 +212,7 @@
                                 <Run>(</Run><Run Text="{Binding SelectedItem.ColorCatalogsItemsRecipes.Count,Mode=OneWay}"></Run><Run>)</Run>
                             </TextBlock>
                             <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
-                                <DataGrid Style="{StaticResource EditableGrid}" CellStyle="{StaticResource EditableCell}" ItemsSource="{Binding SelectedItem.ColorCatalogsItemsRecipes}">
+                                <DataGrid x:Name="gridRecipes" Style="{StaticResource EditableGrid}" CellStyle="{StaticResource EditableCell}" ItemsSource="{Binding SelectedItem.ColorCatalogsItemsRecipes}" PreviewKeyDown="OnRecipesGrid_PreviewKeyDown" CanUserSortColumns="False">
                                     <DataGrid.Columns>
                                         <materialDesign:MaterialDataGridComboBoxColumn Header="MEDIA" Width="180" SortMemberPath="Name" ItemsSourceBinding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RMLS}" SelectedItemBinding="{Binding Rml}" DisplayMemberPath="Name" />
                                         <DataGridTextColumn Header="CYAN" Binding="{Binding Cyan}" Width="80" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml.cs
index ad44d4c18..4ba37416d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml.cs
@@ -28,5 +28,32 @@ namespace Tango.MachineStudio.Catalogs.Views
             InitializeComponent();
             Loaded += (_, __) => _vm = DataContext as MainViewVM;
         }
+
+        private void OnGroupsGrid_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Delete && gridGroups.SelectedItem != null)
+            {
+                _vm.OnGroupDeleted(gridGroups.SelectedItem as BL.Entities.ColorCatalogsGroup);
+                e.Handled = true;
+            }
+        }
+
+        private void OnItemsGrid_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Delete && gridItems.SelectedItem != null)
+            {
+                _vm.OnItemDeleted(gridItems.SelectedItem as BL.Entities.ColorCatalogsItem);
+                e.Handled = true;
+            }
+        }
+
+        private void OnRecipesGrid_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Delete && gridRecipes.SelectedItem != null)
+            {
+                _vm.OnRecipeDeleted(gridRecipes.SelectedItem as BL.Entities.ColorCatalogsItemsRecipe);
+                e.Handled = true;
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Builders/ColorCatalogBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/ColorCatalogBuilder.cs
index 00903ccef..5ddc84bc5 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/ColorCatalogBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/ColorCatalogBuilder.cs
@@ -25,26 +25,23 @@ namespace Tango.BL.Builders
 
         public virtual ColorCatalogBuilder WithItems()
         {
-            return AddStep(2, () =>
+            return AddQueryStep(2, (query) =>
             {
-                Context.ColorCatalogsItems.Where(x => x.ColorCatalogsGroup.ColorCatalogGuid == Entity.Guid).OrderBy(x => x.Code).ToList();
+                return query.Include(x => x.ColorCatalogsGroups.Select(y => y.ColorCatalogsItems));
             });
         }
 
         public virtual ColorCatalogBuilder WithRecipes(Rml rml = null)
         {
-            return AddStep(3, () =>
+            return AddQueryStep(3, (query) =>
             {
-                foreach (var item in Entity.ColorCatalogsGroups.SelectMany(x => x.ColorCatalogsItems))
+                if (rml != null)
                 {
-                    if (rml != null)
-                    {
-                        Context.ColorCatalogsItemsRecipes.Where(x => x.ColorCatalogsItemGuid == item.Guid && x.RmlGuid == rml.Guid).ToList();
-                    }
-                    else
-                    {
-                        Context.ColorCatalogsItemsRecipes.Where(x => x.ColorCatalogsItemGuid == item.Guid).ToList();
-                    }
+                    return query.Include(x => x.ColorCatalogsGroups.Select(y => y.ColorCatalogsItems.Select(z => z.ColorCatalogsItemsRecipes.Where(r => r.RmlGuid == rml.Guid))));
+                }
+                else
+                {
+                    return query.Include(x => x.ColorCatalogsGroups.Select(y => y.ColorCatalogsItems.Select(z => z.ColorCatalogsItemsRecipes)));
                 }
             });
         }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTOBase.cs
index e3c94a67e..26c35420f 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTOBase.cs
@@ -29,6 +29,14 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// group index
+        /// </summary>
+        public Int32 GroupIndex 
+        {
+            get; set; 
+        }
+
         /// <summary>
         /// color catalog guid
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs
index 37ad4c7c5..4b2609281 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs
@@ -45,6 +45,14 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// item index
+        /// </summary>
+        public Int32 ItemIndex 
+        {
+            get; set; 
+        }
+
         /// <summary>
         /// cyan
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroup.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroup.cs
index 9d7845d17..17f6115d1 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroup.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroup.cs
@@ -30,5 +30,17 @@ namespace Tango.BL.Entities
                 }
             }
         }
+
+        public override void Delete(ObservablesContext context)
+        {
+            base.Delete(context);
+
+            foreach (var item in ColorCatalogsItems.ToList())
+            {
+                item.Delete(context);
+            }
+
+            context.ColorCatalogsGroups.Remove(this);
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs
index b3580769c..0fd915fc2 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs
@@ -27,6 +27,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> NameChanged;
 
+        public event EventHandler<Int32> GroupIndexChanged;
+
         public event EventHandler<ColorCatalog> ColorCatalogChanged;
 
         public event EventHandler<SynchronizedObservableCollection<ColorCatalogsItem>> ColorCatalogsItemsChanged;
@@ -58,6 +60,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Int32 _groupindex;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsgroupbase group index.
+        /// </summary>
+
+        [Column("GROUP_INDEX")]
+
+        public  Int32 GroupIndex
+        {
+            get 
+            {
+                return _groupindex; 
+            }
+
+            set 
+            {
+                if (_groupindex != value)
+                {
+                    _groupindex = value;
+
+                    OnGroupIndexChanged(value);
+
+                }
+            }
+        }
+
         protected String _colorcatalogguid;
 
         /// <summary>
@@ -150,6 +179,15 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(Name));
         }
 
+        /// <summary>
+        /// Called when the GroupIndex has changed.
+        /// </summary>
+        protected virtual void OnGroupIndexChanged(Int32 groupindex)
+        {
+            GroupIndexChanged?.Invoke(this, groupindex);
+            RaisePropertyChanged(nameof(GroupIndex));
+        }
+
         /// <summary>
         /// Called when the ColorCatalog has changed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItem.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItem.cs
index ba60501a3..3911d0189 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItem.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItem.cs
@@ -38,5 +38,17 @@ namespace Tango.BL.Entities
             base.OnBlueChanged(blue);
             RaisePropertyChanged(nameof(Color));
         }
+
+        public override void Delete(ObservablesContext context)
+        {
+            base.Delete(context);
+
+            foreach (var recipe in ColorCatalogsItemsRecipes.ToList())
+            {
+                recipe.Delete(context);
+            }
+
+            context.ColorCatalogsItems.Remove(this);
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs
index d3497fe1a..31bc845d4 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs
@@ -29,6 +29,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> NameChanged;
 
+        public event EventHandler<Int32> ItemIndexChanged;
+
         public event EventHandler<Double> CyanChanged;
 
         public event EventHandler<Double> MagentaChanged;
@@ -137,6 +139,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Int32 _itemindex;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase item index.
+        /// </summary>
+
+        [Column("ITEM_INDEX")]
+
+        public  Int32 ItemIndex
+        {
+            get 
+            {
+                return _itemindex; 
+            }
+
+            set 
+            {
+                if (_itemindex != value)
+                {
+                    _itemindex = value;
+
+                    OnItemIndexChanged(value);
+
+                }
+            }
+        }
+
         protected Double _cyan;
 
         /// <summary>
@@ -534,6 +563,15 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(Name));
         }
 
+        /// <summary>
+        /// Called when the ItemIndex has changed.
+        /// </summary>
+        protected virtual void OnItemIndexChanged(Int32 itemindex)
+        {
+            ItemIndexChanged?.Invoke(this, itemindex);
+            RaisePropertyChanged(nameof(ItemIndex));
+        }
+
         /// <summary>
         /// Called when the Cyan has changed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipe.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipe.cs
index 48add3553..652d1af5d 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipe.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipe.cs
@@ -11,6 +11,11 @@ namespace Tango.BL.Entities
 {
     public class ColorCatalogsItemsRecipe : ColorCatalogsItemsRecipeBase
     {
+        public override void Delete(ObservablesContext context)
+        {
+            base.Delete(context);
 
+            context.ColorCatalogsItemsRecipes.Remove(this);
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
index 41fb57bad..8b85f5ddf 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/Permissions.cs
@@ -133,6 +133,12 @@ namespace Tango.BL.Enumerations
         [Description("Allows running the ColorCapture module in Machine Studio")]
         RunColorCaptureModule = 24,
 
+        /// <summary>
+        /// (Allows loading the color catalogs module in machine studio)
+        /// </summary>
+        [Description("Allows loading the color catalogs module in machine studio")]
+        RunCatalogsModule = 25,
+
         /// <summary>
         /// (Allows publishing of new PPC application versions.)
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.Core/ExtensionMethods/ObservableCollectionExtensions.cs b/Software/Visual_Studio/Tango.Core/ExtensionMethods/ObservableCollectionExtensions.cs
index a60121e63..59f813281 100644
--- a/Software/Visual_Studio/Tango.Core/ExtensionMethods/ObservableCollectionExtensions.cs
+++ b/Software/Visual_Studio/Tango.Core/ExtensionMethods/ObservableCollectionExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_GROUPS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_GROUPS.cs
index 099be4890..f311cd14c 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_GROUPS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_GROUPS.cs
@@ -24,6 +24,7 @@ namespace Tango.DAL.Remote.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public string NAME { get; set; }
+        public int GROUP_INDEX { get; set; }
         public string COLOR_CATALOG_GUID { get; set; }
     
         public virtual COLOR_CATALOGS COLOR_CATALOGS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs
index 23c53f5df..d24ec2c8d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs
@@ -27,6 +27,7 @@ namespace Tango.DAL.Remote.DB
         public string COLOR_CATALOGS_GROUP_GUID { get; set; }
         public int CODE { get; set; }
         public string NAME { get; set; }
+        public int ITEM_INDEX { get; set; }
         public double CYAN { get; set; }
         public double MAGENTA { get; set; }
         public double YELLOW { 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 2739abd99..51ae48dcc 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -147,6 +147,7 @@
           <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" />
+          <Property Name="GROUP_INDEX" Type="int" Nullable="false" />
           <Property Name="COLOR_CATALOG_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
         <EntityType Name="COLOR_CATALOGS_ITEMS">
@@ -159,6 +160,7 @@
           <Property Name="COLOR_CATALOGS_GROUP_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="CODE" Type="int" Nullable="false" />
           <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" />
+          <Property Name="ITEM_INDEX" Type="int" Nullable="false" />
           <Property Name="CYAN" Type="float" Nullable="false" />
           <Property Name="MAGENTA" Type="float" Nullable="false" />
           <Property Name="YELLOW" Type="float" Nullable="false" />
@@ -3074,6 +3076,7 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="GROUP_INDEX" Type="Int32" Nullable="false" />
           <Property Name="COLOR_CATALOG_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="COLOR_CATALOGS" Relationship="RemoteModel.FK_COLOR_CATALOGS_GROUPS_COLOR_CATALOGS" FromRole="COLOR_CATALOGS_GROUPS" ToRole="COLOR_CATALOGS" />
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_COLOR_CATALOGS_GROUPS" FromRole="COLOR_CATALOGS_GROUPS" ToRole="COLOR_CATALOGS_ITEMS" />
@@ -3088,6 +3091,7 @@
           <Property Name="COLOR_CATALOGS_GROUP_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="CODE" Type="Int32" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="ITEM_INDEX" Type="Int32" Nullable="false" />
           <Property Name="CYAN" Type="Double" Nullable="false" />
           <Property Name="MAGENTA" Type="Double" Nullable="false" />
           <Property Name="YELLOW" Type="Double" Nullable="false" />
@@ -5341,6 +5345,7 @@
             <EntityTypeMapping TypeName="RemoteModel.COLOR_CATALOGS_GROUPS">
               <MappingFragment StoreEntitySet="COLOR_CATALOGS_GROUPS">
                 <ScalarProperty Name="COLOR_CATALOG_GUID" ColumnName="COLOR_CATALOG_GUID" />
+                <ScalarProperty Name="GROUP_INDEX" ColumnName="GROUP_INDEX" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -5362,6 +5367,7 @@
                 <ScalarProperty Name="YELLOW" ColumnName="YELLOW" />
                 <ScalarProperty Name="MAGENTA" ColumnName="MAGENTA" />
                 <ScalarProperty Name="CYAN" ColumnName="CYAN" />
+                <ScalarProperty Name="ITEM_INDEX" ColumnName="ITEM_INDEX" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <ScalarProperty Name="COLOR_CATALOGS_GROUP_GUID" ColumnName="COLOR_CATALOGS_GROUP_GUID" />
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 ad55214ff..685a2b3ee 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="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" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="6.75" PointY="42" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="28.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="25.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="35.875" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="21" PointY="20.75" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="14.25" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="13.5" PointY="21.5" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="14.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="9.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="9.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="8.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="10" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="31.375" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="6.75" PointY="46.125" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="14.25" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="12" PointY="8.75" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="14.25" PointY="8.125" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="38.75" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="11.25" PointY="28" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="28.625" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="17.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.75" PointY="48.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12" PointY="33.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="15.75" PointY="53.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="18" PointY="37.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.75" PointY="52.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12" PointY="38.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="14.75" PointY="49" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="17" PointY="29.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.75" PointY="53.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="15" PointY="38.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="18.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9" PointY="36.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="31.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="15.75" PointY="57.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="18" PointY="42" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="14.25" PointY="4.5" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="16.5" PointY="12.5" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="18.75" PointY="19.875" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="16.5" PointY="18.375" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="31.625" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="11.25" PointY="3.875" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="21.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="16.5" PointY="60.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="27.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="18.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.5" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="25.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="22" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="34.5" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="14.25" PointY="45.625" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="9" PointY="44" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="17.25" PointY="49.875" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="50.875" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="52.5" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="18.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="17.25" PointY="45.75" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="19.5" PointY="45.875" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="18.75" PointY="23.5" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.5" PointY="17.5" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="1.375" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="20.5" PointY="34.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="1.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="4.75" PointY="1.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="0.75" PointY="5.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="6.75" PointY="1.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="2.75" PointY="5.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="2.75" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="14.25" PointY="29.875" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="19.5" PointY="30.875" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="14.25" PointY="35.125" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" />
diff --git a/Software/Visual_Studio/Tango.Documents/ExcelReader.cs b/Software/Visual_Studio/Tango.Documents/ExcelReader.cs
index 3d6b37445..6d8cc10f2 100644
--- a/Software/Visual_Studio/Tango.Documents/ExcelReader.cs
+++ b/Software/Visual_Studio/Tango.Documents/ExcelReader.cs
@@ -49,7 +49,7 @@ namespace Tango.Documents
         /// <param name="templatePath">File path to the Excel document.</param>
         /// <param name="throwOnError">Throw exceptions if encountering an error while parsing the document.</param>
         public ExcelReader(string templatePath, bool throwOnError = true)
-            : this(File.OpenRead(templatePath), throwOnError) { }
+            : this(new FileStream(templatePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), throwOnError) { }
 
 
         #endregion
@@ -405,6 +405,10 @@ namespace Tango.Documents
                     prop.SetValue(obj, Convert.ToBoolean(val), null);
                 else if (PType == typeof(byte) || PType == typeof(byte?))
                     prop.SetValue(obj, Convert.ToByte(val), null);
+                else if (PType == typeof(System.Windows.Media.Color))
+                {
+                    //Do nothing..
+                }
                 else
                     prop.SetValue(obj, val, null);
             }
diff --git a/Software/Visual_Studio/Tango.Documents/ExcelWriter.cs b/Software/Visual_Studio/Tango.Documents/ExcelWriter.cs
index 63c04bce9..2f1e4c29f 100644
--- a/Software/Visual_Studio/Tango.Documents/ExcelWriter.cs
+++ b/Software/Visual_Studio/Tango.Documents/ExcelWriter.cs
@@ -8,6 +8,7 @@ using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using System.Windows.Media;
 
 namespace Tango.Documents
 {
@@ -16,6 +17,8 @@ namespace Tango.Documents
         private Stream _stream;
         private SpreadsheetDocument _document;
         private List<DefinedName> _column_names;
+        private Worksheet _currentWorkSheet;
+        private Stylesheet _currentStyleSheet;
 
         public ExcelWriter(Stream source)
         {
@@ -37,25 +40,38 @@ namespace Tango.Documents
 
         }
 
-        public void WriteData<T>(IEnumerable<T> data, String sheetName)
+        public void WriteData<T>(IEnumerable<T> data, String sheetName, int? headerRowNumber = null)
         {
             var props = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance).ToList();
 
             WorksheetPart work_sheet_part = GetWorkSheetPart(sheetName);
             Worksheet workSheet = work_sheet_part.Worksheet;
+            _currentWorkSheet = workSheet;
             SheetData sheetData = workSheet.GetFirstChild<SheetData>();
             List<Row> rows = sheetData.Elements<Row>().ToList();
 
             var list = data.ToList();
 
+            int lastRowIndex = headerRowNumber.HasValue ? headerRowNumber.Value : 0;
+
             for (int i = 0; i < list.Count; i++)
             {
                 var item = list[i];
 
-                var last_row = sheetData.Elements<Row>().Last();
+                Row last_row = null;
+
+                if (headerRowNumber.HasValue)
+                {
+                    last_row = sheetData.Elements<Row>().ElementAt(lastRowIndex - 1);
+                }
+                else
+                {
+                    last_row = sheetData.Elements<Row>().Last();
+                }
 
                 Row newRow = new Row();
                 newRow.RowIndex = last_row.RowIndex + 1;
+                lastRowIndex = (int)newRow.RowIndex.Value;
 
                 sheetData.InsertAfter(newRow, last_row);
 
@@ -65,19 +81,28 @@ namespace Tango.Documents
 
                     if (definedName != null)
                     {
-                        SetCellRow(newRow, GetCellReference(definedName, i + 2), prop.GetValue(item));
+                        SetCellRow(newRow, GetCellReference(definedName, (int)(last_row.RowIndex + 1)), prop.GetValue(item));
                     }
                 }
             }
+
+            if (_currentStyleSheet != null)
+            {
+                _currentStyleSheet.Save();
+                _currentStyleSheet = null;
+            }
         }
 
         private void SetCellRow(Row row, string cellReference, object value)
         {
             Cell cell = row.Descendants<Cell>().FirstOrDefault(c => c.CellReference == cellReference);
+
+            bool append = false;
             if (cell == null)
             {
                 cell = new Cell();
                 cell.CellReference = cellReference;
+                append = true;
             }
             cell.CellValue = new CellValue(value.ToString());
 
@@ -95,8 +120,66 @@ namespace Tango.Documents
             {
                 cell.DataType = CellValues.Boolean;
             }
+            else if (value is System.Windows.Media.Color)
+            {
+                cell.DataType = CellValues.String;
 
-            row.Append(cell);
+                var color = (System.Windows.Media.Color)value;
+
+                if (_currentStyleSheet == null)
+                {
+                    WorkbookPart wbPart = _document.WorkbookPart;
+                    WorkbookStylesPart stylesPart = wbPart.WorkbookStylesPart;
+                    _currentStyleSheet = stylesPart.Stylesheet;
+                }
+
+                var fill = new Fill(new PatternFill(
+                    new ForegroundColor()
+                    {
+                        Rgb = new DocumentFormat.OpenXml.HexBinaryValue()
+                        {
+                            Value = new ColorConverter().ConvertToString(color).Replace("#", ""),
+                        },
+                    },
+                    new BackgroundColor()
+                    {
+                        Rgb = new DocumentFormat.OpenXml.HexBinaryValue()
+                        {
+                            Value = new ColorConverter().ConvertToString(color).Replace("#", ""),
+                        },
+                    })
+                {
+                    PatternType = PatternValues.Solid,
+                });
+
+                if (_currentStyleSheet.Fills == null)
+                {
+                    _currentStyleSheet.Fills = new Fills();
+                }
+
+                _currentStyleSheet.Fills.Append(fill);
+
+                _currentStyleSheet.CellFormats.Append(new CellFormat()
+                {
+                    ApplyFill = true,
+                    FillId = _currentStyleSheet.Fills.Count,
+                    NumberFormatId = (DocumentFormat.OpenXml.UInt32Value)0U,
+                    FontId = (DocumentFormat.OpenXml.UInt32Value)0U,
+                    BorderId = (DocumentFormat.OpenXml.UInt32Value)0U,
+                    FormatId = (DocumentFormat.OpenXml.UInt32Value)0U,
+                });
+
+                cell.CellValue = new CellValue(String.Empty);
+                cell.StyleIndex = new DocumentFormat.OpenXml.UInt32Value(_currentStyleSheet.CellFormats.Count);
+
+                _currentStyleSheet.CellFormats.Count++;
+                _currentStyleSheet.Fills.Count++;
+            }
+
+            if (append)
+            {
+                row.Append(cell);
+            }
         }
 
         private WorksheetPart GetWorkSheetPart(String sheetName)
@@ -110,7 +193,8 @@ namespace Tango.Documents
         {
             Regex rowPatern = new Regex("^.*\\!\\$(.*)\\$\\d*$");
             Match match = rowPatern.Match(name.Text);
-            return match.Groups[1].Value + rowIndex.ToString();
+            String s = match.Groups[1].Value + rowIndex.ToString();
+            return s;
         }
 
         public void Dispose()
-- 
cgit v1.3.1


From a79b09acc0b92e1cd2970418dba1d3f93fa3d8dd Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 25 Jul 2019 16:41:28 +0300
Subject: Added new motor parameters. Added better LAB/RGB support on colorlab
 module.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 22675456 -> 22675456 bytes
 Software/PMR/Messages/Hardware/HardwareMotor.proto |  18 ++
 .../PMR/Messages/Hardware/HardwareMotorType.proto  |   3 +
 .../ViewModels/MainViewVM.cs                       |  37 ++-
 .../Views/MainView.xaml                            |  69 ++++-
 .../Tango.BL/DTO/HardwareMotorDTOBase.cs           |  72 +++++
 .../Tango.BL/Entities/HardwareMotorBase.cs         | 342 +++++++++++++++++++++
 Software/Visual_Studio/Tango.BL/Entities/Rml.cs    |   4 +-
 .../Tango.BL/Enumerations/HardwareMotorTypes.cs    |   6 +
 .../Visual_Studio/Tango.BL/Enumerations/Roles.cs   |   6 +
 .../Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs         |   9 +
 .../Tango.DAL.Remote/DB/RemoteADO.edmx             |  27 ++
 .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram     | 146 ++++-----
 .../Tango.PMR/Debugging/DebugDistributorType.cs    |  65 ++++
 .../Tango.PMR/Hardware/HardwareMotor.cs            | 262 +++++++++++++++-
 .../Tango.PMR/Hardware/HardwareMotorType.cs        |  10 +-
 Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj  |   3 +-
 18 files changed, 985 insertions(+), 94 deletions(-)
 create mode 100644 Software/Visual_Studio/Tango.PMR/Debugging/DebugDistributorType.cs

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index fd0cf2a71..c27550999 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index e24b2cff4..5cab74fb6 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/PMR/Messages/Hardware/HardwareMotor.proto b/Software/PMR/Messages/Hardware/HardwareMotor.proto
index 1055db2f5..68cd13a49 100644
--- a/Software/PMR/Messages/Hardware/HardwareMotor.proto
+++ b/Software/PMR/Messages/Hardware/HardwareMotor.proto
@@ -69,4 +69,22 @@ message HardwareMotor
     //The speed in which the motor moves to full step operation.
     int32 FsSpd = 25;
 
+    int32 GateCfg1 = 26;
+
+    int32 GateCfg2 = 27;
+
+    int32 TValHold = 28;
+
+    int32 TValRun = 29;
+
+    int32 TValAcc = 30;
+
+    int32 TValDec = 31;
+
+    int32 TFast = 32;
+
+    int32 TOnMin = 33;
+
+    int32 TOffMin = 34;
+
 }
diff --git a/Software/PMR/Messages/Hardware/HardwareMotorType.proto b/Software/PMR/Messages/Hardware/HardwareMotorType.proto
index 378abd761..4c43b4bdd 100644
--- a/Software/PMR/Messages/Hardware/HardwareMotorType.proto
+++ b/Software/PMR/Messages/Hardware/HardwareMotorType.proto
@@ -103,4 +103,7 @@ enum HardwareMotorType
     //Spare 4 Motor
     MOTO_SPARE2_2 = 28;
 
+    //Spare 5 Motor
+    MOTO_SPARE3_1 = 29;
+
 }
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 94fa36e57..2fe47bfab 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
@@ -342,12 +342,14 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                     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 = 92.1815; //SelectedRML.MediaColor.L;
-                    input.ThreadA = 2.2555; //SelectedRML.MediaColor.A;
-                    input.ThreadB = -10.9325; //SelectedRML.MediaColor.B;
+
+                    input.ThreadL = SelectedRML.WhitePointL;
+                    input.ThreadA = SelectedRML.WhitePointA;
+                    input.ThreadB = SelectedRML.WhitePointB;
 
                     //Validate calibration data
                     foreach (var vm in LiquidsCalibrationData.Where(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor.ToInt32()))
@@ -551,9 +553,9 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                 input.ForwardData = ByteString.CopyFrom(CCT.Data);
 
                 input.InputCoordinates = new InputCoordinates();
-                input.ThreadL = 92.1815; //SelectedRML.MediaColor.L;
-                input.ThreadA = 2.2555; //SelectedRML.MediaColor.A;
-                input.ThreadB = -10.9325; //SelectedRML.MediaColor.B;
+                input.ThreadL = SelectedRML.WhitePointL;
+                input.ThreadA = SelectedRML.WhitePointA;
+                input.ThreadB = SelectedRML.WhitePointB;
 
                 foreach (var vm in LiquidsCalibrationData)
                 {
@@ -585,12 +587,25 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
 
                 var output = converter.Convert(input);
 
-                TargetColor = new RgbVM()
+                if (SourceColor.IsLab)
+                {
+                    TargetColor = new RgbVM()
+                    {
+                        IsLab = true,
+                        L = output.SingleCoordinates.L,
+                        A = output.SingleCoordinates.A,
+                        B = output.SingleCoordinates.B,
+                    };
+                }
+                else
                 {
-                    Red = output.SingleCoordinates.Red,
-                    Green = output.SingleCoordinates.Green,
-                    Blue = output.SingleCoordinates.Blue,
-                };
+                    TargetColor = new RgbVM()
+                    {
+                        Red = output.SingleCoordinates.Red,
+                        Green = output.SingleCoordinates.Green,
+                        Blue = output.SingleCoordinates.Blue,
+                    };
+                }
             }
             catch (Exception ex)
             {
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..381aff542 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
@@ -265,8 +265,8 @@
                         </Grid>
 
                         <TextBlock FontStyle="Italic" HorizontalAlignment="Center">SOURCE / INVERSE</TextBlock>
-                        <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="2" Margin="00 0 0 0">SUGGESTIONS</TextBlock>
-                        <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="4">LIQUID VOLUMES</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>
 
@@ -318,6 +318,71 @@
                         <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>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs
index 2a05afbfa..4c3125bf7 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs
@@ -234,6 +234,78 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// gate cfg 1
+        /// </summary>
+        public Int32 GateCfg1 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// gate cfg 2
+        /// </summary>
+        public Int32 GateCfg2 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t val hold
+        /// </summary>
+        public Int32 TValHold 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t val run
+        /// </summary>
+        public Int32 TValRun 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t val acc
+        /// </summary>
+        public Int32 TValAcc 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t val dec
+        /// </summary>
+        public Int32 TValDec 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t fast
+        /// </summary>
+        public Int32 TFast 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t on min
+        /// </summary>
+        public Int32 TOnMin 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t off min
+        /// </summary>
+        public Int32 TOffMin 
+        {
+            get; set; 
+        }
+
         /// <summary>
         /// active
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs
index 5929037df..54bea3973 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs
@@ -78,6 +78,24 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Int32> FsSpdChanged;
 
+        public event EventHandler<Int32> GateCfg1Changed;
+
+        public event EventHandler<Int32> GateCfg2Changed;
+
+        public event EventHandler<Int32> TValHoldChanged;
+
+        public event EventHandler<Int32> TValRunChanged;
+
+        public event EventHandler<Int32> TValAccChanged;
+
+        public event EventHandler<Int32> TValDecChanged;
+
+        public event EventHandler<Int32> TFastChanged;
+
+        public event EventHandler<Int32> TOnMinChanged;
+
+        public event EventHandler<Int32> TOffMinChanged;
+
         public event EventHandler<Boolean> ActiveChanged;
 
         public event EventHandler<HardwareMotorType> HardwareMotorTypeChanged;
@@ -784,6 +802,249 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Int32 _gatecfg1;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase gate cfg 1.
+        /// </summary>
+
+        [Column("GATE_CFG_1")]
+
+        public  Int32 GateCfg1
+        {
+            get 
+            {
+                return _gatecfg1; 
+            }
+
+            set 
+            {
+                if (_gatecfg1 != value)
+                {
+                    _gatecfg1 = value;
+
+                    OnGateCfg1Changed(value);
+
+                }
+            }
+        }
+
+        protected Int32 _gatecfg2;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase gate cfg 2.
+        /// </summary>
+
+        [Column("GATE_CFG_2")]
+
+        public  Int32 GateCfg2
+        {
+            get 
+            {
+                return _gatecfg2; 
+            }
+
+            set 
+            {
+                if (_gatecfg2 != value)
+                {
+                    _gatecfg2 = value;
+
+                    OnGateCfg2Changed(value);
+
+                }
+            }
+        }
+
+        protected Int32 _tvalhold;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t val hold.
+        /// </summary>
+
+        [Column("T_VAL_HOLD")]
+
+        public  Int32 TValHold
+        {
+            get 
+            {
+                return _tvalhold; 
+            }
+
+            set 
+            {
+                if (_tvalhold != value)
+                {
+                    _tvalhold = value;
+
+                    OnTValHoldChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _tvalrun;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t val run.
+        /// </summary>
+
+        [Column("T_VAL_RUN")]
+
+        public  Int32 TValRun
+        {
+            get 
+            {
+                return _tvalrun; 
+            }
+
+            set 
+            {
+                if (_tvalrun != value)
+                {
+                    _tvalrun = value;
+
+                    OnTValRunChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _tvalacc;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t val acc.
+        /// </summary>
+
+        [Column("T_VAL_ACC")]
+
+        public  Int32 TValAcc
+        {
+            get 
+            {
+                return _tvalacc; 
+            }
+
+            set 
+            {
+                if (_tvalacc != value)
+                {
+                    _tvalacc = value;
+
+                    OnTValAccChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _tvaldec;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t val dec.
+        /// </summary>
+
+        [Column("T_VAL_DEC")]
+
+        public  Int32 TValDec
+        {
+            get 
+            {
+                return _tvaldec; 
+            }
+
+            set 
+            {
+                if (_tvaldec != value)
+                {
+                    _tvaldec = value;
+
+                    OnTValDecChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _tfast;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t fast.
+        /// </summary>
+
+        [Column("T_FAST")]
+
+        public  Int32 TFast
+        {
+            get 
+            {
+                return _tfast; 
+            }
+
+            set 
+            {
+                if (_tfast != value)
+                {
+                    _tfast = value;
+
+                    OnTFastChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _tonmin;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t on min.
+        /// </summary>
+
+        [Column("T_ON_MIN")]
+
+        public  Int32 TOnMin
+        {
+            get 
+            {
+                return _tonmin; 
+            }
+
+            set 
+            {
+                if (_tonmin != value)
+                {
+                    _tonmin = value;
+
+                    OnTOnMinChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _toffmin;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t off min.
+        /// </summary>
+
+        [Column("T_OFF_MIN")]
+
+        public  Int32 TOffMin
+        {
+            get 
+            {
+                return _toffmin; 
+            }
+
+            set 
+            {
+                if (_toffmin != value)
+                {
+                    _toffmin = value;
+
+                    OnTOffMinChanged(value);
+
+                }
+            }
+        }
+
         protected Boolean _active;
 
         /// <summary>
@@ -1091,6 +1352,87 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(FsSpd));
         }
 
+        /// <summary>
+        /// Called when the GateCfg1 has changed.
+        /// </summary>
+        protected virtual void OnGateCfg1Changed(Int32 gatecfg1)
+        {
+            GateCfg1Changed?.Invoke(this, gatecfg1);
+            RaisePropertyChanged(nameof(GateCfg1));
+        }
+
+        /// <summary>
+        /// Called when the GateCfg2 has changed.
+        /// </summary>
+        protected virtual void OnGateCfg2Changed(Int32 gatecfg2)
+        {
+            GateCfg2Changed?.Invoke(this, gatecfg2);
+            RaisePropertyChanged(nameof(GateCfg2));
+        }
+
+        /// <summary>
+        /// Called when the TValHold has changed.
+        /// </summary>
+        protected virtual void OnTValHoldChanged(Int32 tvalhold)
+        {
+            TValHoldChanged?.Invoke(this, tvalhold);
+            RaisePropertyChanged(nameof(TValHold));
+        }
+
+        /// <summary>
+        /// Called when the TValRun has changed.
+        /// </summary>
+        protected virtual void OnTValRunChanged(Int32 tvalrun)
+        {
+            TValRunChanged?.Invoke(this, tvalrun);
+            RaisePropertyChanged(nameof(TValRun));
+        }
+
+        /// <summary>
+        /// Called when the TValAcc has changed.
+        /// </summary>
+        protected virtual void OnTValAccChanged(Int32 tvalacc)
+        {
+            TValAccChanged?.Invoke(this, tvalacc);
+            RaisePropertyChanged(nameof(TValAcc));
+        }
+
+        /// <summary>
+        /// Called when the TValDec has changed.
+        /// </summary>
+        protected virtual void OnTValDecChanged(Int32 tvaldec)
+        {
+            TValDecChanged?.Invoke(this, tvaldec);
+            RaisePropertyChanged(nameof(TValDec));
+        }
+
+        /// <summary>
+        /// Called when the TFast has changed.
+        /// </summary>
+        protected virtual void OnTFastChanged(Int32 tfast)
+        {
+            TFastChanged?.Invoke(this, tfast);
+            RaisePropertyChanged(nameof(TFast));
+        }
+
+        /// <summary>
+        /// Called when the TOnMin has changed.
+        /// </summary>
+        protected virtual void OnTOnMinChanged(Int32 tonmin)
+        {
+            TOnMinChanged?.Invoke(this, tonmin);
+            RaisePropertyChanged(nameof(TOnMin));
+        }
+
+        /// <summary>
+        /// Called when the TOffMin has changed.
+        /// </summary>
+        protected virtual void OnTOffMinChanged(Int32 toffmin)
+        {
+            TOffMinChanged?.Invoke(this, toffmin);
+            RaisePropertyChanged(nameof(TOffMin));
+        }
+
         /// <summary>
         /// Called when the Active has changed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
index fd8f3d2d1..63c0a9dbe 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
@@ -15,7 +15,9 @@ namespace Tango.BL.Entities
         /// </summary>
         public Rml() : base()
         {
-
+            WhitePointL = 92.1815;
+            WhitePointA = 2.2555;
+            WhitePointB = -10.9325;
         }
 
         protected override void OnWhitePointLChanged(double whitepointl)
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareMotorTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareMotorTypes.cs
index 168896c07..3e860036c 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareMotorTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareMotorTypes.cs
@@ -193,5 +193,11 @@ namespace Tango.BL.Enumerations
         [Description("Spare 4 Motor")]
         MOTO_SPARE2_2 = 28,
 
+        /// <summary>
+        /// (Spare 5 Motor)
+        /// </summary>
+        [Description("Spare 5 Motor")]
+        MOTO_SPARE3_1 = 29,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs
index d40ee52db..800775d64 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs
@@ -91,6 +91,12 @@ namespace Tango.BL.Enumerations
         [Description("Twine color capture application tester/user.")]
         TCCUser = 15,
 
+        /// <summary>
+        /// (Catalogs Manager)
+        /// </summary>
+        [Description("Catalogs Manager")]
+        CatalogsManager = 16,
+
         /// <summary>
         /// (PPC Application Publisher)
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs
index 98933b434..3f68baea7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs
@@ -43,6 +43,15 @@ namespace Tango.DAL.Remote.DB
         public int FN_SLP_ACC { get; set; }
         public int FN_SLP_DEC { get; set; }
         public int FS_SPD { get; set; }
+        public int GATE_CFG_1 { get; set; }
+        public int GATE_CFG_2 { get; set; }
+        public int T_VAL_HOLD { get; set; }
+        public int T_VAL_RUN { get; set; }
+        public int T_VAL_ACC { get; set; }
+        public int T_VAL_DEC { get; set; }
+        public int T_FAST { get; set; }
+        public int T_ON_MIN { get; set; }
+        public int T_OFF_MIN { get; set; }
         public bool ACTIVE { get; set; }
     
         public virtual HARDWARE_MOTOR_TYPES HARDWARE_MOTOR_TYPES { 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 51ae48dcc..cb6a660c7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -440,6 +440,15 @@
           <Property Name="FN_SLP_ACC" Type="int" Nullable="false" />
           <Property Name="FN_SLP_DEC" Type="int" Nullable="false" />
           <Property Name="FS_SPD" Type="int" Nullable="false" />
+          <Property Name="GATE_CFG_1" Type="int" Nullable="false" />
+          <Property Name="GATE_CFG_2" Type="int" Nullable="false" />
+          <Property Name="T_VAL_HOLD" Type="int" Nullable="false" />
+          <Property Name="T_VAL_RUN" Type="int" Nullable="false" />
+          <Property Name="T_VAL_ACC" Type="int" Nullable="false" />
+          <Property Name="T_VAL_DEC" Type="int" Nullable="false" />
+          <Property Name="T_FAST" Type="int" Nullable="false" />
+          <Property Name="T_ON_MIN" Type="int" Nullable="false" />
+          <Property Name="T_OFF_MIN" Type="int" Nullable="false" />
           <Property Name="ACTIVE" Type="bit" Nullable="false" />
         </EntityType>
         <EntityType Name="HARDWARE_PID_CONTROL_TYPES">
@@ -3407,6 +3416,15 @@
           <Property Name="FN_SLP_ACC" Type="Int32" Nullable="false" />
           <Property Name="FN_SLP_DEC" Type="Int32" Nullable="false" />
           <Property Name="FS_SPD" Type="Int32" Nullable="false" />
+          <Property Name="GATE_CFG_1" Type="Int32" Nullable="false" />
+          <Property Name="GATE_CFG_2" Type="Int32" Nullable="false" />
+          <Property Name="T_VAL_HOLD" Type="Int32" Nullable="false" />
+          <Property Name="T_VAL_RUN" Type="Int32" Nullable="false" />
+          <Property Name="T_VAL_ACC" Type="Int32" Nullable="false" />
+          <Property Name="T_VAL_DEC" Type="Int32" Nullable="false" />
+          <Property Name="T_FAST" Type="Int32" Nullable="false" />
+          <Property Name="T_ON_MIN" Type="Int32" Nullable="false" />
+          <Property Name="T_OFF_MIN" Type="Int32" Nullable="false" />
           <Property Name="ACTIVE" Type="Boolean" Nullable="false" />
           <NavigationProperty Name="HARDWARE_MOTOR_TYPES" Relationship="RemoteModel.FK_HARDWARE_MOTORS_HARDWARE_MOTOR_TYPES" FromRole="HARDWARE_MOTORS" ToRole="HARDWARE_MOTOR_TYPES" />
           <NavigationProperty Name="HARDWARE_VERSIONS" Relationship="RemoteModel.FK_HARDWARE_MOTORS_HARDWARE_VERSIONS" FromRole="HARDWARE_MOTORS" ToRole="HARDWARE_VERSIONS" />
@@ -5633,6 +5651,15 @@
             <EntityTypeMapping TypeName="RemoteModel.HARDWARE_MOTORS">
               <MappingFragment StoreEntitySet="HARDWARE_MOTORS">
                 <ScalarProperty Name="ACTIVE" ColumnName="ACTIVE" />
+                <ScalarProperty Name="T_OFF_MIN" ColumnName="T_OFF_MIN" />
+                <ScalarProperty Name="T_ON_MIN" ColumnName="T_ON_MIN" />
+                <ScalarProperty Name="T_FAST" ColumnName="T_FAST" />
+                <ScalarProperty Name="T_VAL_DEC" ColumnName="T_VAL_DEC" />
+                <ScalarProperty Name="T_VAL_ACC" ColumnName="T_VAL_ACC" />
+                <ScalarProperty Name="T_VAL_RUN" ColumnName="T_VAL_RUN" />
+                <ScalarProperty Name="T_VAL_HOLD" ColumnName="T_VAL_HOLD" />
+                <ScalarProperty Name="GATE_CFG_2" ColumnName="GATE_CFG_2" />
+                <ScalarProperty Name="GATE_CFG_1" ColumnName="GATE_CFG_1" />
                 <ScalarProperty Name="FS_SPD" ColumnName="FS_SPD" />
                 <ScalarProperty Name="FN_SLP_DEC" ColumnName="FN_SLP_DEC" />
                 <ScalarProperty Name="FN_SLP_ACC" ColumnName="FN_SLP_ACC" />
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 685a2b3ee..f1374cb5d 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="42" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="28.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="25.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="35.875" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="21" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="14.25" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="13.5" PointY="21.5" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="14.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="9.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="8.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="21.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="31.375" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="6.75" PointY="46.125" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="14.25" PointY="13.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="12" PointY="8.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="14.25" PointY="8.125" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="38.75" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="11.25" PointY="28" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="28.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="17.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.75" PointY="48.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12" PointY="33.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="15.75" PointY="53.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="18" PointY="37.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.75" PointY="52.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12" PointY="38.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="14.75" PointY="49" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="17" PointY="29.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.75" PointY="53.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="15" PointY="38.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="18.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9" PointY="36.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="31.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="15.75" PointY="57.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="18" PointY="42" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="14.25" PointY="4.5" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="16.5" PointY="12.5" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="18.75" PointY="19.875" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="16.5" PointY="18.375" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="31.625" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="11.25" PointY="3.875" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="21.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="16.5" PointY="60.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="27.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="18.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.5" PointY="25.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="25.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="22" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="34.5" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="14.25" PointY="45.625" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="9" PointY="44" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="17.25" PointY="49.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="50.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="52.5" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="18.625" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="17.25" PointY="45.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="19.5" PointY="45.875" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="18.75" PointY="23.5" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.5" PointY="17.5" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="20.5" PointY="34.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="4.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="0.75" PointY="5.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="6.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="2.75" PointY="5.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="2.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="14.25" PointY="29.875" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="19.5" PointY="30.875" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="14.25" PointY="35.125" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3.75" PointY="5.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="3.75" PointY="42" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="29" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="3.75" PointY="34.875" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15" PointY="20.125" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9" PointY="8.75" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="20.875" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="33.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="8.25" PointY="35.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="10.5" PointY="36" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="12.75" PointY="34.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="24.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6" PointY="34.625" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3.75" PointY="9.375" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="8.25" PointY="31.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="56.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9" PointY="56.125" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="31.875" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="13.25" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="16.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="7.75" PointY="65.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="10" PointY="47" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="14.75" PointY="9.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="17" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.75" PointY="61.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12" PointY="41.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.75" PointY="47.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="15" PointY="35" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.75" PointY="55.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="15" PointY="45.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="53.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9" PointY="40" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="37.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="11.75" PointY="51.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="14" PointY="31.125" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9" PointY="4.625" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="11.25" PointY="28" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="12.75" PointY="19.25" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="10.5" PointY="17.75" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="30.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="10.5" PointY="14.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="8.25" PointY="18.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="15.5" PointY="15.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="13.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="24.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="27.625" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9" PointY="53" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6" PointY="7.375" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="9.25" PointY="69.125" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="46.125" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="47.75" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="18" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="9.25" PointY="1" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="11.5" PointY="1.125" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="12.75" PointY="22.875" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="40.25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="17.5" PointY="20.875" />
+        <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="25.25" />
+        <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="0.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="0.75" PointY="7.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="11.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="5.75" PointY="3.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="12.125" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="11.5" PointY="10.125" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="8.25" PointY="28.375" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" />
diff --git a/Software/Visual_Studio/Tango.PMR/Debugging/DebugDistributorType.cs b/Software/Visual_Studio/Tango.PMR/Debugging/DebugDistributorType.cs
new file mode 100644
index 000000000..02faf67a9
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Debugging/DebugDistributorType.cs
@@ -0,0 +1,65 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: DebugDistributorType.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.Debugging {
+
+  /// <summary>Holder for reflection information generated from DebugDistributorType.proto</summary>
+  public static partial class DebugDistributorTypeReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for DebugDistributorType.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static DebugDistributorTypeReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChpEZWJ1Z0Rpc3RyaWJ1dG9yVHlwZS5wcm90bxITVGFuZ28uUE1SLkRlYnVn",
+            "Z2luZyqpAgoURGVidWdEaXN0cmlidXRvclR5cGUSEQoNQ29udHJvbEZpbHRl",
+            "chAAEhEKDUhlYXRlcnNGaWx0ZXIQARINCglKb2JGaWx0ZXIQAhIPCgtXYXN0",
+            "ZUZpbHRlchADEg8KC0FsYXJtRmlsdGVyEAQSFQoRRGlhZ25vc3RpY3NGaWx0",
+            "ZXIQBRINCglJRFNGaWx0ZXIQBhIQCgxUaHJlYWRGaWx0ZXIQBxIRCg1HZW5l",
+            "cmFsRmlsdGVyEAgSDgoKQ29tbUZpbHRlchAJEg4KCkZQR0FGaWx0ZXIQChIO",
+            "CgpMb2FkRmlsdGVyEAsSDgoKSW5pdEZpbHRlchAMEg8KC01haW50RmlsdGVy",
+            "EA0SDQoJSUZTRmlsdGVyEA4SDwoLRmlsZXNGaWx0ZXIQD0IfCh1jb20udHdp",
+            "bmUudGFuZ28ucG1yLmRlYnVnZ2luZ2IGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Debugging.DebugDistributorType), }, null));
+    }
+    #endregion
+
+  }
+  #region Enums
+  public enum DebugDistributorType {
+    [pbr::OriginalName("ControlFilter")] ControlFilter = 0,
+    [pbr::OriginalName("HeatersFilter")] HeatersFilter = 1,
+    [pbr::OriginalName("JobFilter")] JobFilter = 2,
+    [pbr::OriginalName("WasteFilter")] WasteFilter = 3,
+    [pbr::OriginalName("AlarmFilter")] AlarmFilter = 4,
+    [pbr::OriginalName("DiagnosticsFilter")] DiagnosticsFilter = 5,
+    [pbr::OriginalName("IDSFilter")] Idsfilter = 6,
+    [pbr::OriginalName("ThreadFilter")] ThreadFilter = 7,
+    [pbr::OriginalName("GeneralFilter")] GeneralFilter = 8,
+    [pbr::OriginalName("CommFilter")] CommFilter = 9,
+    [pbr::OriginalName("FPGAFilter")] Fpgafilter = 10,
+    [pbr::OriginalName("LoadFilter")] LoadFilter = 11,
+    [pbr::OriginalName("InitFilter")] InitFilter = 12,
+    [pbr::OriginalName("MaintFilter")] MaintFilter = 13,
+    [pbr::OriginalName("IFSFilter")] Ifsfilter = 14,
+    [pbr::OriginalName("FilesFilter")] FilesFilter = 15,
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotor.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotor.cs
index bbf37f866..8bbbbba73 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotor.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotor.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Hardware {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChNIYXJkd2FyZU1vdG9yLnByb3RvEhJUYW5nby5QTVIuSGFyZHdhcmUaF0hh",
-            "cmR3YXJlTW90b3JUeXBlLnByb3RvIt4ECg1IYXJkd2FyZU1vdG9yEkAKEUhh",
+            "cmR3YXJlTW90b3JUeXBlLnByb3RvIvcFCg1IYXJkd2FyZU1vdG9yEkAKEUhh",
             "cmR3YXJlTW90b3JUeXBlGAEgASgOMiUuVGFuZ28uUE1SLkhhcmR3YXJlLkhh",
             "cmR3YXJlTW90b3JUeXBlEhQKDE1pbkZyZXF1ZW5jeRgCIAEoBRIUCgxNYXhG",
             "cmVxdWVuY3kYAyABKAUSFAoMU2V0TWljcm9TdGVwGAQgASgFEhEKCU1pY3Jv",
@@ -37,11 +37,15 @@ namespace Tango.PMR.Hardware {
             "b21wZW5zYXRpb25GYWN0b3IYEyABKAUSHAoUTG93U3BlZWRPcHRpbWl6YXRp",
             "b24YFCABKAgSDQoFU3RTbHAYFSABKAUSDgoGSW50U3BkGBYgASgFEhAKCEZu",
             "U2xwQWNjGBcgASgFEhAKCEZuU2xwRGVjGBggASgFEg0KBUZzU3BkGBkgASgF",
-            "Qh4KHGNvbS50d2luZS50YW5nby5wbXIuaGFyZHdhcmViBnByb3RvMw=="));
+            "EhAKCEdhdGVDZmcxGBogASgFEhAKCEdhdGVDZmcyGBsgASgFEhAKCFRWYWxI",
+            "b2xkGBwgASgFEg8KB1RWYWxSdW4YHSABKAUSDwoHVFZhbEFjYxgeIAEoBRIP",
+            "CgdUVmFsRGVjGB8gASgFEg0KBVRGYXN0GCAgASgFEg4KBlRPbk1pbhghIAEo",
+            "BRIPCgdUT2ZmTWluGCIgASgFQh4KHGNvbS50d2luZS50YW5nby5wbXIuaGFy",
+            "ZHdhcmViBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Hardware.HardwareMotorTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareMotor), global::Tango.PMR.Hardware.HardwareMotor.Parser, new[]{ "HardwareMotorType", "MinFrequency", "MaxFrequency", "SetMicroStep", "MicroStep", "MaxChangeSlope", "HighLengthMicroSecond", "SpeedMaster", "PulsePerRound", "PulleyRadius", "ConfigWord", "DirectionThreadWize", "KvalHold", "KvalRun", "KvalAcc", "KvalDec", "OverCurrentThreshold", "StallThreshold", "ThermalCompensationFactor", "LowSpeedOptimization", "StSlp", "IntSpd", "FnSlpAcc", "FnSlpDec", "FsSpd" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareMotor), global::Tango.PMR.Hardware.HardwareMotor.Parser, new[]{ "HardwareMotorType", "MinFrequency", "MaxFrequency", "SetMicroStep", "MicroStep", "MaxChangeSlope", "HighLengthMicroSecond", "SpeedMaster", "PulsePerRound", "PulleyRadius", "ConfigWord", "DirectionThreadWize", "KvalHold", "KvalRun", "KvalAcc", "KvalDec", "OverCurrentThreshold", "StallThreshold", "ThermalCompensationFactor", "LowSpeedOptimization", "StSlp", "IntSpd", "FnSlpAcc", "FnSlpDec", "FsSpd", "GateCfg1", "GateCfg2", "TValHold", "TValRun", "TValAcc", "TValDec", "TFast", "TOnMin", "TOffMin" }, null, null, null)
           }));
     }
     #endregion
@@ -97,6 +101,15 @@ namespace Tango.PMR.Hardware {
       fnSlpAcc_ = other.fnSlpAcc_;
       fnSlpDec_ = other.fnSlpDec_;
       fsSpd_ = other.fsSpd_;
+      gateCfg1_ = other.gateCfg1_;
+      gateCfg2_ = other.gateCfg2_;
+      tValHold_ = other.tValHold_;
+      tValRun_ = other.tValRun_;
+      tValAcc_ = other.tValAcc_;
+      tValDec_ = other.tValDec_;
+      tFast_ = other.tFast_;
+      tOnMin_ = other.tOnMin_;
+      tOffMin_ = other.tOffMin_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -382,6 +395,105 @@ namespace Tango.PMR.Hardware {
       }
     }
 
+    /// <summary>Field number for the "GateCfg1" field.</summary>
+    public const int GateCfg1FieldNumber = 26;
+    private int gateCfg1_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int GateCfg1 {
+      get { return gateCfg1_; }
+      set {
+        gateCfg1_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "GateCfg2" field.</summary>
+    public const int GateCfg2FieldNumber = 27;
+    private int gateCfg2_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int GateCfg2 {
+      get { return gateCfg2_; }
+      set {
+        gateCfg2_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TValHold" field.</summary>
+    public const int TValHoldFieldNumber = 28;
+    private int tValHold_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TValHold {
+      get { return tValHold_; }
+      set {
+        tValHold_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TValRun" field.</summary>
+    public const int TValRunFieldNumber = 29;
+    private int tValRun_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TValRun {
+      get { return tValRun_; }
+      set {
+        tValRun_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TValAcc" field.</summary>
+    public const int TValAccFieldNumber = 30;
+    private int tValAcc_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TValAcc {
+      get { return tValAcc_; }
+      set {
+        tValAcc_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TValDec" field.</summary>
+    public const int TValDecFieldNumber = 31;
+    private int tValDec_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TValDec {
+      get { return tValDec_; }
+      set {
+        tValDec_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TFast" field.</summary>
+    public const int TFastFieldNumber = 32;
+    private int tFast_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TFast {
+      get { return tFast_; }
+      set {
+        tFast_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TOnMin" field.</summary>
+    public const int TOnMinFieldNumber = 33;
+    private int tOnMin_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TOnMin {
+      get { return tOnMin_; }
+      set {
+        tOnMin_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TOffMin" field.</summary>
+    public const int TOffMinFieldNumber = 34;
+    private int tOffMin_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TOffMin {
+      get { return tOffMin_; }
+      set {
+        tOffMin_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as HardwareMotor);
@@ -420,6 +532,15 @@ namespace Tango.PMR.Hardware {
       if (FnSlpAcc != other.FnSlpAcc) return false;
       if (FnSlpDec != other.FnSlpDec) return false;
       if (FsSpd != other.FsSpd) return false;
+      if (GateCfg1 != other.GateCfg1) return false;
+      if (GateCfg2 != other.GateCfg2) return false;
+      if (TValHold != other.TValHold) return false;
+      if (TValRun != other.TValRun) return false;
+      if (TValAcc != other.TValAcc) return false;
+      if (TValDec != other.TValDec) return false;
+      if (TFast != other.TFast) return false;
+      if (TOnMin != other.TOnMin) return false;
+      if (TOffMin != other.TOffMin) return false;
       return true;
     }
 
@@ -451,6 +572,15 @@ namespace Tango.PMR.Hardware {
       if (FnSlpAcc != 0) hash ^= FnSlpAcc.GetHashCode();
       if (FnSlpDec != 0) hash ^= FnSlpDec.GetHashCode();
       if (FsSpd != 0) hash ^= FsSpd.GetHashCode();
+      if (GateCfg1 != 0) hash ^= GateCfg1.GetHashCode();
+      if (GateCfg2 != 0) hash ^= GateCfg2.GetHashCode();
+      if (TValHold != 0) hash ^= TValHold.GetHashCode();
+      if (TValRun != 0) hash ^= TValRun.GetHashCode();
+      if (TValAcc != 0) hash ^= TValAcc.GetHashCode();
+      if (TValDec != 0) hash ^= TValDec.GetHashCode();
+      if (TFast != 0) hash ^= TFast.GetHashCode();
+      if (TOnMin != 0) hash ^= TOnMin.GetHashCode();
+      if (TOffMin != 0) hash ^= TOffMin.GetHashCode();
       return hash;
     }
 
@@ -561,6 +691,42 @@ namespace Tango.PMR.Hardware {
         output.WriteRawTag(200, 1);
         output.WriteInt32(FsSpd);
       }
+      if (GateCfg1 != 0) {
+        output.WriteRawTag(208, 1);
+        output.WriteInt32(GateCfg1);
+      }
+      if (GateCfg2 != 0) {
+        output.WriteRawTag(216, 1);
+        output.WriteInt32(GateCfg2);
+      }
+      if (TValHold != 0) {
+        output.WriteRawTag(224, 1);
+        output.WriteInt32(TValHold);
+      }
+      if (TValRun != 0) {
+        output.WriteRawTag(232, 1);
+        output.WriteInt32(TValRun);
+      }
+      if (TValAcc != 0) {
+        output.WriteRawTag(240, 1);
+        output.WriteInt32(TValAcc);
+      }
+      if (TValDec != 0) {
+        output.WriteRawTag(248, 1);
+        output.WriteInt32(TValDec);
+      }
+      if (TFast != 0) {
+        output.WriteRawTag(128, 2);
+        output.WriteInt32(TFast);
+      }
+      if (TOnMin != 0) {
+        output.WriteRawTag(136, 2);
+        output.WriteInt32(TOnMin);
+      }
+      if (TOffMin != 0) {
+        output.WriteRawTag(144, 2);
+        output.WriteInt32(TOffMin);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -641,6 +807,33 @@ namespace Tango.PMR.Hardware {
       if (FsSpd != 0) {
         size += 2 + pb::CodedOutputStream.ComputeInt32Size(FsSpd);
       }
+      if (GateCfg1 != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(GateCfg1);
+      }
+      if (GateCfg2 != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(GateCfg2);
+      }
+      if (TValHold != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TValHold);
+      }
+      if (TValRun != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TValRun);
+      }
+      if (TValAcc != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TValAcc);
+      }
+      if (TValDec != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TValDec);
+      }
+      if (TFast != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TFast);
+      }
+      if (TOnMin != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TOnMin);
+      }
+      if (TOffMin != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TOffMin);
+      }
       return size;
     }
 
@@ -724,6 +917,33 @@ namespace Tango.PMR.Hardware {
       if (other.FsSpd != 0) {
         FsSpd = other.FsSpd;
       }
+      if (other.GateCfg1 != 0) {
+        GateCfg1 = other.GateCfg1;
+      }
+      if (other.GateCfg2 != 0) {
+        GateCfg2 = other.GateCfg2;
+      }
+      if (other.TValHold != 0) {
+        TValHold = other.TValHold;
+      }
+      if (other.TValRun != 0) {
+        TValRun = other.TValRun;
+      }
+      if (other.TValAcc != 0) {
+        TValAcc = other.TValAcc;
+      }
+      if (other.TValDec != 0) {
+        TValDec = other.TValDec;
+      }
+      if (other.TFast != 0) {
+        TFast = other.TFast;
+      }
+      if (other.TOnMin != 0) {
+        TOnMin = other.TOnMin;
+      }
+      if (other.TOffMin != 0) {
+        TOffMin = other.TOffMin;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -834,6 +1054,42 @@ namespace Tango.PMR.Hardware {
             FsSpd = input.ReadInt32();
             break;
           }
+          case 208: {
+            GateCfg1 = input.ReadInt32();
+            break;
+          }
+          case 216: {
+            GateCfg2 = input.ReadInt32();
+            break;
+          }
+          case 224: {
+            TValHold = input.ReadInt32();
+            break;
+          }
+          case 232: {
+            TValRun = input.ReadInt32();
+            break;
+          }
+          case 240: {
+            TValAcc = input.ReadInt32();
+            break;
+          }
+          case 248: {
+            TValDec = input.ReadInt32();
+            break;
+          }
+          case 256: {
+            TFast = input.ReadInt32();
+            break;
+          }
+          case 264: {
+            TOnMin = input.ReadInt32();
+            break;
+          }
+          case 272: {
+            TOffMin = input.ReadInt32();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotorType.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotorType.cs
index 3ba39df3a..501fa1ad0 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotorType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotorType.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Hardware {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChdIYXJkd2FyZU1vdG9yVHlwZS5wcm90bxISVGFuZ28uUE1SLkhhcmR3YXJl",
-            "KtwEChFIYXJkd2FyZU1vdG9yVHlwZRIVChFNT1RPX0RIX0NMRUFOSEVBRBAA",
+            "Ku8EChFIYXJkd2FyZU1vdG9yVHlwZRIVChFNT1RPX0RIX0NMRUFOSEVBRBAA",
             "EhUKEU1PVE9fREhfQ0xFQU5NRUNIEAESDwoLTU9UT19ESF9MSUQQAhIWChJN",
             "T1RPX0RSWUVSX0RSSVZJTkcQAxISCg5NT1RPX0RSWUVSX0xJRBAEEhYKEk1P",
             "VE9fRFJZRVJfTE9BREFSTRAFEhQKEE1PVE9fRElTUEVOU0VSXzEQBhIUChBN",
@@ -36,8 +36,8 @@ namespace Tango.PMR.Hardware {
             "Vk9UMRAUEhAKDE1PVE9fUkRBTkNFUhAVEhEKDU1PVE9fUkRSSVZJTkcQFhIR",
             "Cg1NT1RPX1JMT0FEQVJNEBcSEQoNTU9UT19STE9BRElORxAYEhEKDU1PVE9f",
             "U1BBUkUxXzEQGRIRCg1NT1RPX1NQQVJFMV8yEBoSEQoNTU9UT19TUEFSRTJf",
-            "MRAbEhEKDU1PVE9fU1BBUkUyXzIQHEIeChxjb20udHdpbmUudGFuZ28ucG1y",
-            "LmhhcmR3YXJlYgZwcm90bzM="));
+            "MRAbEhEKDU1PVE9fU1BBUkUyXzIQHBIRCg1NT1RPX1NQQVJFM18xEB1CHgoc",
+            "Y29tLnR3aW5lLnRhbmdvLnBtci5oYXJkd2FyZWIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.HardwareMotorType), }, null));
@@ -163,6 +163,10 @@ namespace Tango.PMR.Hardware {
     ///Spare 4 Motor
     /// </summary>
     [pbr::OriginalName("MOTO_SPARE2_2")] MotoSpare22 = 28,
+    /// <summary>
+    ///Spare 5 Motor
+    /// </summary>
+    [pbr::OriginalName("MOTO_SPARE3_1")] MotoSpare31 = 29,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index 7e417e64b..8502b506d 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -71,6 +71,7 @@
     <Compile Include="Connection\KeepAliveRequest.cs" />
     <Compile Include="Connection\KeepAliveResponse.cs" />
     <Compile Include="Debugging\DebugDistributor.cs" />
+    <Compile Include="Debugging\DebugDistributorType.cs" />
     <Compile Include="Debugging\DebugLogCategory.cs" />
     <Compile Include="Debugging\SetupDebugDisributorsRequest.cs" />
     <Compile Include="Debugging\SetupDebugDisributorsResponse.cs" />
@@ -288,7 +289,7 @@
   </PropertyGroup>
   <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
-- 
cgit v1.3.1


From e7b3004c2e28336d14c5ea2ec3203a51e0653d26 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 28 Jul 2019 11:07:43 +0300
Subject: Fixed group indices on excel import (catalogs module). Fixed catalogs
 reloading after save. Fixed catalogs grid 'display' 'company' columns.

---
 .../ViewModels/MainViewVM.cs                       | 32 ++++++++++++++++++----
 .../Views/CatalogView.xaml                         |  8 +++---
 .../Views/CatalogsView.xaml                        |  4 +--
 3 files changed, 32 insertions(+), 12 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
index 6494b9d2c..652ad3093 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
@@ -137,7 +137,6 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
         public MainViewVM()
         {
             Catalogs = new ObservableCollection<ColorCatalog>();
-            _catalogsContext = ObservablesContext.CreateDefault();
 
             EditCatalogCommand = new RelayCommand(EditSelectedCatalog, () => SelectedCatalog != null);
             NewCatalogCommand = new RelayCommand(CreateNewCatalog);
@@ -166,8 +165,17 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
             using (_notification.PushTaskItem("Loading color catalogs..."))
             {
                 IsFree = false;
+
+                if (_catalogsContext != null)
+                {
+                    _catalogsContext.Dispose();
+                }
+
+                _catalogsContext = ObservablesContext.CreateDefault();
+
                 Catalogs = (await _catalogsContext.ColorCatalogs.Include(x => x.ColorCatalogsGroups.Select(g => g.ColorCatalogsItems)).ToListAsync()).ToSynchronizedObservableCollection();
                 SelectedCatalog = null;
+
                 IsFree = true;
             }
         }
@@ -468,12 +476,24 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
                             var recipes = reader.GetData<ColorRecipe>("Recipes");
                             reader.Dispose();
 
-                            foreach (var group in groups.Where(x => !ActiveCatalog.ColorCatalogsGroups.ToList().Exists(y => y.Name == x.GroupName)))
+                            foreach (var group in groups)
                             {
-                                ColorCatalogsGroup newGroup = new ColorCatalogsGroup();
-                                newGroup.Name = group.GroupName;
-                                newGroup.GroupIndex = group.GroupIndex;
-                                ActiveCatalog.ColorCatalogsGroups.Add(newGroup);
+                                ColorCatalogsGroup existinGroup = ActiveCatalog.ColorCatalogsGroups.SingleOrDefault(x => x.Name == group.GroupName);
+
+                                bool inserting = false;
+                                if (existinGroup == null)
+                                {
+                                    existinGroup = new ColorCatalogsGroup();
+                                    inserting = true;
+                                }
+
+                                existinGroup.Name = group.GroupName;
+                                existinGroup.GroupIndex = group.GroupIndex;
+
+                                if (inserting)
+                                {
+                                    ActiveCatalog.ColorCatalogsGroups.Add(existinGroup);
+                                }
                             }
 
                             foreach (var item in colors)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml
index 9f3dd701a..6856cf4a2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml
@@ -191,16 +191,16 @@
                                         <DataGridTextColumn Header="G" Binding="{Binding Green,UpdateSourceTrigger=PropertyChanged}" Width="Auto" />
                                         <DataGridTextColumn Header="B" Binding="{Binding Blue,UpdateSourceTrigger=PropertyChanged}" Width="Auto" />
 
-                                        <DataGridTextColumn Header="L" Binding="{Binding L}" Width="65" />
-                                        <DataGridTextColumn Header="A" Binding="{Binding A}" Width="65" />
-                                        <DataGridTextColumn Header="B" Binding="{Binding B}" Width="65" />
+                                        <DataGridTextColumn Header="L" Binding="{Binding L}" Width="60" />
+                                        <DataGridTextColumn Header="A" Binding="{Binding A}" Width="60" />
+                                        <DataGridTextColumn Header="B" Binding="{Binding B}" Width="60" />
 
                                         <DataGridTextColumn Header="CYAN" Binding="{Binding Cyan}" Width="65" />
                                         <DataGridTextColumn Header="MAGENTA" Binding="{Binding Magenta}" Width="80" />
                                         <DataGridTextColumn Header="YELLOW" Binding="{Binding Yellow}" Width="70" />
                                         <DataGridTextColumn Header="BLACK" Binding="{Binding Black}" Width="65" />
 
-                                        <DataGridTextColumn Header="REGION" Binding="{Binding ProcessParametersTableIndex}" Width="Auto" />
+                                        <DataGridTextColumn Header="REGION" Binding="{Binding ProcessParametersTableIndex}" Width="69" />
                                     </DataGrid.Columns>
                                 </DataGrid>
                             </materialDesign:Card>
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..6bc9caf4c 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
@@ -63,9 +63,9 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>-->
-                        <DataGridTextColumn Header="COMPANY" Binding="{Binding Name}" Width="Auto" />
+                        <DataGridTextColumn Header="COMPANY" Binding="{Binding Company}" Width="Auto" />
                         <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
-                        <DataGridTextColumn Header="DESCRIPTION" Binding="{Binding Name}" Width="Auto" />
+                        <DataGridTextColumn Header="DESCRIPTION" Binding="{Binding Description}" Width="Auto" />
                         <DataGridTextColumn Header="DESIGN" Binding="{Binding Design}" Width="Auto" />
                         <DataGridTextColumn Header="GROUPS" Binding="{Binding ColorCatalogsGroups.Count}" Width="Auto" />
                         <DataGridTextColumn Header="COLORS" Binding="{Binding TotalColors}" Width="Auto" />
-- 
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')

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