Extra Inks Catalogs.

16 files changed, 499 insertions, 114 deletions

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index e0a18fa4a..2359814d3 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index ee132b57f..baeb93fd3 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
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
index 9d5011325..81d309bcc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs
@@ -24,6 +24,12 @@ namespace Tango.MachineStudio.Catalogs.Excel
         public double Magenta { get; set; }
         public double Yellow { get; set; }
         public double Black { get; set; }
+        public double BlueExtra { get; set; }
+        public double NavyExtra { get; set; }
+        public double OrangeExtra { get; set; }
+        public double RedExtra { get; set; }
+        public double RubineExtra { get; set; }
+        public double VioletExtra { get; set; }
         public int Region { get; set; }
     }
 }
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
index e57422725..27e5f84cf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx
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 ac00af5b0..88f14fa09 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
@@ -454,6 +454,12 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
                                 Magenta = x.Magenta,
                                 Yellow = x.Yellow,
                                 Black = x.Black,
+                                BlueExtra = x.BlueExtra,
+                                NavyExtra = x.NavyExtra,
+                                OrangeExtra = x.OrangeExtra,
+                                RedExtra = x.RedExtra,
+                                RubineExtra = x.RubineExtra,
+                                VioletExtra = x.VioletExtra,
                                 Region = x.ProcessParametersTableIndex,
 
                             }).ToList();
@@ -581,6 +587,12 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
                                 existinItem.Magenta = item.Magenta;
                                 existinItem.Yellow = item.Yellow;
                                 existinItem.Black = item.Black;
+                                existinItem.BlueExtra = item.BlueExtra;
+                                existinItem.NavyExtra = item.NavyExtra;
+                                existinItem.OrangeExtra = item.OrangeExtra;
+                                existinItem.RedExtra = item.RedExtra;
+                                existinItem.RubineExtra = item.RubineExtra;
+                                existinItem.VioletExtra = item.VioletExtra;
                                 existinItem.ProcessParametersTableIndex = item.Region;
 
                                 if (inserting)
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 5a49c93d3..1cc8c391b 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
@@ -164,7 +164,7 @@
                         </DockPanel>
 
 
-                        <DockPanel Margin="10" Grid.Column="1">
+                        <DockPanel Margin="10" Grid.Column="1" Grid.ColumnSpan="2">
                             <TextBlock DockPanel.Dock="Top" FontSize="16">
                                 <Run>GROUP COLORS</Run>
                                 <Run>(</Run><Run Text="{Binding SelectedGroup.ColorCatalogsItems.Count,Mode=OneWay}"></Run><Run>)</Run>
@@ -195,10 +195,16 @@
                                         <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="CYAN" Binding="{Binding Cyan}" Width="80" />
                                         <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="YELLOW" Binding="{Binding Yellow}" Width="80" />
+                                        <DataGridTextColumn Header="BLACK" Binding="{Binding Black}" Width="80" />
+                                        <DataGridTextColumn Header="BLUE" Binding="{Binding BlueExtra}" Width="80" />
+                                        <DataGridTextColumn Header="NAVY" Binding="{Binding NavyExtra}" Width="80" />
+                                        <DataGridTextColumn Header="ORANGE" Binding="{Binding OrangeExtra}" Width="80" />
+                                        <DataGridTextColumn Header="RED" Binding="{Binding RedExtra}" Width="80" />
+                                        <DataGridTextColumn Header="RUBINE" Binding="{Binding RubineExtra}" Width="80" />
+                                        <DataGridTextColumn Header="VIOLET" Binding="{Binding VioletExtra}" Width="80" />
 
                                         <DataGridTextColumn Header="REGION" Binding="{Binding ProcessParametersTableIndex}" Width="69" />
                                     </DataGrid.Columns>
@@ -206,7 +212,7 @@
                             </materialDesign:Card>
                         </DockPanel>
 
-                        <DockPanel Margin="10" Grid.Column="2">
+                        <DockPanel Margin="10" Grid.Column="2" Visibility="Collapsed">
                             <TextBlock DockPanel.Dock="Top" FontSize="16">
                                 <Run>COLOR MEDIA RECIPES</Run>
                                 <Run>(</Run><Run Text="{Binding SelectedItem.ColorCatalogsItemsRecipes.Count,Mode=OneWay}"></Run><Run>)</Run>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs
index a597a4c50..b24611796 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs
@@ -809,10 +809,38 @@ namespace Tango.PPC.Jobs.Dialogs
                 TargetB = BrushStopModel.ColorCatalogsItem.B;
                 BrushStopModel.PreventPropertyUpdate = true;
                 BrushStopModel.LiquidVolumes.ResetVolume();
-                BrushStopModel.LiquidVolumes.GetLiquidVolume(LiquidTypes.Cyan).Volume = brushstop.ColorCatalogsItem.Cyan;
-                BrushStopModel.LiquidVolumes.GetLiquidVolume(LiquidTypes.Magenta).Volume = brushstop.ColorCatalogsItem.Magenta;
-                BrushStopModel.LiquidVolumes.GetLiquidVolume(LiquidTypes.Yellow).Volume = brushstop.ColorCatalogsItem.Yellow;
-                BrushStopModel.LiquidVolumes.GetLiquidVolume(LiquidTypes.Black).Volume = brushstop.ColorCatalogsItem.Black;
+
+                var cyanVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("cyan");
+                if (cyanVolume != null) cyanVolume.Volume = brushstop.ColorCatalogsItem.Cyan;
+
+                var magentaVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("magenta");
+                if (magentaVolume != null) magentaVolume.Volume = brushstop.ColorCatalogsItem.Magenta;
+
+                var yellowVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("yellow");
+                if (yellowVolume != null) yellowVolume.Volume = brushstop.ColorCatalogsItem.Yellow;
+
+                var blackVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("black");
+                if (blackVolume != null) blackVolume.Volume = brushstop.ColorCatalogsItem.Black;
+
+                var blueVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("blue");
+                if (blueVolume != null) blueVolume.Volume = brushstop.ColorCatalogsItem.Blue;
+
+                var navyVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("navy");
+                if (navyVolume != null) navyVolume.Volume = brushstop.ColorCatalogsItem.NavyExtra;
+
+                var orangeVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("orange");
+                if (orangeVolume != null) orangeVolume.Volume = brushstop.ColorCatalogsItem.OrangeExtra;
+
+                var redVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("red");
+                if (redVolume != null) redVolume.Volume = brushstop.ColorCatalogsItem.RedExtra;
+
+                var rubineVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("rubine");
+                if (rubineVolume != null) rubineVolume.Volume = brushstop.ColorCatalogsItem.RubineExtra;
+
+                var violetVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("violet");
+                if (violetVolume != null) violetVolume.Volume = brushstop.ColorCatalogsItem.VioletExtra;
+
+
                 BrushStopModel.PreventPropertyUpdate = false;
                 IsOnlyManual = false;
             }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
index 5634f783e..dd82d8d1a 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
@@ -1351,10 +1351,17 @@ namespace Tango.PPC.Jobs.Models
                         if (ColorCatalogsItem != null)
                         {
                             LiquidVolumes.ResetVolumeSilent();
-                            LiquidVolumes.GetLiquidVolume(LiquidTypes.Cyan).SetVolumeSilent(ColorCatalogsItem.Cyan);
-                            LiquidVolumes.GetLiquidVolume(LiquidTypes.Magenta).SetVolumeSilent(ColorCatalogsItem.Magenta);
-                            LiquidVolumes.GetLiquidVolume(LiquidTypes.Yellow).SetVolumeSilent(ColorCatalogsItem.Yellow);
-                            LiquidVolumes.GetLiquidVolume(LiquidTypes.Black).SetVolumeSilent(ColorCatalogsItem.Black);
+
+                            LiquidVolumes.FindLiquidVolumeForCatalog("cyan")?.SetVolumeSilent(ColorCatalogsItem.Cyan);
+                            LiquidVolumes.FindLiquidVolumeForCatalog("magenta")?.SetVolumeSilent(ColorCatalogsItem.Magenta);
+                            LiquidVolumes.FindLiquidVolumeForCatalog("yellow")?.SetVolumeSilent(ColorCatalogsItem.Yellow);
+                            LiquidVolumes.FindLiquidVolumeForCatalog("black")?.SetVolumeSilent(ColorCatalogsItem.Black);
+                            LiquidVolumes.FindLiquidVolumeForCatalog("blue")?.SetVolumeSilent(ColorCatalogsItem.BlueExtra);
+                            LiquidVolumes.FindLiquidVolumeForCatalog("navy")?.SetVolumeSilent(ColorCatalogsItem.NavyExtra);
+                            LiquidVolumes.FindLiquidVolumeForCatalog("orange")?.SetVolumeSilent(ColorCatalogsItem.OrangeExtra);
+                            LiquidVolumes.FindLiquidVolumeForCatalog("red")?.SetVolumeSilent(ColorCatalogsItem.RedExtra);
+                            LiquidVolumes.FindLiquidVolumeForCatalog("rubine")?.SetVolumeSilent(ColorCatalogsItem.RubineExtra);
+                            LiquidVolumes.FindLiquidVolumeForCatalog("violet")?.SetVolumeSilent(ColorCatalogsItem.VioletExtra);
                             LiquidVolumes.RaiseVolume();
                             IsOutOfGamut = false;
                             // RaisePropertyChanged(nameof(IsLiquidVolumesOutOfRange));
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/LiquidVolumesCollection.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/LiquidVolumesCollection.cs
index 704fc36b0..8eaae4452 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/LiquidVolumesCollection.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/LiquidVolumesCollection.cs
@@ -43,6 +43,12 @@ namespace Tango.PPC.Jobs.Models
             return this.FirstOrDefault(x => x.IdsPack.LiquidType.Type == (LiquidTypes)type);
         }
 
