New Extra Inks DB, PMR, BL.

15 files changed, 2383 insertions, 109 deletions

diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
index 08e8d7337..6543ce97b 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
@@ -421,5 +421,301 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// tw transparent ink quantity
+        /// </summary>
+        public Int64 TwTransparentInkQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// c1 ti quantity
+        /// </summary>
+        public Int64 C1TiQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// tw cyan quantity
+        /// </summary>
+        public Int64 TwCyanQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// tw light cyan quantity
+        /// </summary>
+        public Int64 TwLightCyanQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// tw magenta quantity
+        /// </summary>
+        public Int64 TwMagentaQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// tw light magenta quantity
+        /// </summary>
+        public Int64 TwLightMagentaQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// tw yellow quantity
+        /// </summary>
+        public Int64 TwYellowQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// tw light yellow quantity
+        /// </summary>
+        public Int64 TwLightYellowQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// c1 yellow quantity
+        /// </summary>
+        public Int64 C1YellowQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// c1 light yellow quantity
+        /// </summary>
+        public Int64 C1LightYellowQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// tw black quantity
+        /// </summary>
+        public Int64 TwBlackQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// tw violet quantity
+        /// </summary>
+        public Int64 TwVioletQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// tw light violet quantity
+        /// </summary>
+        public Int64 TwLightVioletQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// ct blue quantity
+        /// </summary>
+        public Int64 CtBlueQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// ct light blue quantity
+        /// </summary>
+        public Int64 CtLightBlueQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// ct rubine quantity
+        /// </summary>
+        public Int64 CtRubineQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// ct light rubine quantity
+        /// </summary>
+        public Int64 CtLightRubineQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// ct orange quantity
+        /// </summary>
+        public Int64 CtOrangeQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// ct light orange quantity
+        /// </summary>
+        public Int64 CtLightOrangeQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// ct navy quantity
+        /// </summary>
+        public Int64 CtNavyQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// hd blue quantity
+        /// </summary>
+        public Int64 HdBlueQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// hd light blue quantity
+        /// </summary>
+        public Int64 HdLightBlueQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// hd rubine quantity
+        /// </summary>
+        public Int64 HdRubineQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// hd light rubine quantity
+        /// </summary>
+        public Int64 HdLightRubineQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// hd orange quantity
+        /// </summary>
+        public Int64 HdOrangeQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// hd light orange quantity
+        /// </summary>
+        public Int64 HdLightOrangeQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// hd navy quantity
+        /// </summary>
+        public Int64 HdNavyQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// hd light navy quantity
+        /// </summary>
+        public Int64 HdLightNavyQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// am blue quantity
+        /// </summary>
+        public Int64 AmBlueQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// am light blue quantity
+        /// </summary>
+        public Int64 AmLightBlueQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// am red quantity
+        /// </summary>
+        public Int64 AmRedQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// am light red quantity
+        /// </summary>
+        public Int64 AmLightRedQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// am orange quantity
+        /// </summary>
+        public Int64 AmOrangeQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// am light orange quantity
+        /// </summary>
+        public Int64 AmLightOrangeQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// am yellow quantity
+        /// </summary>
+        public Int64 AmYellowQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// am light yellow quantity
+        /// </summary>
+        public Int64 AmLightYellowQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// am black quantity
+        /// </summary>
+        public Int64 AmBlackQuantity 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTOBase.cs
index eba35dbd6..5d860f0ae 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTOBase.cs
@@ -109,5 +109,13 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// display name
+        /// </summary>
+        public String DisplayName 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
index e3b9f676c..460d1f193 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
@@ -437,5 +437,13 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// default liquid factor
+        /// </summary>
+        public Double DefaultLiquidFactor 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
index 54685f7ee..327d8ac85 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
@@ -117,6 +117,80 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Int64> VioletQuantityChanged;
 
+        public event EventHandler<Int64> TwTransparentInkQuantityChanged;
+
+        public event EventHandler<Int64> C1TiQuantityChanged;
+
+        public event EventHandler<Int64> TwCyanQuantityChanged;
+
+        public event EventHandler<Int64> TwLightCyanQuantityChanged;
+
+        public event EventHandler<Int64> TwMagentaQuantityChanged;
+
+        public event EventHandler<Int64> TwLightMagentaQuantityChanged;
+
+        public event EventHandler<Int64> TwYellowQuantityChanged;
+
+        public event EventHandler<Int64> TwLightYellowQuantityChanged;
+
+        public event EventHandler<Int64> C1YellowQuantityChanged;
+
+        public event EventHandler<Int64> C1LightYellowQuantityChanged;
+
+        public event EventHandler<Int64> TwBlackQuantityChanged;
+
+        public event EventHandler<Int64> TwVioletQuantityChanged;
+
+        public event EventHandler<Int64> TwLightVioletQuantityChanged;
+
+        public event EventHandler<Int64> CtBlueQuantityChanged;
+
+        public event EventHandler<Int64> CtLightBlueQuantityChanged;
+
+        public event EventHandler<Int64> CtRubineQuantityChanged;
+
+        public event EventHandler<Int64> CtLightRubineQuantityChanged;
+
+        public event EventHandler<Int64> CtOrangeQuantityChanged;
+
+        public event EventHandler<Int64> CtLightOrangeQuantityChanged;
+
+        public event EventHandler<Int64> CtNavyQuantityChanged;
+
+        public event EventHandler<Int64> HdBlueQuantityChanged;
+
+        public event EventHandler<Int64> HdLightBlueQuantityChanged;
+
+        public event EventHandler<Int64> HdRubineQuantityChanged;
+
+        public event EventHandler<Int64> HdLightRubineQuantityChanged;
+
+        public event EventHandler<Int64> HdOrangeQuantityChanged;
+
+        public event EventHandler<Int64> HdLightOrangeQuantityChanged;
+
+        public event EventHandler<Int64> HdNavyQuantityChanged;
+
+        public event EventHandler<Int64> HdLightNavyQuantityChanged;
+
+        public event EventHandler<Int64> AmBlueQuantityChanged;
+
+        public event EventHandler<Int64> AmLightBlueQuantityChanged;
+
+        public event EventHandler<Int64> AmRedQuantityChanged;
+
+        public event EventHandler<Int64> AmLightRedQuantityChanged;
+
+        public event EventHandler<Int64> AmOrangeQuantityChanged;
+
+        public event EventHandler<Int64> AmLightOrangeQuantityChanged;
+
+        public event EventHandler<Int64> AmYellowQuantityChanged;
+
+        public event EventHandler<Int64> AmLightYellowQuantityChanged;
+
+        public event EventHandler<Int64> AmBlackQuantityChanged;
+
         protected String _machineguid;
 
         /// <summary>