+        public LiquidVolumeModel FindLiquidVolumeForCatalog(String name)
+        {
+            var volume = this.Where(x => x.IdsPack.LiquidType.HasPigment && !x.IdsPack.LiquidType.IsLightInk).FirstOrDefault(x => x.IdsPack.LiquidType.Type.ToString().ToLower().Contains(name.ToLower()));
+            return volume;
+        }
+
         public void Undo()
         {
             this.ToList().ForEach(x => x.Undo());
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs
index 4b2609281..519af0f96 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs
@@ -141,5 +141,53 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// blue extra
+        /// </summary>
+        public Double BlueExtra 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// navy extra
+        /// </summary>
+        public Double NavyExtra 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// orange extra
+        /// </summary>
+        public Double OrangeExtra 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// red extra
+        /// </summary>
+        public Double RedExtra 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// rubine extra
+        /// </summary>
+        public Double RubineExtra 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// violet extra
+        /// </summary>
+        public Double VioletExtra 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
index f41cfec9c..b26576647 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
@@ -684,17 +684,37 @@ namespace Tango.BL.Entities
                             {
                                 if (LiquidVolumes != null)
                                 {
-                                    var cyan = LiquidVolumes.FirstOrDefault(x => x.LiquidType == LiquidTypes.Cyan);
+                                    var noneLightLiquidVolumes = LiquidVolumes.Where(x => !x.IdsPack.LiquidType.IsLightInk && x.IdsPack.LiquidType.HasPigment).ToList();
+
+                                    var cyan = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("cyan"));
                                     if (cyan != null) cyan.Volume = ColorCatalogsItem.Cyan;
 
-                                    var magenta = LiquidVolumes.FirstOrDefault(x => x.LiquidType == LiquidTypes.Magenta);
+                                    var magenta = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("magenta"));
                                     if (magenta != null) magenta.Volume = ColorCatalogsItem.Magenta;
 
-                                    var yellow = LiquidVolumes.FirstOrDefault(x => x.LiquidType == LiquidTypes.Yellow);
+                                    var yellow = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("yellow"));
                                     if (yellow != null) yellow.Volume = ColorCatalogsItem.Yellow;
 
-                                    var black = LiquidVolumes.FirstOrDefault(x => x.LiquidType == LiquidTypes.Black);
+                                    var black = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("black"));
                                     if (black != null) black.Volume = ColorCatalogsItem.Black;
+
+                                    var blue = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("blue"));
+                                    if (blue != null) blue.Volume = ColorCatalogsItem.BlueExtra;
+
+                                    var navy = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("navy"));
+                                    if (navy != null) navy.Volume = ColorCatalogsItem.NavyExtra;
+
+                                    var orange = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("orange"));
+                                    if (orange != null) orange.Volume = ColorCatalogsItem.OrangeExtra;
+
+                                    var red = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("red"));
+                                    if (red != null) red.Volume = ColorCatalogsItem.RedExtra;
+
+                                    var rubine = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("rubine"));
+                                    if (rubine != null) red.Volume = ColorCatalogsItem.RubineExtra;
+
+                                    var violet = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("violet"));
+                                    if (violet != null) violet.Volume = ColorCatalogsItem.VioletExtra;
                                 }
                             }
                             catch (Exception ex)
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs
index 30d77a051..b866dc6fe 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs
@@ -55,6 +55,18 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Int32> ProcessParametersTableIndexChanged;
 