@@ -1459,6 +1533,1005 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Int64 _twtransparentinkquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase tw transparent ink quantity.
+        /// </summary>
+
+        [Column("TW_TRANSPARENT_INK_QUANTITY")]
+
+        public  Int64 TwTransparentInkQuantity
+        {
+            get 
+            {
+                return _twtransparentinkquantity; 
+            }
+
+            set 
+            {
+                if (_twtransparentinkquantity != value)
+                {
+                    _twtransparentinkquantity = value;
+
+                    OnTwTransparentInkQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _c1tiquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase c1 ti quantity.
+        /// </summary>
+
+        [Column("C1_TI_QUANTITY")]
+
+        public  Int64 C1TiQuantity
+        {
+            get 
+            {
+                return _c1tiquantity; 
+            }
+
+            set 
+            {
+                if (_c1tiquantity != value)
+                {
+                    _c1tiquantity = value;
+
+                    OnC1TiQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _twcyanquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase tw cyan quantity.
+        /// </summary>
+
+        [Column("TW_CYAN_QUANTITY")]
+
+        public  Int64 TwCyanQuantity
+        {
+            get 
+            {
+                return _twcyanquantity; 
+            }
+
+            set 
+            {
+                if (_twcyanquantity != value)
+                {
+                    _twcyanquantity = value;
+
+                    OnTwCyanQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _twlightcyanquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase tw light cyan quantity.
+        /// </summary>
+
+        [Column("TW_LIGHT_CYAN_QUANTITY")]
+
+        public  Int64 TwLightCyanQuantity
+        {
+            get 
+            {
+                return _twlightcyanquantity; 
+            }
+
+            set 
+            {
+                if (_twlightcyanquantity != value)
+                {
+                    _twlightcyanquantity = value;
+
+                    OnTwLightCyanQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _twmagentaquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase tw magenta quantity.
+        /// </summary>
+
+        [Column("TW_MAGENTA_QUANTITY")]
+
+        public  Int64 TwMagentaQuantity
+        {
+            get 
+            {
+                return _twmagentaquantity; 
+            }
+
+            set 
+            {
+                if (_twmagentaquantity != value)
+                {
+                    _twmagentaquantity = value;
+
+                    OnTwMagentaQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _twlightmagentaquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase tw light magenta quantity.
+        /// </summary>
+
+        [Column("TW_LIGHT_MAGENTA_QUANTITY")]
+
+        public  Int64 TwLightMagentaQuantity
+        {
+            get 
+            {
+                return _twlightmagentaquantity; 
+            }
+
+            set 
+            {
+                if (_twlightmagentaquantity != value)
+                {
+                    _twlightmagentaquantity = value;
+
+                    OnTwLightMagentaQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _twyellowquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase tw yellow quantity.
+        /// </summary>
+
+        [Column("TW_YELLOW_QUANTITY")]
+
+        public  Int64 TwYellowQuantity
+        {
+            get 
+            {
+                return _twyellowquantity; 
+            }
+
+            set 
+            {
+                if (_twyellowquantity != value)
+                {
+                    _twyellowquantity = value;
+
+                    OnTwYellowQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _twlightyellowquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase tw light yellow quantity.
+        /// </summary>
+
+        [Column("TW_LIGHT_YELLOW_QUANTITY")]
+
+        public  Int64 TwLightYellowQuantity
+        {
+            get 
+            {
+                return _twlightyellowquantity; 
+            }
+
+            set 
+            {
+                if (_twlightyellowquantity != value)
+                {
+                    _twlightyellowquantity = value;
+
+                    OnTwLightYellowQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _c1yellowquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase c1 yellow quantity.
+        /// </summary>
+
+        [Column("C1_YELLOW_QUANTITY")]
+
+        public  Int64 C1YellowQuantity
+        {
+            get 
+            {
+                return _c1yellowquantity; 
+            }
+
+            set 
+            {
+                if (_c1yellowquantity != value)
+                {
+                    _c1yellowquantity = value;
+
+                    OnC1YellowQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _c1lightyellowquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase c1 light yellow quantity.
+        /// </summary>
+
+        [Column("C1_LIGHT_YELLOW_QUANTITY")]
+
+        public  Int64 C1LightYellowQuantity
+        {
+            get 
+            {
+                return _c1lightyellowquantity; 
+            }
+
+            set 
+            {
+                if (_c1lightyellowquantity != value)
+                {
+                    _c1lightyellowquantity = value;
+
+                    OnC1LightYellowQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _twblackquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase tw black quantity.
+        /// </summary>
+
+        [Column("TW_BLACK_QUANTITY")]
+
+        public  Int64 TwBlackQuantity
+        {
+            get 
+            {
+                return _twblackquantity; 
+            }
+
+            set 
+            {
+                if (_twblackquantity != value)
+                {
+                    _twblackquantity = value;
+
+                    OnTwBlackQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _twvioletquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase tw violet quantity.
+        /// </summary>
+
+        [Column("TW_VIOLET_QUANTITY")]
+
+        public  Int64 TwVioletQuantity
+        {
+            get 
+            {
+                return _twvioletquantity; 
+            }
+
+            set 
+            {
+                if (_twvioletquantity != value)
+                {
+                    _twvioletquantity = value;
+
+                    OnTwVioletQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _twlightvioletquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase tw light violet quantity.
+        /// </summary>
+
+        [Column("TW_LIGHT_VIOLET_QUANTITY")]
+
+        public  Int64 TwLightVioletQuantity
+        {
+            get 
+            {
+                return _twlightvioletquantity; 
+            }
+
+            set 
+            {
+                if (_twlightvioletquantity != value)
+                {
+                    _twlightvioletquantity = value;
+
+                    OnTwLightVioletQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _ctbluequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase ct blue quantity.
+        /// </summary>
+
+        [Column("CT_BLUE_QUANTITY")]
+
+        public  Int64 CtBlueQuantity
+        {
+            get 
+            {
+                return _ctbluequantity; 
+            }
+
+            set 
+            {
+                if (_ctbluequantity != value)
+                {
+                    _ctbluequantity = value;
+
+                    OnCtBlueQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _ctlightbluequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase ct light blue quantity.
+        /// </summary>
+
+        [Column("CT_LIGHT_BLUE_QUANTITY")]
+
+        public  Int64 CtLightBlueQuantity
+        {
+            get 
+            {
+                return _ctlightbluequantity; 
+            }
+
+            set 
+            {
+                if (_ctlightbluequantity != value)
+                {
+                    _ctlightbluequantity = value;
+
+                    OnCtLightBlueQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _ctrubinequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase ct rubine quantity.
+        /// </summary>
+
+        [Column("CT_RUBINE_QUANTITY")]
+
+        public  Int64 CtRubineQuantity
+        {
+            get 
+            {
+                return _ctrubinequantity; 
+            }
+
+            set 
+            {
+                if (_ctrubinequantity != value)
+                {
+                    _ctrubinequantity = value;
+
+                    OnCtRubineQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _ctlightrubinequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase ct light rubine quantity.
+        /// </summary>
+
+        [Column("CT_LIGHT_RUBINE_QUANTITY")]
+
+        public  Int64 CtLightRubineQuantity
+        {
+            get 
+            {
+                return _ctlightrubinequantity; 
+            }
+
+            set 
+            {
+                if (_ctlightrubinequantity != value)
+                {
+                    _ctlightrubinequantity = value;
+
+                    OnCtLightRubineQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _ctorangequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase ct orange quantity.
+        /// </summary>
+
+        [Column("CT_ORANGE_QUANTITY")]
+
+        public  Int64 CtOrangeQuantity
+        {
+            get 
+            {
+                return _ctorangequantity; 
+            }
+
+            set 
+            {
+                if (_ctorangequantity != value)
+                {
+                    _ctorangequantity = value;
+
+                    OnCtOrangeQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _ctlightorangequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase ct light orange quantity.
+        /// </summary>
+
+        [Column("CT_LIGHT_ORANGE_QUANTITY")]
+
+        public  Int64 CtLightOrangeQuantity
+        {
+            get 
+            {
+                return _ctlightorangequantity; 
+            }
+
+            set 
+            {
+                if (_ctlightorangequantity != value)
+                {
+                    _ctlightorangequantity = value;
+
+                    OnCtLightOrangeQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _ctnavyquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase ct navy quantity.
+        /// </summary>
+
+        [Column("CT_NAVY_QUANTITY")]
+
+        public  Int64 CtNavyQuantity
+        {
+            get 
+            {
+                return _ctnavyquantity; 
+            }
+
+            set 
+            {
+                if (_ctnavyquantity != value)
+                {
+                    _ctnavyquantity = value;
+
+                    OnCtNavyQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _hdbluequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase hd blue quantity.
+        /// </summary>
+
+        [Column("HD_BLUE_QUANTITY")]
+
+        public  Int64 HdBlueQuantity
+        {
+            get 
+            {
+                return _hdbluequantity; 
+            }
+
+            set 
+            {
+                if (_hdbluequantity != value)
+                {
+                    _hdbluequantity = value;
+
+                    OnHdBlueQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _hdlightbluequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase hd light blue quantity.
+        /// </summary>
+
+        [Column("HD_LIGHT_BLUE_QUANTITY")]
+
+        public  Int64 HdLightBlueQuantity
+        {
+            get 
+            {
+                return _hdlightbluequantity; 
+            }
+
+            set 
+            {
+                if (_hdlightbluequantity != value)
+                {
+                    _hdlightbluequantity = value;
+
+                    OnHdLightBlueQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _hdrubinequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase hd rubine quantity.
+        /// </summary>
+
+        [Column("HD_RUBINE_QUANTITY")]
+
+        public  Int64 HdRubineQuantity
+        {
+            get 
+            {
+                return _hdrubinequantity; 
+            }
+
+            set 
+            {
+                if (_hdrubinequantity != value)
+                {
+                    _hdrubinequantity = value;
+
+                    OnHdRubineQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _hdlightrubinequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase hd light rubine quantity.
+        /// </summary>
+
+        [Column("HD_LIGHT_RUBINE_QUANTITY")]
+
+        public  Int64 HdLightRubineQuantity
+        {
+            get 
+            {
+                return _hdlightrubinequantity; 
+            }
+
+            set 
+            {
+                if (_hdlightrubinequantity != value)
+                {
+                    _hdlightrubinequantity = value;
+
+                    OnHdLightRubineQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _hdorangequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase hd orange quantity.
+        /// </summary>
+
+        [Column("HD_ORANGE_QUANTITY")]
+
+        public  Int64 HdOrangeQuantity
+        {
+            get 
+            {
+                return _hdorangequantity; 
+            }
+
+            set 
+            {
+                if (_hdorangequantity != value)
+                {
+                    _hdorangequantity = value;
+
+                    OnHdOrangeQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _hdlightorangequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase hd light orange quantity.
+        /// </summary>
+
+        [Column("HD_LIGHT_ORANGE_QUANTITY")]
+
+        public  Int64 HdLightOrangeQuantity
+        {
+            get 
+            {
+                return _hdlightorangequantity; 
+            }
+
+            set 
+            {
+                if (_hdlightorangequantity != value)
+                {
+                    _hdlightorangequantity = value;
+
+                    OnHdLightOrangeQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _hdnavyquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase hd navy quantity.
+        /// </summary>
+
+        [Column("HD_NAVY_QUANTITY")]
+
+        public  Int64 HdNavyQuantity
+        {
+            get 
+            {
+                return _hdnavyquantity; 
+            }
+
+            set 
+            {
+                if (_hdnavyquantity != value)
+                {
+                    _hdnavyquantity = value;
+
+                    OnHdNavyQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _hdlightnavyquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase hd light navy quantity.
+        /// </summary>
+
+        [Column("HD_LIGHT_NAVY_QUANTITY")]
+
+        public  Int64 HdLightNavyQuantity
+        {
+            get 
+            {
+                return _hdlightnavyquantity; 
+            }
+
+            set 
+            {
+                if (_hdlightnavyquantity != value)
+                {
+                    _hdlightnavyquantity = value;
+
+                    OnHdLightNavyQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _ambluequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase am blue quantity.
+        /// </summary>
+
+        [Column("AM_BLUE_QUANTITY")]
+
+        public  Int64 AmBlueQuantity
+        {
+            get 
+            {
+                return _ambluequantity; 
+            }
+
+            set 
+            {
+                if (_ambluequantity != value)
+                {
+                    _ambluequantity = value;
+
+                    OnAmBlueQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _amlightbluequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase am light blue quantity.
+        /// </summary>
+
+        [Column("AM_LIGHT_BLUE_QUANTITY")]
+
+        public  Int64 AmLightBlueQuantity
+        {
+            get 
+            {
+                return _amlightbluequantity; 
+            }
+
+            set 
+            {
+                if (_amlightbluequantity != value)
+                {
+                    _amlightbluequantity = value;
+
+                    OnAmLightBlueQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _amredquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase am red quantity.
+        /// </summary>
+
+        [Column("AM_RED_QUANTITY")]
+
+        public  Int64 AmRedQuantity
+        {
+            get 
+            {
+                return _amredquantity; 
+            }
+
+            set 
+            {
+                if (_amredquantity != value)
+                {
+                    _amredquantity = value;
+
+                    OnAmRedQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _amlightredquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase am light red quantity.
+        /// </summary>
+
+        [Column("AM_LIGHT_RED_QUANTITY")]
+
+        public  Int64 AmLightRedQuantity
+        {
+            get 
+            {
+                return _amlightredquantity; 
+            }
+
+            set 
+            {
+                if (_amlightredquantity != value)
+                {
+                    _amlightredquantity = value;
+
+                    OnAmLightRedQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _amorangequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase am orange quantity.
+        /// </summary>
+
+        [Column("AM_ORANGE_QUANTITY")]
+
+        public  Int64 AmOrangeQuantity
+        {
+            get 
+            {
+                return _amorangequantity; 
+            }
+
+            set 
+            {
+                if (_amorangequantity != value)
+                {
+                    _amorangequantity = value;
+
+                    OnAmOrangeQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _amlightorangequantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase am light orange quantity.
+        /// </summary>
+
+        [Column("AM_LIGHT_ORANGE_QUANTITY")]
+
+        public  Int64 AmLightOrangeQuantity
+        {
+            get 
+            {
+                return _amlightorangequantity; 
+            }
+
+            set 
+            {
+                if (_amlightorangequantity != value)
+                {
+                    _amlightorangequantity = value;
+
+                    OnAmLightOrangeQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _amyellowquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase am yellow quantity.
+        /// </summary>
+
+        [Column("AM_YELLOW_QUANTITY")]
+
+        public  Int64 AmYellowQuantity
+        {
+            get 
+            {
+                return _amyellowquantity; 
+            }
+
+            set 
+            {
+                if (_amyellowquantity != value)
+                {
+                    _amyellowquantity = value;
+
+                    OnAmYellowQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _amlightyellowquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase am light yellow quantity.
+        /// </summary>
+
+        [Column("AM_LIGHT_YELLOW_QUANTITY")]
+
+        public  Int64 AmLightYellowQuantity
+        {
+            get 
+            {
+                return _amlightyellowquantity; 
+            }
+
+            set 
+            {
+                if (_amlightyellowquantity != value)
+                {
+                    _amlightyellowquantity = value;
+
+                    OnAmLightYellowQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int64 _amblackquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase am black quantity.
+        /// </summary>
+
+        [Column("AM_BLACK_QUANTITY")]
+
+        public  Int64 AmBlackQuantity
+        {
+            get 
+            {
+                return _amblackquantity; 
+            }
+
+            set 
+            {
+                if (_amblackquantity != value)
+                {
+                    _amblackquantity = value;
+
+                    OnAmBlackQuantityChanged(value);
+
+                }
+            }
+        }
+
         /// <summary>
         /// Called when the JobName has changed.
         /// </summary>
@@ -1865,6 +2938,339 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the TwTransparentInkQuantity has changed.
+        /// </summary>
+        protected virtual void OnTwTransparentInkQuantityChanged(Int64 twtransparentinkquantity)
+        {
+            TwTransparentInkQuantityChanged?.Invoke(this, twtransparentinkquantity);
+            RaisePropertyChanged(nameof(TwTransparentInkQuantity));
+        }
+
+        /// <summary>
+        /// Called when the C1TiQuantity has changed.
+        /// </summary>
+        protected virtual void OnC1TiQuantityChanged(Int64 c1tiquantity)
+        {
+            C1TiQuantityChanged?.Invoke(this, c1tiquantity);
+            RaisePropertyChanged(nameof(C1TiQuantity));
+        }
+
+        /// <summary>
+        /// Called when the TwCyanQuantity has changed.
+        /// </summary>
+        protected virtual void OnTwCyanQuantityChanged(Int64 twcyanquantity)
+        {
+            TwCyanQuantityChanged?.Invoke(this, twcyanquantity);
+            RaisePropertyChanged(nameof(TwCyanQuantity));
+        }
+
+        /// <summary>
+        /// Called when the TwLightCyanQuantity has changed.
+        /// </summary>
+        protected virtual void OnTwLightCyanQuantityChanged(Int64 twlightcyanquantity)
+        {
+            TwLightCyanQuantityChanged?.Invoke(this, twlightcyanquantity);
+            RaisePropertyChanged(nameof(TwLightCyanQuantity));
+        }
+
+        /// <summary>
+        /// Called when the TwMagentaQuantity has changed.
+        /// </summary>
+        protected virtual void OnTwMagentaQuantityChanged(Int64 twmagentaquantity)
+        {
+            TwMagentaQuantityChanged?.Invoke(this, twmagentaquantity);
+            RaisePropertyChanged(nameof(TwMagentaQuantity));
+        }
+
+        /// <summary>
+        /// Called when the TwLightMagentaQuantity has changed.
+        /// </summary>
+        protected virtual void OnTwLightMagentaQuantityChanged(Int64 twlightmagentaquantity)
+        {
+            TwLightMagentaQuantityChanged?.Invoke(this, twlightmagentaquantity);
+            RaisePropertyChanged(nameof(TwLightMagentaQuantity));
+        }
+
+        /// <summary>
+        /// Called when the TwYellowQuantity has changed.
+        /// </summary>
+        protected virtual void OnTwYellowQuantityChanged(Int64 twyellowquantity)
+        {
+            TwYellowQuantityChanged?.Invoke(this, twyellowquantity);
+            RaisePropertyChanged(nameof(TwYellowQuantity));
+        }
+
+        /// <summary>
+        /// Called when the TwLightYellowQuantity has changed.
+        /// </summary>
+        protected virtual void OnTwLightYellowQuantityChanged(Int64 twlightyellowquantity)
+        {
+            TwLightYellowQuantityChanged?.Invoke(this, twlightyellowquantity);
+            RaisePropertyChanged(nameof(TwLightYellowQuantity));
+        }
+
+        /// <summary>
+        /// Called when the C1YellowQuantity has changed.
+        /// </summary>
+        protected virtual void OnC1YellowQuantityChanged(Int64 c1yellowquantity)
+        {
+            C1YellowQuantityChanged?.Invoke(this, c1yellowquantity);
+            RaisePropertyChanged(nameof(C1YellowQuantity));
+        }
+
+        /// <summary>
+        /// Called when the C1LightYellowQuantity has changed.
+        /// </summary>
+        protected virtual void OnC1LightYellowQuantityChanged(Int64 c1lightyellowquantity)
+        {
+            C1LightYellowQuantityChanged?.Invoke(this, c1lightyellowquantity);
+            RaisePropertyChanged(nameof(C1LightYellowQuantity));
+        }
+
+        /// <summary>
+        /// Called when the TwBlackQuantity has changed.
+        /// </summary>
+        protected virtual void OnTwBlackQuantityChanged(Int64 twblackquantity)
+        {
+            TwBlackQuantityChanged?.Invoke(this, twblackquantity);
+            RaisePropertyChanged(nameof(TwBlackQuantity));
+        }
+
+        /// <summary>
+        /// Called when the TwVioletQuantity has changed.
+        /// </summary>
+        protected virtual void OnTwVioletQuantityChanged(Int64 twvioletquantity)
+        {
+            TwVioletQuantityChanged?.Invoke(this, twvioletquantity);
+            RaisePropertyChanged(nameof(TwVioletQuantity));
+        }
+
+        /// <summary>
+        /// Called when the TwLightVioletQuantity has changed.
+        /// </summary>
+        protected virtual void OnTwLightVioletQuantityChanged(Int64 twlightvioletquantity)
+        {
+            TwLightVioletQuantityChanged?.Invoke(this, twlightvioletquantity);
+            RaisePropertyChanged(nameof(TwLightVioletQuantity));
+        }
+
+        /// <summary>
+        /// Called when the CtBlueQuantity has changed.
+        /// </summary>
+        protected virtual void OnCtBlueQuantityChanged(Int64 ctbluequantity)
+        {
+            CtBlueQuantityChanged?.Invoke(this, ctbluequantity);
+            RaisePropertyChanged(nameof(CtBlueQuantity));
+        }
+
+        /// <summary>
+        /// Called when the CtLightBlueQuantity has changed.
+        /// </summary>
+        protected virtual void OnCtLightBlueQuantityChanged(Int64 ctlightbluequantity)
+        {
+            CtLightBlueQuantityChanged?.Invoke(this, ctlightbluequantity);
+            RaisePropertyChanged(nameof(CtLightBlueQuantity));
+        }
+
+        /// <summary>
+        /// Called when the CtRubineQuantity has changed.
+        /// </summary>
+        protected virtual void OnCtRubineQuantityChanged(Int64 ctrubinequantity)
+        {
+            CtRubineQuantityChanged?.Invoke(this, ctrubinequantity);
+            RaisePropertyChanged(nameof(CtRubineQuantity));
+        }
+
+        /// <summary>
+        /// Called when the CtLightRubineQuantity has changed.
+        /// </summary>
+        protected virtual void OnCtLightRubineQuantityChanged(Int64 ctlightrubinequantity)
+        {
+            CtLightRubineQuantityChanged?.Invoke(this, ctlightrubinequantity);
+            RaisePropertyChanged(nameof(CtLightRubineQuantity));
+        }
+
+        /// <summary>
+        /// Called when the CtOrangeQuantity has changed.
+        /// </summary>
+        protected virtual void OnCtOrangeQuantityChanged(Int64 ctorangequantity)
+        {
+            CtOrangeQuantityChanged?.Invoke(this, ctorangequantity);
+            RaisePropertyChanged(nameof(CtOrangeQuantity));
+        }
+
+        /// <summary>
+        /// Called when the CtLightOrangeQuantity has changed.
+        /// </summary>
+        protected virtual void OnCtLightOrangeQuantityChanged(Int64 ctlightorangequantity)
+        {
+            CtLightOrangeQuantityChanged?.Invoke(this, ctlightorangequantity);
+            RaisePropertyChanged(nameof(CtLightOrangeQuantity));
+        }
+
+        /// <summary>
+        /// Called when the CtNavyQuantity has changed.
+        /// </summary>
+        protected virtual void OnCtNavyQuantityChanged(Int64 ctnavyquantity)
+        {
+            CtNavyQuantityChanged?.Invoke(this, ctnavyquantity);
+            RaisePropertyChanged(nameof(CtNavyQuantity));
+        }
+
+        /// <summary>
+        /// Called when the HdBlueQuantity has changed.
+        /// </summary>
+        protected virtual void OnHdBlueQuantityChanged(Int64 hdbluequantity)
+        {
+            HdBlueQuantityChanged?.Invoke(this, hdbluequantity);
+            RaisePropertyChanged(nameof(HdBlueQuantity));
+        }
+
+        /// <summary>
+        /// Called when the HdLightBlueQuantity has changed.
+        /// </summary>
+        protected virtual void OnHdLightBlueQuantityChanged(Int64 hdlightbluequantity)
+        {
+            HdLightBlueQuantityChanged?.Invoke(this, hdlightbluequantity);
+            RaisePropertyChanged(nameof(HdLightBlueQuantity));
+        }
+
+        /// <summary>
+        /// Called when the HdRubineQuantity has changed.
+        /// </summary>
+        protected virtual void OnHdRubineQuantityChanged(Int64 hdrubinequantity)
+        {
+            HdRubineQuantityChanged?.Invoke(this, hdrubinequantity);
+            RaisePropertyChanged(nameof(HdRubineQuantity));
+        }
+
+        /// <summary>
+        /// Called when the HdLightRubineQuantity has changed.
+        /// </summary>
+        protected virtual void OnHdLightRubineQuantityChanged(Int64 hdlightrubinequantity)
+        {
+            HdLightRubineQuantityChanged?.Invoke(this, hdlightrubinequantity);
+            RaisePropertyChanged(nameof(HdLightRubineQuantity));
+        }
+
+        /// <summary>
+        /// Called when the HdOrangeQuantity has changed.
+        /// </summary>
+        protected virtual void OnHdOrangeQuantityChanged(Int64 hdorangequantity)
+        {
+            HdOrangeQuantityChanged?.Invoke(this, hdorangequantity);
+            RaisePropertyChanged(nameof(HdOrangeQuantity));
+        }
+
+        /// <summary>
+        /// Called when the HdLightOrangeQuantity has changed.
+        /// </summary>
+        protected virtual void OnHdLightOrangeQuantityChanged(Int64 hdlightorangequantity)
+        {
+            HdLightOrangeQuantityChanged?.Invoke(this, hdlightorangequantity);
+            RaisePropertyChanged(nameof(HdLightOrangeQuantity));
+        }
+
+        /// <summary>
+        /// Called when the HdNavyQuantity has changed.
+        /// </summary>
+        protected virtual void OnHdNavyQuantityChanged(Int64 hdnavyquantity)
+        {
+            HdNavyQuantityChanged?.Invoke(this, hdnavyquantity);
+            RaisePropertyChanged(nameof(HdNavyQuantity));
+        }
+
+        /// <summary>
+        /// Called when the HdLightNavyQuantity has changed.
+        /// </summary>
+        protected virtual void OnHdLightNavyQuantityChanged(Int64 hdlightnavyquantity)
+        {
+            HdLightNavyQuantityChanged?.Invoke(this, hdlightnavyquantity);
+            RaisePropertyChanged(nameof(HdLightNavyQuantity));
+        }
+
+        /// <summary>
+        /// Called when the AmBlueQuantity has changed.
+        /// </summary>
+        protected virtual void OnAmBlueQuantityChanged(Int64 ambluequantity)
+        {
+            AmBlueQuantityChanged?.Invoke(this, ambluequantity);
+            RaisePropertyChanged(nameof(AmBlueQuantity));
+        }
+
+        /// <summary>
+        /// Called when the AmLightBlueQuantity has changed.
+        /// </summary>
+        protected virtual void OnAmLightBlueQuantityChanged(Int64 amlightbluequantity)
+        {
+            AmLightBlueQuantityChanged?.Invoke(this, amlightbluequantity);
+            RaisePropertyChanged(nameof(AmLightBlueQuantity));
+        }
+
+        /// <summary>
+        /// Called when the AmRedQuantity has changed.
+        /// </summary>
+        protected virtual void OnAmRedQuantityChanged(Int64 amredquantity)
+        {
+            AmRedQuantityChanged?.Invoke(this, amredquantity);
+            RaisePropertyChanged(nameof(AmRedQuantity));
+        }
+
+        /// <summary>
+        /// Called when the AmLightRedQuantity has changed.
+        /// </summary>
+        protected virtual void OnAmLightRedQuantityChanged(Int64 amlightredquantity)
+        {
+            AmLightRedQuantityChanged?.Invoke(this, amlightredquantity);
+            RaisePropertyChanged(nameof(AmLightRedQuantity));
+        }
+
+        /// <summary>
+        /// Called when the AmOrangeQuantity has changed.
+        /// </summary>
+        protected virtual void OnAmOrangeQuantityChanged(Int64 amorangequantity)
+        {
+            AmOrangeQuantityChanged?.Invoke(this, amorangequantity);
+            RaisePropertyChanged(nameof(AmOrangeQuantity));
+        }
+
+        /// <summary>
+        /// Called when the AmLightOrangeQuantity has changed.
+        /// </summary>
+        protected virtual void OnAmLightOrangeQuantityChanged(Int64 amlightorangequantity)
+        {
+            AmLightOrangeQuantityChanged?.Invoke(this, amlightorangequantity);
+            RaisePropertyChanged(nameof(AmLightOrangeQuantity));
+        }
+
+        /// <summary>
+        /// Called when the AmYellowQuantity has changed.
+        /// </summary>
+        protected virtual void OnAmYellowQuantityChanged(Int64 amyellowquantity)
+        {
+            AmYellowQuantityChanged?.Invoke(this, amyellowquantity);
+            RaisePropertyChanged(nameof(AmYellowQuantity));
+        }
+
+        /// <summary>
+        /// Called when the AmLightYellowQuantity has changed.
+        /// </summary>
+        protected virtual void OnAmLightYellowQuantityChanged(Int64 amlightyellowquantity)
+        {
+            AmLightYellowQuantityChanged?.Invoke(this, amlightyellowquantity);
+            RaisePropertyChanged(nameof(AmLightYellowQuantity));
+        }
+
+        /// <summary>
+        /// Called when the AmBlackQuantity has changed.
+        /// </summary>
+        protected virtual void OnAmBlackQuantityChanged(Int64 amblackquantity)
+        {
+            AmBlackQuantityChanged?.Invoke(this, amblackquantity);
+            RaisePropertyChanged(nameof(AmBlackQuantity));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="JobRunBase" /> class.
         /// </summary>
         public JobRunBase() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs
index 82403a11b..fbd32967f 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs
@@ -49,6 +49,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Int32> DarkInkCodeChanged;
 
+        public event EventHandler<String> DisplayNameChanged;
+
         public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<IdsPack>> IdsPacksChanged;
@@ -354,6 +356,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected String _displayname;
+
+        /// <summary>
+        /// Gets or sets the liquidtypebase display name.
+        /// </summary>
+
+        [Column("DISPLAY_NAME")]
+
+        public  String DisplayName
+        {
+            get 
+            {
+                return _displayname; 
+            }
+
+            set 
+            {
+                if (_displayname != value)
+                {
+                    _displayname = value;
+
+                    OnDisplayNameChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<Cat> _cats;
 
         /// <summary>
@@ -554,6 +583,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the DisplayName has changed.
+        /// </summary>
+        protected virtual void OnDisplayNameChanged(String displayname)
+        {
+            DisplayNameChanged?.Invoke(this, displayname);
+            RaisePropertyChanged(nameof(DisplayName));
+        }
+
+        /// <summary>
         /// Called when the Cats has changed.
         /// </summary>
         protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats)
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
index 17b29d691..357be1666 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
@@ -109,6 +109,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Double> BtsrTensionErrorChanged;
 
+        public event EventHandler<Double> DefaultLiquidFactorChanged;
+
         public event EventHandler<BtsrApplicationType> BtsrApplicationTypeChanged;
 
         public event EventHandler<BtsrYarnType> BtsrYarnTypeChanged;
@@ -1540,6 +1542,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Double _defaultliquidfactor;
+
+        /// <summary>
+        /// Gets or sets the rmlbase default liquid factor.
+        /// </summary>
+
+        [Column("DEFAULT_LIQUID_FACTOR")]
+
+        public  Double DefaultLiquidFactor
+        {
+            get 
+            {
+                return _defaultliquidfactor; 
+            }
+
+            set 
+            {
+                if (_defaultliquidfactor != value)
+                {
+                    _defaultliquidfactor = value;
+
+                    OnDefaultLiquidFactorChanged(value);
+
+                }
+            }
+        }
+
         protected BtsrApplicationType _btsrapplicationtype;
 
         /// <summary>
@@ -2462,6 +2491,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the DefaultLiquidFactor has changed.
+        /// </summary>
+        protected virtual void OnDefaultLiquidFactorChanged(Double defaultliquidfactor)
+        {
+            DefaultLiquidFactorChanged?.Invoke(this, defaultliquidfactor);
+            RaisePropertyChanged(nameof(DefaultLiquidFactor));
+        }
+
+        /// <summary>
         /// Called when the BtsrApplicationType has changed.
         /// </summary>
         protected virtual void OnBtsrApplicationTypeChanged(BtsrApplicationType btsrapplicationtype)
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs
index 07b46869e..d44726994 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/LiquidTypes.cs
@@ -20,6 +20,12 @@ namespace Tango.BL.Enumerations
     {
 
         /// <summary>
+        /// (CT Orange)
+        /// </summary>
+        [Description("CT Orange")]
+        CTOrange = 230,
+
+        /// <summary>
         /// (Light Cyan)
         /// </summary>
         [Description("Light Cyan")]
@@ -32,30 +38,144 @@ namespace Tango.BL.Enumerations
         Cyan = 0,
 
         /// <summary>
+        /// (AM Black)
+        /// </summary>
+        [Description("AM Black")]
+        AMBlack = 450,
+
+        /// <summary>
+        /// (HD Navy)
+        /// </summary>
+        [Description("HD Navy")]
+        HDNavy = 340,
+
+        /// <summary>
+        /// (HD Orange)
+        /// </summary>
+        [Description("HD Orange")]
+        HDOrange = 330,
+
+        /// <summary>
         /// (Transparent Ink)
         /// </summary>
         [Description("Transparent Ink")]
         TransparentInk = 4,
 
         /// <summary>
+        /// (TW Transparent Ink)
+        /// </summary>
+        [Description("TW Transparent Ink")]
+        TWTransparentInk = 100,
+
+        /// <summary>
+        /// (AM Light Yellow)
+        /// </summary>
+        [Description("AM Light Yellow")]
+        AMLightYellow = 441,
+
+        /// <summary>
+        /// (TW Cyan)
+        /// </summary>
+        [Description("TW Cyan")]
+        TWCyan = 110,
+
+        /// <summary>
         /// (Magenta)
         /// </summary>
         [Description("Magenta")]
         Magenta = 1,
 
         /// <summary>
+        /// (HD Light Orange)
+        /// </summary>
+        [Description("HD Light Orange")]
+        HDLightOrange = 331,
+
+        /// <summary>
+        /// (TW Light Violet)
+        /// </summary>
+        [Description("TW Light Violet")]
+        TWLightViolet = 151,
+
+        /// <summary>
+        /// (C1 Yellow)
+        /// </summary>
+        [Description("C1 Yellow")]
+        C1Yellow = 135,
+
+        /// <summary>
+        /// (CT Rubine)
+        /// </summary>
+        [Description("CT Rubine")]
+        CTRubine = 220,
+
+        /// <summary>
+        /// (TW Light Yellow)
+        /// </summary>
+        [Description("TW Light Yellow")]
+        TWLightYellow = 131,
+
+        /// <summary>
         /// (Lubricant)
         /// </summary>
         [Description("Lubricant")]
         Lubricant = 5,
 
         /// <summary>
+        /// (CT Navy)
+        /// </summary>
+        [Description("CT Navy")]
+        CTNavy = 240,
+
+        /// <summary>
+        /// (TW Black)
+        /// </summary>
+        [Description("TW Black")]
+        TWBlack = 140,
+
+        /// <summary>
+        /// (HD Light Rubine)
+        /// </summary>
+        [Description("HD Light Rubine")]
+        HDLightRubine = 321,
+
+        /// <summary>
+        /// (HD Rubine)
+        /// </summary>
+        [Description("HD Rubine")]
+        HDRubine = 320,
+
+        /// <summary>
+        /// (TW Yellow)
+        /// </summary>
+        [Description("TW Yellow")]
+        TWYellow = 130,
+
+        /// <summary>
+        /// (AM Light Red)
+        /// </summary>
+        [Description("AM Light Red")]
+        AMLightRed = 421,
+
+        /// <summary>
+        /// (TW Violet)
+        /// </summary>
+        [Description("TW Violet")]
+        TWViolet = 150,
+
+        /// <summary>
         /// (Light Magenta)
         /// </summary>
         [Description("Light Magenta")]
         LightMagenta = 8,
 
         /// <summary>
+        /// (AM Blue)
+        /// </summary>
+        [Description("AM Blue")]
+        AMBlue = 410,
+
+        /// <summary>
         /// (Blue)
         /// </summary>
         [Description("Blue")]
@@ -110,22 +230,124 @@ namespace Tango.BL.Enumerations
         Violet = 10,
 
         /// <summary>
+        /// (AM Red)
+        /// </summary>
+        [Description("AM Red")]
+        AMRed = 420,
+
+        /// <summary>
+        /// (CT Light Rubine)
+        /// </summary>
+        [Description("CT Light Rubine")]
+        CTLightRubine = 221,
+
+        /// <summary>
+        /// (TW Light Cyan)
+        /// </summary>
+        [Description("TW Light Cyan")]
+        TWLightCyan = 111,
+
+        /// <summary>
         /// (Yellow)
         /// </summary>
         [Description("Yellow")]
         Yellow = 2,
 
         /// <summary>
+        /// (HD Blue)
+        /// </summary>
+        [Description("HD Blue")]
+        HDBlue = 310,
+
+        /// <summary>
+        /// (CT Light Blue)
+        /// </summary>
+        [Description("CT Light Blue")]
+        CTLightBlue = 211,
+
+        /// <summary>
+        /// (C1 TI)
+        /// </summary>
+        [Description("C1 TI")]
+        C1TI = 105,
+
+        /// <summary>
+        /// (TW Magenta)
+        /// </summary>
+        [Description("TW Magenta")]
+        TWMagenta = 120,
+
+        /// <summary>
         /// (Black)
         /// </summary>
         [Description("Black")]
         Black = 3,
 
         /// <summary>
+        /// (AM Yellow)
+        /// </summary>
+        [Description("AM Yellow")]
+        AMYellow = 440,
+
+        /// <summary>
+        /// (AM Light Orange)
+        /// </summary>
+        [Description("AM Light Orange")]
+        AMLightOrange = 431,
+
+        /// <summary>
+        /// (AM Orange)
+        /// </summary>
+        [Description("AM Orange")]
+        AMOrange = 430,
+
+        /// <summary>
+        /// (C1 Light Yellow)
+        /// </summary>
+        [Description("C1 Light Yellow")]
+        C1LightYellow = 136,
+
+        /// <summary>
         /// (Cleaner)
         /// </summary>
         [Description("Cleaner")]
         Cleaner = 6,
 
+        /// <summary>
+        /// (CT Light Orange)
+        /// </summary>
+        [Description("CT Light Orange")]
+        CTLightOrange = 231,
+
+        /// <summary>
+        /// (TW Light Magenta)
+        /// </summary>
+        [Description("TW Light Magenta")]
+        TWLightMagenta = 121,
+
+        /// <summary>
+        /// (AM Light Blue)
+        /// </summary>
+        [Description("AM Light Blue")]
+        AMLightBlue = 411,
+
+        /// <summary>
+        /// (CT Blue)
+        /// </summary>
+        [Description("CT Blue")]
+        CTBlue = 210,
+
+        /// <summary>
+        /// (HD Light Navy)
+        /// </summary>
+        [Description("HD Light Navy")]
+        HDLightNavy = 341,
+
+        /// <summary>
+        /// (HD Light Blue)
+        /// </summary>
+        [Description("HD Light Blue")]
+        HDLightBlue = 311,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
index c04183622..0948f293a 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
@@ -67,5 +67,42 @@ namespace Tango.DAL.Remote.DB
         public long LIGHT_RUBINE_QUANTITY { get; set; }
         public long NAVY_QUANTITY { get; set; }
         public long VIOLET_QUANTITY { get; set; }
+        public long TW_TRANSPARENT_INK_QUANTITY { get; set; }
+        public long C1_TI_QUANTITY { get; set; }
+        public long TW_CYAN_QUANTITY { get; set; }
+        public long TW_LIGHT_CYAN_QUANTITY { get; set; }
+        public long TW_MAGENTA_QUANTITY { get; set; }
+        public long TW_LIGHT_MAGENTA_QUANTITY { get; set; }
+        public long TW_YELLOW_QUANTITY { get; set; }
+        public long TW_LIGHT_YELLOW_QUANTITY { get; set; }
+        public long C1_YELLOW_QUANTITY { get; set; }
+        public long C1_LIGHT_YELLOW_QUANTITY { get; set; }
+        public long TW_BLACK_QUANTITY { get; set; }
+        public long TW_VIOLET_QUANTITY { get; set; }
+        public long TW_LIGHT_VIOLET_QUANTITY { get; set; }
+        public long CT_BLUE_QUANTITY { get; set; }
+        public long CT_LIGHT_BLUE_QUANTITY { get; set; }
+        public long CT_RUBINE_QUANTITY { get; set; }
+        public long CT_LIGHT_RUBINE_QUANTITY { get; set; }
+        public long CT_ORANGE_QUANTITY { get; set; }
+        public long CT_LIGHT_ORANGE_QUANTITY { get; set; }
+        public long CT_NAVY_QUANTITY { get; set; }
+        public long HD_BLUE_QUANTITY { get; set; }
+        public long HD_LIGHT_BLUE_QUANTITY { get; set; }
+        public long HD_RUBINE_QUANTITY { get; set; }
+        public long HD_LIGHT_RUBINE_QUANTITY { get; set; }
+        public long HD_ORANGE_QUANTITY { get; set; }
+        public long HD_LIGHT_ORANGE_QUANTITY { get; set; }
+        public long HD_NAVY_QUANTITY { get; set; }
+        public long HD_LIGHT_NAVY_QUANTITY { get; set; }
+        public long AM_BLUE_QUANTITY { get; set; }
+        public long AM_LIGHT_BLUE_QUANTITY { get; set; }
+        public long AM_RED_QUANTITY { get; set; }
+        public long AM_LIGHT_RED_QUANTITY { get; set; }
+        public long AM_ORANGE_QUANTITY { get; set; }
+        public long AM_LIGHT_ORANGE_QUANTITY { get; set; }
+        public long AM_YELLOW_QUANTITY { get; set; }
+        public long AM_LIGHT_YELLOW_QUANTITY { get; set; }
+        public long AM_BLACK_QUANTITY { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
index 382efa9e9..197949188 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
@@ -37,6 +37,7 @@ namespace Tango.DAL.Remote.DB
         public bool IS_EXTRA_INK { get; set; }
         public bool IS_LIGHT_INK { get; set; }
         public int DARK_INK_CODE { get; set; }
+        public string DISPLAY_NAME { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<CAT> CATS { 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 b1f71c687..f6f747893 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
@@ -82,6 +82,7 @@ namespace Tango.DAL.Remote.DB
         public string BTSR_APPLICATION_TYPE_GUID { get; set; }
         public string BTSR_YARN_TYPE_GUID { get; set; }
         public double BTSR_TENSION_ERROR { get; set; }
+        public double DEFAULT_LIQUID_FACTOR { get; set; }
     
         public virtual BTSR_APPLICATION_TYPES BTSR_APPLICATION_TYPES { get; set; }
         public virtual BTSR_YARN_TYPES BTSR_YARN_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 4b7448f98..8ed5c4fed 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -832,6 +832,43 @@
           <Property Name="LIGHT_RUBINE_QUANTITY" Type="bigint" Nullable="false" />
           <Property Name="NAVY_QUANTITY" Type="bigint" Nullable="false" />
           <Property Name="VIOLET_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="TW_TRANSPARENT_INK_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="C1_TI_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="TW_CYAN_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="TW_LIGHT_CYAN_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="TW_MAGENTA_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="TW_LIGHT_MAGENTA_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="TW_YELLOW_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="TW_LIGHT_YELLOW_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="C1_YELLOW_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="C1_LIGHT_YELLOW_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="TW_BLACK_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="TW_VIOLET_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="TW_LIGHT_VIOLET_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="CT_BLUE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="CT_LIGHT_BLUE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="CT_RUBINE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="CT_LIGHT_RUBINE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="CT_ORANGE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="CT_LIGHT_ORANGE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="CT_NAVY_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="HD_BLUE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="HD_LIGHT_BLUE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="HD_RUBINE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="HD_LIGHT_RUBINE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="HD_ORANGE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="HD_LIGHT_ORANGE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="HD_NAVY_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="HD_LIGHT_NAVY_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="AM_BLUE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="AM_LIGHT_BLUE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="AM_RED_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="AM_LIGHT_RED_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="AM_ORANGE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="AM_LIGHT_ORANGE_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="AM_YELLOW_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="AM_LIGHT_YELLOW_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="AM_BLACK_QUANTITY" Type="bigint" Nullable="false" />
         </EntityType>
         <EntityType Name="JOBS">
           <Key>
@@ -906,6 +943,7 @@
           <Property Name="IS_EXTRA_INK" Type="bit" Nullable="false" />
           <Property Name="IS_LIGHT_INK" Type="bit" Nullable="false" />
           <Property Name="DARK_INK_CODE" Type="int" Nullable="false" />
+          <Property Name="DISPLAY_NAME" Type="nvarchar" MaxLength="50" />
         </EntityType>
         <EntityType Name="LIQUID_TYPES_RMLS">
           <Key>
@@ -1420,6 +1458,7 @@
           <Property Name="BTSR_APPLICATION_TYPE_GUID" Type="varchar" MaxLength="36" />
           <Property Name="BTSR_YARN_TYPE_GUID" Type="varchar" MaxLength="36" />
           <Property Name="BTSR_TENSION_ERROR" Type="float" Nullable="false" />
+          <Property Name="DEFAULT_LIQUID_FACTOR" Type="float" Nullable="false" />
         </EntityType>
         <EntityType Name="RMLS_EXTENSIONS">
           <Key>
@@ -6529,6 +6568,43 @@
           <Property Name="LIGHT_RUBINE_QUANTITY" Type="Int64" Nullable="false" />
           <Property Name="NAVY_QUANTITY" Type="Int64" Nullable="false" />
           <Property Name="VIOLET_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="TW_TRANSPARENT_INK_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="C1_TI_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="TW_CYAN_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="TW_LIGHT_CYAN_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="TW_MAGENTA_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="TW_LIGHT_MAGENTA_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="TW_YELLOW_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="TW_LIGHT_YELLOW_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="C1_YELLOW_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="C1_LIGHT_YELLOW_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="TW_BLACK_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="TW_VIOLET_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="TW_LIGHT_VIOLET_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="CT_BLUE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="CT_LIGHT_BLUE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="CT_RUBINE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="CT_LIGHT_RUBINE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="CT_ORANGE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="CT_LIGHT_ORANGE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="CT_NAVY_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="HD_BLUE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="HD_LIGHT_BLUE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="HD_RUBINE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="HD_LIGHT_RUBINE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="HD_ORANGE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="HD_LIGHT_ORANGE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="HD_NAVY_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="HD_LIGHT_NAVY_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="AM_BLUE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="AM_LIGHT_BLUE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="AM_RED_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="AM_LIGHT_RED_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="AM_ORANGE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="AM_LIGHT_ORANGE_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="AM_YELLOW_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="AM_LIGHT_YELLOW_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="AM_BLACK_QUANTITY" Type="Int64" Nullable="false" />
         </EntityType>
         <EntityType Name="JOB">
           <Key>
@@ -6614,6 +6690,7 @@
           <Property Name="IS_EXTRA_INK" Type="Boolean" Nullable="false" />
           <Property Name="IS_LIGHT_INK" Type="Boolean" Nullable="false" />
           <Property Name="DARK_INK_CODE" Type="Int32" Nullable="false" />
+          <Property Name="DISPLAY_NAME" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
           <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_LIQUID_TYPES1" FromRole="LIQUID_TYPES" ToRole="CAT" />
           <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" FromRole="LIQUID_TYPES" ToRole="IDS_PACKS" />
           <NavigationProperty Name="LIQUID_TYPES_RMLS" Relationship="RemoteModel.FK_LIQUID_TYPES_RMLS_LIQUID_TYPES" FromRole="LIQUID_TYPES" ToRole="LIQUID_TYPES_RMLS" />
@@ -7031,6 +7108,7 @@
           <Property Name="BTSR_APPLICATION_TYPE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="BTSR_YARN_TYPE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="BTSR_TENSION_ERROR" Type="Double" Nullable="false" />
+          <Property Name="DEFAULT_LIQUID_FACTOR" Type="Double" Nullable="false" />
           <NavigationProperty Name="BTSR_APPLICATION_TYPES" Relationship="RemoteModel.FK_RMLS_BTSR_APPLICATION_TYPES" FromRole="RML" ToRole="BTSR_APPLICATION_TYPES" />
           <NavigationProperty Name="BTSR_YARN_TYPES" Relationship="RemoteModel.FK_RMLS_BTSR_YARN_TYPES" FromRole="RML" ToRole="BTSR_YARN_TYPES" />
           <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_RMLS" FromRole="RML" ToRole="CAT" />
@@ -10009,6 +10087,43 @@
           <EntitySetMapping Name="JOB_RUNS">
             <EntityTypeMapping TypeName="RemoteModel.JOB_RUNS">
               <MappingFragment StoreEntitySet="JOB_RUNS">
+                <ScalarProperty Name="AM_BLACK_QUANTITY" ColumnName="AM_BLACK_QUANTITY" />
+                <ScalarProperty Name="AM_LIGHT_YELLOW_QUANTITY" ColumnName="AM_LIGHT_YELLOW_QUANTITY" />
+                <ScalarProperty Name="AM_YELLOW_QUANTITY" ColumnName="AM_YELLOW_QUANTITY" />
+                <ScalarProperty Name="AM_LIGHT_ORANGE_QUANTITY" ColumnName="AM_LIGHT_ORANGE_QUANTITY" />
+                <ScalarProperty Name="AM_ORANGE_QUANTITY" ColumnName="AM_ORANGE_QUANTITY" />
+                <ScalarProperty Name="AM_LIGHT_RED_QUANTITY" ColumnName="AM_LIGHT_RED_QUANTITY" />
+                <ScalarProperty Name="AM_RED_QUANTITY" ColumnName="AM_RED_QUANTITY" />
+                <ScalarProperty Name="AM_LIGHT_BLUE_QUANTITY" ColumnName="AM_LIGHT_BLUE_QUANTITY" />
+                <ScalarProperty Name="AM_BLUE_QUANTITY" ColumnName="AM_BLUE_QUANTITY" />
+                <ScalarProperty Name="HD_LIGHT_NAVY_QUANTITY" ColumnName="HD_LIGHT_NAVY_QUANTITY" />
+                <ScalarProperty Name="HD_NAVY_QUANTITY" ColumnName="HD_NAVY_QUANTITY" />
+                <ScalarProperty Name="HD_LIGHT_ORANGE_QUANTITY" ColumnName="HD_LIGHT_ORANGE_QUANTITY" />
+                <ScalarProperty Name="HD_ORANGE_QUANTITY" ColumnName="HD_ORANGE_QUANTITY" />
+                <ScalarProperty Name="HD_LIGHT_RUBINE_QUANTITY" ColumnName="HD_LIGHT_RUBINE_QUANTITY" />
+                <ScalarProperty Name="HD_RUBINE_QUANTITY" ColumnName="HD_RUBINE_QUANTITY" />
+                <ScalarProperty Name="HD_LIGHT_BLUE_QUANTITY" ColumnName="HD_LIGHT_BLUE_QUANTITY" />
+                <ScalarProperty Name="HD_BLUE_QUANTITY" ColumnName="HD_BLUE_QUANTITY" />
+                <ScalarProperty Name="CT_NAVY_QUANTITY" ColumnName="CT_NAVY_QUANTITY" />
+                <ScalarProperty Name="CT_LIGHT_ORANGE_QUANTITY" ColumnName="CT_LIGHT_ORANGE_QUANTITY" />
+                <ScalarProperty Name="CT_ORANGE_QUANTITY" ColumnName="CT_ORANGE_QUANTITY" />
+                <ScalarProperty Name="CT_LIGHT_RUBINE_QUANTITY" ColumnName="CT_LIGHT_RUBINE_QUANTITY" />
+                <ScalarProperty Name="CT_RUBINE_QUANTITY" ColumnName="CT_RUBINE_QUANTITY" />
+                <ScalarProperty Name="CT_LIGHT_BLUE_QUANTITY" ColumnName="CT_LIGHT_BLUE_QUANTITY" />
+                <ScalarProperty Name="CT_BLUE_QUANTITY" ColumnName="CT_BLUE_QUANTITY" />
+                <ScalarProperty Name="TW_LIGHT_VIOLET_QUANTITY" ColumnName="TW_LIGHT_VIOLET_QUANTITY" />
+                <ScalarProperty Name="TW_VIOLET_QUANTITY" ColumnName="TW_VIOLET_QUANTITY" />
+                <ScalarProperty Name="TW_BLACK_QUANTITY" ColumnName="TW_BLACK_QUANTITY" />
+                <ScalarProperty Name="C1_LIGHT_YELLOW_QUANTITY" ColumnName="C1_LIGHT_YELLOW_QUANTITY" />
+                <ScalarProperty Name="C1_YELLOW_QUANTITY" ColumnName="C1_YELLOW_QUANTITY" />
+                <ScalarProperty Name="TW_LIGHT_YELLOW_QUANTITY" ColumnName="TW_LIGHT_YELLOW_QUANTITY" />
+                <ScalarProperty Name="TW_YELLOW_QUANTITY" ColumnName="TW_YELLOW_QUANTITY" />
+                <ScalarProperty Name="TW_LIGHT_MAGENTA_QUANTITY" ColumnName="TW_LIGHT_MAGENTA_QUANTITY" />
+                <ScalarProperty Name="TW_MAGENTA_QUANTITY" ColumnName="TW_MAGENTA_QUANTITY" />
+                <ScalarProperty Name="TW_LIGHT_CYAN_QUANTITY" ColumnName="TW_LIGHT_CYAN_QUANTITY" />
+                <ScalarProperty Name="TW_CYAN_QUANTITY" ColumnName="TW_CYAN_QUANTITY" />
+                <ScalarProperty Name="C1_TI_QUANTITY" ColumnName="C1_TI_QUANTITY" />
+                <ScalarProperty Name="TW_TRANSPARENT_INK_QUANTITY" ColumnName="TW_TRANSPARENT_INK_QUANTITY" />
                 <ScalarProperty Name="VIOLET_QUANTITY" ColumnName="VIOLET_QUANTITY" />
                 <ScalarProperty Name="NAVY_QUANTITY" ColumnName="NAVY_QUANTITY" />
                 <ScalarProperty Name="LIGHT_RUBINE_QUANTITY" ColumnName="LIGHT_RUBINE_QUANTITY" />
@@ -10125,6 +10240,7 @@
           <EntitySetMapping Name="LIQUID_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.LIQUID_TYPES">
               <MappingFragment StoreEntitySet="LIQUID_TYPES">
+                <ScalarProperty Name="DISPLAY_NAME" ColumnName="DISPLAY_NAME" />
                 <ScalarProperty Name="DARK_INK_CODE" ColumnName="DARK_INK_CODE" />
                 <ScalarProperty Name="IS_LIGHT_INK" ColumnName="IS_LIGHT_INK" />
                 <ScalarProperty Name="IS_EXTRA_INK" ColumnName="IS_EXTRA_INK" />
@@ -10477,6 +10593,7 @@
           <EntitySetMapping Name="RMLS">
             <EntityTypeMapping TypeName="RemoteModel.RML">
               <MappingFragment StoreEntitySet="RMLS">
+                <ScalarProperty Name="DEFAULT_LIQUID_FACTOR" ColumnName="DEFAULT_LIQUID_FACTOR" />
                 <ScalarProperty Name="BTSR_TENSION_ERROR" ColumnName="BTSR_TENSION_ERROR" />
                 <ScalarProperty Name="BTSR_YARN_TYPE_GUID" ColumnName="BTSR_YARN_TYPE_GUID" />
                 <ScalarProperty Name="BTSR_APPLICATION_TYPE_GUID" ColumnName="BTSR_APPLICATION_TYPE_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 b7c4620bd..99c611661 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="16.375" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="70.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="80.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="83.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="77.75" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="0.75" PointY="6" />
-        <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="42.125" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="29.5" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="8" PointY="66.125" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="21.75" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="15.25" />
-        <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="6" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="8.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="38.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="83.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="66.5" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="42.125" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="86.625" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="5.75" PointY="105" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="8" PointY="104.375" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="86.5" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="70.125" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="45.375" />
-        <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="12.625" />
-        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="12" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="8.75" PointY="5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="108.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="94.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="98.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="96.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="6.5" PointY="71.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="8.75" PointY="81.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="109.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="90.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="94.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="89.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="8.5" PointY="77.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="10.75" PointY="86.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="89.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="101.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="91" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="8" PointY="101.125" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10.25" PointY="45.25" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="18.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="32.75" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="7.25" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="21.875" />
-        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="38.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="8.75" PointY="9" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="34.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="74.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="74.375" />
-        <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="35.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="26.25" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="8" PointY="45.875" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="68.375" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="4.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="13.75" PointY="12.25" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="16" PointY="12.5" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="5" PointY="13.25" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.625" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="25.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="8.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="8.5" />
-        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="14.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="3" PointY="35.75" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="18" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="30.125" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="33.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="30.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="56.125" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="16" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="13.25" PointY="44.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="10.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="14.75" PointY="5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="13.75" PointY="20" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="20.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="15.125" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="16.5" />
-        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="2.75" PointY="13.75" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="35.5" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="16.5" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="89.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="72.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="75.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="52.375" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="8.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="42" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="29.875" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9" PointY="66.5" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="26" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="12.25" />
+        <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="6" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="21.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_MEASUREMENTS" Width="1.5" PointX="14.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="13.75" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="42" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="58.125" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="93.75" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="35.75" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="69.25" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="7.875" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="69.25" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="69.5" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="15.5" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="26.375" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="12.875" />
+        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="45.25" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="2.75" PointY="16.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="97.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="74.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="105.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="82.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="90.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="82.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="10.5" PointY="84.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="12.75" PointY="75.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.5" PointY="74.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9.75" PointY="76.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="86.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="78.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="78.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="101.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="78.625" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9" PointY="12" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="11.25" PointY="37" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="18.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="36.125" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="16.125" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="22.125" />
+        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="21.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="15.75" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="9.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="49.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="57" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="42.875" />
+        <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="18.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="39" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9" PointY="45.625" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="84.625" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="1.75" />
+        <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="13.75" PointY="9.5" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="16" PointY="9.625" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="6" 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="25.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="5.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="5.75" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="13.75" PointY="20.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="3" PointY="36" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="12.625" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="30.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="36.5" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="30.25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="47.5" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="20.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="20.75" PointY="4.25" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="31.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="20.75" PointY="9.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="20.75" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="20.75" PointY="16.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="19.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="22.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="22.75" PointY="6.25" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="15.25" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="16.75" />
+        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="3.75" PointY="2" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="38.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.PMR/ColorLab/LiquidType.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs
index 94d2f20b3..f40415159 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/LiquidType.cs
@@ -22,14 +22,28 @@ namespace Tango.PMR.ColorLab {
     static LiquidTypeReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChBMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIqhQIKCkxp",
+            "ChBMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIq4gYKCkxp",
             "cXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2VudGEQARIKCgZZZWxsb3cQAhIJ",
             "CgVCbGFjaxADEhIKDlRyYW5zcGFyZW50SW5rEAQSDQoJTHVicmljYW50EAUS",
             "CwoHQ2xlYW5lchAGEg0KCUxpZ2h0Q3lhbhAHEhAKDExpZ2h0TWFnZW50YRAI",
             "Eg8KC0xpZ2h0WWVsbG93EAkSCgoGVmlvbGV0EAoSCAoEQmx1ZRALEg0KCUxp",
             "Z2h0Qmx1ZRAMEgoKBk9yYW5nZRANEg8KC0xpZ2h0T3JhbmdlEA4SCgoGUnVi",
-            "aW5lEA8SDwoLTGlnaHRSdWJpbmUQEBIICgROYXZ5EBFCHgocY29tLnR3aW5l",
-            "LnRhbmdvLnBtci5jb2xvcmxhYmIGcHJvdG8z"));
+            "aW5lEA8SDwoLTGlnaHRSdWJpbmUQEBIICgROYXZ5EBESFAoQVFdUcmFuc3Bh",
+            "cmVudEluaxBkEggKBEMxVEkQaRIKCgZUV0N5YW4QbhIPCgtUV0xpZ2h0Q3lh",
+            "bhBvEg0KCVRXTWFnZW50YRB4EhIKDlRXTGlnaHRNYWdlbnRhEHkSDQoIVFdZ",
+            "ZWxsb3cQggESEgoNVFdMaWdodFllbGxvdxCDARINCghDMVllbGxvdxCHARIS",
+            "Cg1DMUxpZ2h0WWVsbG93EIgBEgwKB1RXQmxhY2sQjAESDQoIVFdWaW9sZXQQ",
+            "lgESEgoNVFdMaWdodFZpb2xldBCXARILCgZDVEJsdWUQ0gESEAoLQ1RMaWdo",
+            "dEJsdWUQ0wESDQoIQ1RSdWJpbmUQ3AESEgoNQ1RMaWdodFJ1YmluZRDdARIN",
+            "CghDVE9yYW5nZRDmARISCg1DVExpZ2h0T3JhbmdlEOcBEgsKBkNUTmF2eRDw",
+            "ARILCgZIREJsdWUQtgISEAoLSERMaWdodEJsdWUQtwISDQoISERSdWJpbmUQ",
+            "wAISEgoNSERMaWdodFJ1YmluZRDBAhINCghIRE9yYW5nZRDKAhISCg1IRExp",
+            "Z2h0T3JhbmdlEMsCEgsKBkhETmF2eRDUAhIQCgtIRExpZ2h0TmF2eRDVAhIL",
+            "CgZBTUJsdWUQmgMSEAoLQU1MaWdodEJsdWUQmwMSCgoFQU1SZWQQpAMSDwoK",
+            "QU1MaWdodFJlZBClAxINCghBTU9yYW5nZRCuAxISCg1BTUxpZ2h0T3Jhbmdl",
+            "EK8DEg0KCEFNWWVsbG93ELgDEhIKDUFNTGlnaHRZZWxsb3cQuQMSDAoHQU1C",
+            "bGFjaxDCA0IeChxjb20udHdpbmUudGFuZ28ucG1yLmNvbG9ybGFiYgZwcm90",
+            "bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.ColorLab.LiquidType), }, null));
@@ -57,6 +71,43 @@ namespace Tango.PMR.ColorLab {
     [pbr::OriginalName("Rubine")] Rubine = 15,
     [pbr::OriginalName("LightRubine")] LightRubine = 16,
     [pbr::OriginalName("Navy")] Navy = 17,
+    [pbr::OriginalName("TWTransparentInk")] TwtransparentInk = 100,
+    [pbr::OriginalName("C1TI")] C1Ti = 105,
+    [pbr::OriginalName("TWCyan")] Twcyan = 110,
+    [pbr::OriginalName("TWLightCyan")] TwlightCyan = 111,
+    [pbr::OriginalName("TWMagenta")] Twmagenta = 120,
+    [pbr::OriginalName("TWLightMagenta")] TwlightMagenta = 121,
+    [pbr::OriginalName("TWYellow")] Twyellow = 130,
+    [pbr::OriginalName("TWLightYellow")] TwlightYellow = 131,
+    [pbr::OriginalName("C1Yellow")] C1Yellow = 135,
+    [pbr::OriginalName("C1LightYellow")] C1LightYellow = 136,
+    [pbr::OriginalName("TWBlack")] Twblack = 140,
+    [pbr::OriginalName("TWViolet")] Twviolet = 150,
+    [pbr::OriginalName("TWLightViolet")] TwlightViolet = 151,
+    [pbr::OriginalName("CTBlue")] Ctblue = 210,
+    [pbr::OriginalName("CTLightBlue")] CtlightBlue = 211,
+    [pbr::OriginalName("CTRubine")] Ctrubine = 220,
+    [pbr::OriginalName("CTLightRubine")] CtlightRubine = 221,
+    [pbr::OriginalName("CTOrange")] Ctorange = 230,
+    [pbr::OriginalName("CTLightOrange")] CtlightOrange = 231,
+    [pbr::OriginalName("CTNavy")] Ctnavy = 240,
+    [pbr::OriginalName("HDBlue")] Hdblue = 310,
+    [pbr::OriginalName("HDLightBlue")] HdlightBlue = 311,
+    [pbr::OriginalName("HDRubine")] Hdrubine = 320,
+    [pbr::OriginalName("HDLightRubine")] HdlightRubine = 321,
+    [pbr::OriginalName("HDOrange")] Hdorange = 330,
+    [pbr::OriginalName("HDLightOrange")] HdlightOrange = 331,
+    [pbr::OriginalName("HDNavy")] Hdnavy = 340,
+    [pbr::OriginalName("HDLightNavy")] HdlightNavy = 341,
+    [pbr::OriginalName("AMBlue")] Amblue = 410,
+    [pbr::OriginalName("AMLightBlue")] AmlightBlue = 411,
+    [pbr::OriginalName("AMRed")] Amred = 420,
+    [pbr::OriginalName("AMLightRed")] AmlightRed = 421,
+    [pbr::OriginalName("AMOrange")] Amorange = 430,
+    [pbr::OriginalName("AMLightOrange")] AmlightOrange = 431,
+    [pbr::OriginalName("AMYellow")] Amyellow = 440,
+    [pbr::OriginalName("AMLightYellow")] AmlightYellow = 441,
+    [pbr::OriginalName("AMBlack")] Amblack = 450,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs b/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs
index fb3b5820c..8066298cf 100644
--- a/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Printing/DispenserLiquidType.cs
@@ -23,13 +23,27 @@ namespace Tango.PMR.Printing {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChlEaXNwZW5zZXJMaXF1aWRUeXBlLnByb3RvEhJUYW5nby5QTVIuUHJpbnRp",
-            "bmcqjgIKE0Rpc3BlbnNlckxpcXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2Vu",
+            "bmcq6wYKE0Rpc3BlbnNlckxpcXVpZFR5cGUSCAoEQ3lhbhAAEgsKB01hZ2Vu",
             "dGEQARIKCgZZZWxsb3cQAhIJCgVCbGFjaxADEhIKDlRyYW5zcGFyZW50SW5r",
             "EAQSDQoJTHVicmljYW50EAUSCwoHQ2xlYW5lchAGEg0KCUxpZ2h0Q3lhbhAH",
             "EhAKDExpZ2h0TWFnZW50YRAIEg8KC0xpZ2h0WWVsbG93EAkSCgoGVmlvbGV0",
             "EAoSCAoEQmx1ZRALEg0KCUxpZ2h0Qmx1ZRAMEgoKBk9yYW5nZRANEg8KC0xp",
             "Z2h0T3JhbmdlEA4SCgoGUnViaW5lEA8SDwoLTGlnaHRSdWJpbmUQEBIICgRO",
-            "YXZ5EBFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z"));
+            "YXZ5EBESFAoQVFdUcmFuc3BhcmVudEluaxBkEggKBEMxVEkQaRIKCgZUV0N5",
+            "YW4QbhIPCgtUV0xpZ2h0Q3lhbhBvEg0KCVRXTWFnZW50YRB4EhIKDlRXTGln",
+            "aHRNYWdlbnRhEHkSDQoIVFdZZWxsb3cQggESEgoNVFdMaWdodFllbGxvdxCD",
+            "ARINCghDMVllbGxvdxCHARISCg1DMUxpZ2h0WWVsbG93EIgBEgwKB1RXQmxh",
+            "Y2sQjAESDQoIVFdWaW9sZXQQlgESEgoNVFdMaWdodFZpb2xldBCXARILCgZD",
+            "VEJsdWUQ0gESEAoLQ1RMaWdodEJsdWUQ0wESDQoIQ1RSdWJpbmUQ3AESEgoN",
+            "Q1RMaWdodFJ1YmluZRDdARINCghDVE9yYW5nZRDmARISCg1DVExpZ2h0T3Jh",
+            "bmdlEOcBEgsKBkNUTmF2eRDwARILCgZIREJsdWUQtgISEAoLSERMaWdodEJs",
+            "dWUQtwISDQoISERSdWJpbmUQwAISEgoNSERMaWdodFJ1YmluZRDBAhINCghI",
+            "RE9yYW5nZRDKAhISCg1IRExpZ2h0T3JhbmdlEMsCEgsKBkhETmF2eRDUAhIQ",
+            "CgtIRExpZ2h0TmF2eRDVAhILCgZBTUJsdWUQmgMSEAoLQU1MaWdodEJsdWUQ",
+            "mwMSCgoFQU1SZWQQpAMSDwoKQU1MaWdodFJlZBClAxINCghBTU9yYW5nZRCu",
+            "AxISCg1BTUxpZ2h0T3JhbmdlEK8DEg0KCEFNWWVsbG93ELgDEhIKDUFNTGln",
+            "aHRZZWxsb3cQuQMSDAoHQU1CbGFjaxDCA0IeChxjb20udHdpbmUudGFuZ28u",
+            "cG1yLnByaW50aW5nYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Printing.DispenserLiquidType), }, null));
@@ -57,6 +71,43 @@ namespace Tango.PMR.Printing {
     [pbr::OriginalName("Rubine")] Rubine = 15,
     [pbr::OriginalName("LightRubine")] LightRubine = 16,
     [pbr::OriginalName("Navy")] Navy = 17,
+    [pbr::OriginalName("TWTransparentInk")] TwtransparentInk = 100,
+    [pbr::OriginalName("C1TI")] C1Ti = 105,
+    [pbr::OriginalName("TWCyan")] Twcyan = 110,
+    [pbr::OriginalName("TWLightCyan")] TwlightCyan = 111,
+    [pbr::OriginalName("TWMagenta")] Twmagenta = 120,
+    [pbr::OriginalName("TWLightMagenta")] TwlightMagenta = 121,
+    [pbr::OriginalName("TWYellow")] Twyellow = 130,
+    [pbr::OriginalName("TWLightYellow")] TwlightYellow = 131,
+    [pbr::OriginalName("C1Yellow")] C1Yellow = 135,
+    [pbr::OriginalName("C1LightYellow")] C1LightYellow = 136,
+    [pbr::OriginalName("TWBlack")] Twblack = 140,
+    [pbr::OriginalName("TWViolet")] Twviolet = 150,
+    [pbr::OriginalName("TWLightViolet")] TwlightViolet = 151,
+    [pbr::OriginalName("CTBlue")] Ctblue = 210,
+    [pbr::OriginalName("CTLightBlue")] CtlightBlue = 211,
+    [pbr::OriginalName("CTRubine")] Ctrubine = 220,
+    [pbr::OriginalName("CTLightRubine")] CtlightRubine = 221,
+    [pbr::OriginalName("CTOrange")] Ctorange = 230,
+    [pbr::OriginalName("CTLightOrange")] CtlightOrange = 231,
+    [pbr::OriginalName("CTNavy")] Ctnavy = 240,
+    [pbr::OriginalName("HDBlue")] Hdblue = 310,
+    [pbr::OriginalName("HDLightBlue")] HdlightBlue = 311,
+    [pbr::OriginalName("HDRubine")] Hdrubine = 320,
+    [pbr::OriginalName("HDLightRubine")] HdlightRubine = 321,
+    [pbr::OriginalName("HDOrange")] Hdorange = 330,
+    [pbr::OriginalName("HDLightOrange")] HdlightOrange = 331,
+    [pbr::OriginalName("HDNavy")] Hdnavy = 340,
+    [pbr::OriginalName("HDLightNavy")] HdlightNavy = 341,
+    [pbr::OriginalName("AMBlue")] Amblue = 410,
+    [pbr::OriginalName("AMLightBlue")] AmlightBlue = 411,
+    [pbr::OriginalName("AMRed")] Amred = 420,
+    [pbr::OriginalName("AMLightRed")] AmlightRed = 421,
+    [pbr::OriginalName("AMOrange")] Amorange = 430,
+    [pbr::OriginalName("AMLightOrange")] AmlightOrange = 431,
+    [pbr::OriginalName("AMYellow")] Amyellow = 440,
+    [pbr::OriginalName("AMLightYellow")] AmlightYellow = 441,
+    [pbr::OriginalName("AMBlack")] Amblack = 450,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Utilities/Tango.Telemetry.Tester.IOT.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.Telemetry.Tester.IOT.CLI/Program.cs
index 07d301f3d..4f5e2731a 100644
--- a/Software/Visual_Studio/Utilities/Tango.Telemetry.Tester.IOT.CLI/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Telemetry.Tester.IOT.CLI/Program.cs
@@ -42,16 +42,16 @@ namespace Tango.Telemetry.Tester.IOT.CLI
 
             //publisher.RegisterSource(new JobRunsTestSource());
             //publisher.RegisterSource(new DiagnosticsTestSource());
-            publisher.RegisterSource(new EventsTestSource());
+            //publisher.RegisterSource(new EventsTestSource());
             publisher.RegisterSource(new MachineStatusTestSource());
-            publisher.RegisterSource(new WiresTestSource());
+            //publisher.RegisterSource(new WiresTestSource());
 
             var logsSource = new TelemetryLogsStreamingSource();
             logsSource.Config.Categories.Add(LogCategory.Info);
 
-            publisher.RegisterSource(logsSource);
-            publisher.RegisterSource(new TelemetryLogsStreamingSource());
-            publisher.RegisterSource(new JobStatusTestSource());
+            //publisher.RegisterSource(logsSource);
+            //publisher.RegisterSource(new TelemetryLogsStreamingSource());
+            //publisher.RegisterSource(new JobStatusTestSource());
             publisher.RegisterDestination(new TelemetryAzureHubDestination("HostName=iot-twine-dev-weu.azure-devices.net;DeviceId=telemetry-dev-01;SharedAccessKey=cZhCMhiVL+TF7p13fpX+lFmyxoy8ZqCkbxUwumWw18Q="));
             //publisher.RegisterDestination(new TelemetryMqttDestination("Telemetry MQTT")); 
 
@@ -117,7 +117,7 @@ namespace Tango.Telemetry.Tester.IOT.CLI
                 Console.ForegroundColor = ConsoleColor.Red;
                 Console.WriteLine("One or more destinations failed to receive the package.");
             }
-            else
+            else if (e.PublishResult.DestinationsResults.All(x => x.Status == TelemetryPublishResult.DestinationStatus.Passed))
             {
                 Console.ForegroundColor = ConsoleColor.Green;
                 Console.WriteLine($"Package {_counter++} successfully published.");
@@ -300,7 +300,7 @@ namespace Tango.Telemetry.Tester.IOT.CLI
         {
             Task.Factory.StartNew(() =>
             {
-                for (int i = 10; i < 20; i++)
+                for (int i = 0; i < 10000; i++)
                 {
                     TelemetryAvailable?.Invoke(this, new TelemetryAvailableEventArgs()
                     {