+        public event EventHandler<Double> BlueExtraChanged;
+
+        public event EventHandler<Double> NavyExtraChanged;
+
+        public event EventHandler<Double> OrangeExtraChanged;
+
+        public event EventHandler<Double> RedExtraChanged;
+
+        public event EventHandler<Double> RubineExtraChanged;
+
+        public event EventHandler<Double> VioletExtraChanged;
+
         public event EventHandler<SynchronizedObservableCollection<BrushStop>> BrushStopsChanged;
 
         public event EventHandler<ColorCatalogsGroup> ColorCatalogsGroupChanged;
@@ -465,6 +477,168 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Double _blueextra;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase blue extra.
+        /// </summary>
+
+        [Column("BLUE_EXTRA")]
+
+        public  Double BlueExtra
+        {
+            get 
+            {
+                return _blueextra; 
+            }
+
+            set 
+            {
+                if (_blueextra != value)
+                {
+                    _blueextra = value;
+
+                    OnBlueExtraChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _navyextra;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase navy extra.
+        /// </summary>
+
+        [Column("NAVY_EXTRA")]
+
+        public  Double NavyExtra
+        {
+            get 
+            {
+                return _navyextra; 
+            }
+
+            set 
+            {
+                if (_navyextra != value)
+                {
+                    _navyextra = value;
+
+                    OnNavyExtraChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _orangeextra;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase orange extra.
+        /// </summary>
+
+        [Column("ORANGE_EXTRA")]
+
+        public  Double OrangeExtra
+        {
+            get 
+            {
+                return _orangeextra; 
+            }
+
+            set 
+            {
+                if (_orangeextra != value)
+                {
+                    _orangeextra = value;
+
+                    OnOrangeExtraChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _redextra;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase red extra.
+        /// </summary>
+
+        [Column("RED_EXTRA")]
+
+        public  Double RedExtra
+        {
+            get 
+            {
+                return _redextra; 
+            }
+
+            set 
+            {
+                if (_redextra != value)
+                {
+                    _redextra = value;
+
+                    OnRedExtraChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _rubineextra;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase rubine extra.
+        /// </summary>
+
+        [Column("RUBINE_EXTRA")]
+
+        public  Double RubineExtra
+        {
+            get 
+            {
+                return _rubineextra; 
+            }
+
+            set 
+            {
+                if (_rubineextra != value)
+                {
+                    _rubineextra = value;
+
+                    OnRubineExtraChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _violetextra;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase violet extra.
+        /// </summary>
+
+        [Column("VIOLET_EXTRA")]
+
+        public  Double VioletExtra
+        {
+            get 
+            {
+                return _violetextra; 
+            }
+
+            set 
+            {
+                if (_violetextra != value)
+                {
+                    _violetextra = value;
+
+                    OnVioletExtraChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<BrushStop> _brushstops;
 
         /// <summary>
@@ -674,6 +848,60 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the BlueExtra has changed.
+        /// </summary>
+        protected virtual void OnBlueExtraChanged(Double blueextra)
+        {
+            BlueExtraChanged?.Invoke(this, blueextra);
+            RaisePropertyChanged(nameof(BlueExtra));
+        }
+
+        /// <summary>
+        /// Called when the NavyExtra has changed.
+        /// </summary>
+        protected virtual void OnNavyExtraChanged(Double navyextra)
+        {
+            NavyExtraChanged?.Invoke(this, navyextra);
+            RaisePropertyChanged(nameof(NavyExtra));
+        }
+
+        /// <summary>
+        /// Called when the OrangeExtra has changed.
+        /// </summary>
+        protected virtual void OnOrangeExtraChanged(Double orangeextra)
+        {
+            OrangeExtraChanged?.Invoke(this, orangeextra);
+            RaisePropertyChanged(nameof(OrangeExtra));
+        }
+
+        /// <summary>
+        /// Called when the RedExtra has changed.
+        /// </summary>
+        protected virtual void OnRedExtraChanged(Double redextra)
+        {
+            RedExtraChanged?.Invoke(this, redextra);
+            RaisePropertyChanged(nameof(RedExtra));
+        }
+
+        /// <summary>
+        /// Called when the RubineExtra has changed.
+        /// </summary>
+        protected virtual void OnRubineExtraChanged(Double rubineextra)
+        {
+            RubineExtraChanged?.Invoke(this, rubineextra);
+            RaisePropertyChanged(nameof(RubineExtra));
+        }
+
+        /// <summary>
+        /// Called when the VioletExtra has changed.
+        /// </summary>
+        protected virtual void OnVioletExtraChanged(Double violetextra)
+        {
+            VioletExtraChanged?.Invoke(this, violetextra);
+            RaisePropertyChanged(nameof(VioletExtra));
+        }
+
+        /// <summary>
         /// Called when the BrushStops has changed.
         /// </summary>
         protected virtual void OnBrushStopsChanged(SynchronizedObservableCollection<BrushStop> brushstops)
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 d24ec2c8d..ccf91fb22 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
@@ -39,6 +39,12 @@ namespace Tango.DAL.Remote.DB
         public double A { get; set; }
         public double B { get; set; }
         public int PROCESS_PARAMETERS_TABLE_INDEX { get; set; }
+        public double BLUE_EXTRA { get; set; }
+        public double NAVY_EXTRA { get; set; }
+        public double ORANGE_EXTRA { get; set; }
+        public double RED_EXTRA { get; set; }
+        public double RUBINE_EXTRA { get; set; }
+        public double VIOLET_EXTRA { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<BRUSH_STOPS> BRUSH_STOPS { 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 93ca57214..7d61b95e1 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -243,6 +243,12 @@
           <Property Name="A" Type="float" Nullable="false" />
           <Property Name="B" Type="float" Nullable="false" />
           <Property Name="PROCESS_PARAMETERS_TABLE_INDEX" Type="int" Nullable="false" />
+          <Property Name="BLUE_EXTRA" Type="float" Nullable="false" />
+          <Property Name="NAVY_EXTRA" Type="float" Nullable="false" />
+          <Property Name="ORANGE_EXTRA" Type="float" Nullable="false" />
+          <Property Name="RED_EXTRA" Type="float" Nullable="false" />
+          <Property Name="RUBINE_EXTRA" Type="float" Nullable="false" />
+          <Property Name="VIOLET_EXTRA" Type="float" Nullable="false" />
         </EntityType>
         <EntityType Name="COLOR_CATALOGS_ITEMS_RECIPES">
           <Key>
@@ -5957,6 +5963,12 @@
           <Property Name="A" Type="Double" Nullable="false" />
           <Property Name="B" Type="Double" Nullable="false" />
           <Property Name="PROCESS_PARAMETERS_TABLE_INDEX" Type="Int32" Nullable="false" />
+          <Property Name="BLUE_EXTRA" Type="Double" Nullable="false" />
+          <Property Name="NAVY_EXTRA" Type="Double" Nullable="false" />
+          <Property Name="ORANGE_EXTRA" Type="Double" Nullable="false" />
+          <Property Name="RED_EXTRA" Type="Double" Nullable="false" />
+          <Property Name="RUBINE_EXTRA" Type="Double" Nullable="false" />
+          <Property Name="VIOLET_EXTRA" Type="Double" Nullable="false" />
           <NavigationProperty Name="BRUSH_STOPS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_CATALOGS_ITEMS" FromRole="COLOR_CATALOGS_ITEMS" ToRole="BRUSH_STOPS" />
           <NavigationProperty Name="COLOR_CATALOGS_GROUPS" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_COLOR_CATALOGS_GROUPS" FromRole="COLOR_CATALOGS_ITEMS" ToRole="COLOR_CATALOGS_GROUPS" />
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS_RECIPES" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_COLOR_CATALOGS_ITEMS" FromRole="COLOR_CATALOGS_ITEMS" ToRole="COLOR_CATALOGS_ITEMS_RECIPES" />
@@ -9542,6 +9554,12 @@
           <EntitySetMapping Name="COLOR_CATALOGS_ITEMS">
             <EntityTypeMapping TypeName="RemoteModel.COLOR_CATALOGS_ITEMS">
               <MappingFragment StoreEntitySet="COLOR_CATALOGS_ITEMS">
+                <ScalarProperty Name="VIOLET_EXTRA" ColumnName="VIOLET_EXTRA" />
+                <ScalarProperty Name="RUBINE_EXTRA" ColumnName="RUBINE_EXTRA" />
+                <ScalarProperty Name="RED_EXTRA" ColumnName="RED_EXTRA" />
+                <ScalarProperty Name="ORANGE_EXTRA" ColumnName="ORANGE_EXTRA" />
+                <ScalarProperty Name="NAVY_EXTRA" ColumnName="NAVY_EXTRA" />
+                <ScalarProperty Name="BLUE_EXTRA" ColumnName="BLUE_EXTRA" />
                 <ScalarProperty Name="PROCESS_PARAMETERS_TABLE_INDEX" ColumnName="PROCESS_PARAMETERS_TABLE_INDEX" />
                 <ScalarProperty Name="B" ColumnName="B" />
                 <ScalarProperty Name="A" ColumnName="A" />
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 b032b64d6..a0306b022 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,103 +5,103 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="58">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="54.875" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="89.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="76" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="48.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="79" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="10.75" PointY="9" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="21" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="38.75" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="12" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="43.125" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="21.75" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="45" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="1.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="2" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="25.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_MEASUREMENTS" Width="1.5" PointX="2.75" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="4.75" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="33.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="54.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="93.25" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="30.5" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="68.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="98.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="97.5" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="68.5" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="83.125" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="35.875" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="21.5" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="34.625" />
-        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="15.25" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="12.75" PointY="9" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="102.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="72.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="8.5" PointY="89.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="10.75" PointY="68.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="5.5" PointY="85.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="7.75" PointY="67.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="93.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="72.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="106.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="77.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="93.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="76.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="71.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="89.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="73" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="39.875" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="34.625" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="14.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="22" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="26.25" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="7.125" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="25.875" />
-        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="29.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="11.75" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="44.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="64.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="56.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="50.5" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="18.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="32.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="42.125" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="36.25" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="84.125" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="63.5" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="50.125" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="56.375" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="8.75" PointY="5.25" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="11" PointY="5.5" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="11" PointY="1.25" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.5" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="29.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="59.5" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="59.5" />
-        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="16.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="25.75" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="26" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="17.75" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="8.25" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="22.125" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="11.25" PointY="17.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="16.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="40.125" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="5.75" PointY="7" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="5" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="50.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="16.75" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="16.75" PointY="14" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="16.75" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="18.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="11" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="37.125" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="38.5" />
-        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="8.75" PointY="1.75" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="43.125" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="39.75" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="4.5" PointY="40.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="73.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="76" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="70.25" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="3.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="21.25" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="39.875" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="36.5" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9.75" PointY="62.375" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="30" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="46" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="5.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="25.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_MEASUREMENTS" Width="1.5" PointX="14.75" PointY="9.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="5.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="7.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="73" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="4.5" PointY="36.875" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="39.375" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="79.25" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="7.5" PointY="92.25" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9.75" PointY="91.625" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="67.25" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="21.5" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="43.125" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="34.5" />
+        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="26.25" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="7.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="87.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="87.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="83.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="79.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="10.5" PointY="104.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12.75" PointY="83.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.5" PointY="71.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="14.75" PointY="69.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.5" PointY="100.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9.75" PointY="83.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.5" PointY="96.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="11.75" PointY="75.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="79" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="11.5" PointY="100.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="13.75" PointY="79.5" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9.75" PointY="65.375" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="12" PointY="43.5" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="22.25" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="18.625" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="14.125" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="22.125" />
+        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="12.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="5.75" PointY="8.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="18.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="83.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="71.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="54.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="15.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="33.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="30.5" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9.75" PointY="59.125" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6.75" PointY="38.875" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="10.375" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="50.25" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="56.5" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="11.75" PointY="5.5" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="14" PointY="5.625" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="13" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.75" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="21.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="14.25" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="14.375" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="13.75" PointY="18.25" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="26" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="26.25" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="12" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="8.25" PointY="4.625" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="26.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="8.25" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="16.125" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="48.5" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="18.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="18.75" PointY="4.25" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="12.25" PointY="59.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="9.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="18.75" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="18.75" PointY="16.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="20.75" PointY="6.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="20.75" PointY="11.25" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="30.875" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="32.375" />
+        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="10.75" PointY="2" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="44.875" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml
index 0e232786a..6336e4c11 100644
--- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml
+++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml