From 3043e65ad539455ad2510e402e1c8f2d168577d2 Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Sun, 12 May 2019 13:30:46 +0300
Subject: Implemented new TCC algorithm.

---
 .../Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 8d9255926..c94102df5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -420,6 +420,10 @@
       <Project>{5001990f-977b-48ff-b217-0236a5022ad8}</Project>
       <Name>Tango.Web</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\TCC\Tango.TCC.BL\Tango.TCC.BL.csproj">
+      <Project>{f209fae8-73f9-441b-97f4-0844a0279390}</Project>
+      <Name>Tango.TCC.BL</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules\MachineStudio.Dispensers\Tango.MachineStudio.Dispensers.csproj">
       <Project>{f69da3a8-f823-461e-87cf-a9275abc0b15}</Project>
       <Name>Tango.MachineStudio.Dispensers</Name>
@@ -520,6 +524,14 @@
     <Resource Include="Images\settings.png" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="..\..\Build\TCC\Debug\Tango.TCC.ColorDetector.dll">
+      <Link>Tango.TCC.ColorDetector.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\Build\TCC\Debug\Tango.TCC.ColorDetector.pdb">
+      <Link>Tango.TCC.ColorDetector.pdb</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Resource Include="Images\firmware_upgrade.png" />
     <Resource Include="Images\external-bridge-emulator.png" />
     <EmbeddedResource Include="..\..\Versioning\ChangeLog.txt">
-- 
cgit v1.3.1


From 33b7badb8903408d72c3ec42d3198c5e4cef8fc1 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 14 May 2019 14:56:21 +0300
Subject: TCC mobile design improvement. Added keep alive work around for job
 parsing. New catalog handling per RML on PPC.

---
 .../Android_Studio/ColorCapture/app/build.gradle   |   4 +--
 .../com/twine/colorcapture/mvvm/DialogBase.java    |  38 +++++++++++++--------
 .../app/src/main/res/layout/side_menu.xml          |   2 +-
 .../app/src/main/res/values/styles.xml             |  27 +++++++++++++++
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 53673984 -> 53673984 bytes
 Software/DB/TCC/TCC.mdf                            | Bin 8388608 -> 8388608 bytes
 Software/DB/TCC/TCC_log.ldf                        | Bin 8388608 -> 8388608 bytes
 .../Machine Studio Installer.aip                   |  24 ++++++++++---
 .../Advanced Installer Projects/PPC Installer.aip  |  18 ++++------
 .../Build/Shortcuts/Machine Studio.lnk             | Bin 1502 -> 1518 bytes
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../TwineCatalogNavigationObject.cs                |  16 +++++++++
 .../Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj   |   3 +-
 .../Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs |   6 +++-
 .../ViewModels/TwineCatalogViewVM.cs               |  26 +++++++-------
 .../Tango.PPC.Jobs/Views/TwineCatalogView.xaml     |  18 +++++-----
 .../Controls/TwineCatalogControl.xaml              |   2 +-
 .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs    |   2 +-
 .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest    |   2 +-
 .../Tango.BL/Catalogs/CatalogLoader.cs             |  34 ++++++++++--------
 .../Tango.BL/ObservablesStaticCollections.cs       |   1 -
 .../Tango.Integration/Operation/MachineOperator.cs |  19 ++++++++++-
 .../Utilities/Tango.CatalogImporter/Program.cs     |  10 +++++-
 24 files changed, 176 insertions(+), 78 deletions(-)
 create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/NavigationObjects/TwineCatalogNavigationObject.cs

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')

diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle
index ef4857b1d..60fc89265 100644
--- a/Software/Android_Studio/ColorCapture/app/build.gradle
+++ b/Software/Android_Studio/ColorCapture/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.twine.colorcapture"
         minSdkVersion 22
         targetSdkVersion 27
-        versionCode 4
-        versionName "1.4"
+        versionCode 5
+        versionName "1.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/DialogBase.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/DialogBase.java
index e132d1b56..e77440810 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/DialogBase.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/DialogBase.java
@@ -53,7 +53,8 @@ public abstract class DialogBase<BindingView extends ViewDataBinding, VM extends
     public void onCreate(@Nullable Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        setStyle(DialogFragment.STYLE_NO_FRAME, R.style.AppTheme);
+        //getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+        setStyle(DialogFragment.STYLE_NO_FRAME, R.style.FullScreenDialogStyle);
     }
 
     @Nullable
@@ -131,20 +132,27 @@ public abstract class DialogBase<BindingView extends ViewDataBinding, VM extends
     public void onStart()
     {
         super.onStart();
-        getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
-
-        View group = this.getView();
-
-        group.post(() ->
-        {
-            ValueAnimator animator = ValueAnimator.ofFloat(0, 1);
-            animator.setDuration(300);
-            animator.addUpdateListener((x) ->
-            {
-                group.setAlpha((Float) x.getAnimatedValue());
-            });
-            animator.start();
-        });
+        //getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+
+//        View group = this.getView();
+//
+//        group.post(() ->
+//        {
+//            ValueAnimator animator = ValueAnimator.ofFloat(0, 1);
+//            animator.setDuration(300);
+//            animator.addUpdateListener((x) ->
+//            {
+//                group.setAlpha((Float) x.getAnimatedValue());
+//            });
+//            animator.start();
+//        });
+
+        Dialog dialog = getDialog();
+        if (dialog != null) {
+            int width = ViewGroup.LayoutParams.MATCH_PARENT;
+            int height = ViewGroup.LayoutParams.MATCH_PARENT;
+            dialog.getWindow().setLayout(width, height);
+        }
     }
 
     public abstract int getLayoutId();
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/side_menu.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/side_menu.xml
index 3369f0a35..7cc3da131 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/side_menu.xml
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/side_menu.xml
@@ -175,7 +175,7 @@
             android:layout_marginLeft="20dp"
             android:layout_marginRight="20dp"
             android:layout_marginBottom="60dp"
-            bind:text="Get a twine TTC™ card"
+            bind:text="   Get a twine TTC™ card"
             bind:textSize="@dimen/small_font_size"
             bind:src="@drawable/icon_twine_card"
             android:clickable="true" />
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/values/styles.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/values/styles.xml
index c283a135d..ba9f0b02a 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/res/values/styles.xml
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/values/styles.xml
@@ -18,6 +18,33 @@
         <item name="android:textColor">@color/white</item>
     </style>
 
+    <style name="CustomDialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:alwaysDrawnWithCache">false</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+
+    <style name="FullScreenDialogStyle" parent="Theme.AppCompat.Dialog">
+        <item name="android:windowNoTitle">true</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+
+        <!-- Set this to true if you want Full Screen without status bar -->
+        <item name="android:windowFullscreen">false</item>
+
+        <item name="android:windowIsFloating">false</item>
+
+        <!-- This is important! Don't forget to set window background -->
+        <item name="android:windowBackground">@android:color/transparent</item>
+
+        <!-- Additionally if you want animations when dialog opening -->
+        <item name="android:windowEnterAnimation">@anim/zoom_in</item>
+        <item name="android:windowExitAnimation">@anim/zoom_out</item>
+    </style>
+
     <style name="Autocomplete">
         <item name="colorControlNormal">@color/text_gray</item>
         <item name="colorControlActivated">@color/colorPrimaryBackground</item>
diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index 53b2eff86..6430f30dd 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index c3aa83372..04aebcf50 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/DB/TCC/TCC.mdf b/Software/DB/TCC/TCC.mdf
index 1782a99c7..0dbf598dc 100644
Binary files a/Software/DB/TCC/TCC.mdf and b/Software/DB/TCC/TCC.mdf differ
diff --git a/Software/DB/TCC/TCC_log.ldf b/Software/DB/TCC/TCC_log.ldf
index 0044974e0..f95b21cc9 100644
Binary files a/Software/DB/TCC/TCC_log.ldf and b/Software/DB/TCC/TCC_log.ldf differ
diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
index 22a18f1ae..cea0c9655 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip	
+++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip	
@@ -15,10 +15,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPNOREPAIR" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{3CA3DE1D-D04D-4969-B1E1-969EBE3EB323} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{E661B31E-76E5-450D-A94C-AA88FD6128CB} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.0.19.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.0.20.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{CBEE5CAE-7C5A-4280-98DE-AA98113764E4}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -46,6 +46,9 @@
     <ROW Directory="x86_Dir" Directory_Parent="APPDIR" DefaultDir="x86" DirectoryOptions="3"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
+    <ROW Component="AForge.Imaging.dll" ComponentId="{D2382029-077D-440D-A3A2-F40B0360DA62}" Directory_="APPDIR" Attributes="0" KeyPath="AForge.Imaging.dll"/>
+    <ROW Component="AForge.Math.dll" ComponentId="{72400E06-E80B-4F17-B4E8-F386CF7FEE26}" Directory_="APPDIR" Attributes="0" KeyPath="AForge.Math.dll"/>
+    <ROW Component="AForge.dll" ComponentId="{F948DCAF-5678-4EBF-8832-3B3FE0A15394}" Directory_="APPDIR" Attributes="0" KeyPath="AForge.dll"/>
     <ROW Component="AI_ExePath" ComponentId="{C34670D7-E692-46D3-8154-6A8F253B99E5}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>
     <ROW Component="ColorMine.dll" ComponentId="{2A12535E-52C6-4B4F-9428-6CFB916E8EEF}" Directory_="APPDIR" Attributes="0" KeyPath="ColorMine.dll"/>
     <ROW Component="CommandLine.dll" ComponentId="{C5FBFF18-6F05-40E5-91A3-E1E4220EA0FF}" Directory_="APPDIR" Attributes="0" KeyPath="CommandLine.dll"/>
@@ -59,6 +62,9 @@
     <ROW Component="FluentFTP.dll" ComponentId="{191CEF27-5A24-4C24-BD5E-352381BBFF39}" Directory_="APPDIR" Attributes="0" KeyPath="FluentFTP.dll"/>
     <ROW Component="FontAwesome.WPF.dll" ComponentId="{10D51CEF-0701-4F71-AB6B-B4DDC99D96C6}" Directory_="APPDIR" Attributes="0" KeyPath="FontAwesome.WPF.dll"/>
     <ROW Component="Google.Protobuf.dll" ComponentId="{905824B8-20FE-4C20-9931-FF70821BE5AC}" Directory_="APPDIR" Attributes="0" KeyPath="Google.Protobuf.dll"/>
+    <ROW Component="HelixToolkit.Wpf.Input.dll" ComponentId="{9C9630CD-31F2-4B7F-8565-3C4ABF2AB553}" Directory_="APPDIR" Attributes="0" KeyPath="HelixToolkit.Wpf.Input.dll"/>
+    <ROW Component="HelixToolkit.Wpf.dll" ComponentId="{7356CE94-0E73-411F-8A77-64F1AC57EEC3}" Directory_="APPDIR" Attributes="0" KeyPath="HelixToolkit.Wpf.dll"/>
+    <ROW Component="HelixToolkit.dll" ComponentId="{5D180A46-3D33-4504-BCF6-386FCA872BB3}" Directory_="APPDIR" Attributes="0" KeyPath="HelixToolkit.dll"/>
     <ROW Component="ICSharpCode.AvalonEdit.dll" ComponentId="{BF7848E8-6EB8-43B5-9ACA-59CC67C33BE4}" Directory_="APPDIR" Attributes="0" KeyPath="ICSharpCode.AvalonEdit.dll"/>
     <ROW Component="Ionic.Zip.dll" ComponentId="{48874EB0-3246-44DC-9BBF-86DCB7F63F38}" Directory_="APPDIR" Attributes="0" KeyPath="Ionic.Zip.dll"/>
     <ROW Component="JWT.dll" ComponentId="{AE249785-FCA3-4413-9D07-B11783D0D08E}" Directory_="APPDIR" Attributes="0" KeyPath="JWT.dll"/>
@@ -329,10 +335,13 @@
     <ROW Component="zlib1.dll" ComponentId="{AB6E3F34-F125-4364-A26B-F02193779155}" Directory_="APPDIR" Attributes="0" KeyPath="zlib1.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_ExePath ColorMine.dll CommandLine.dll DeepEqual.dll DocumentFormat.OpenXml.dll Dragablz.dll Dragablz.xml EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll ICSharpCode.AvalonEdit.dll Ionic.Zip.dll JWT.dll LiveCharts.Wpf.dll_1 LiveCharts.dll_1 MahApps.Metro.dll MaterialDesignColors.dll MaterialDesignThemes.Wpf.dll Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.Practices.ServiceLocation.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.WITDataStore32.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAPICodePack.Shell.dll Microsoft.WindowsAPICodePack.ShellExtensions.dll Microsoft.WindowsAPICodePack.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll ProductInformation RazorEngine.dll RealTimeGraphX.WPF.dll RealTimeGraphX.dll SHORTCUTDIR SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Concurrent.dll System.Collections.NonGeneric.dll System.Collections.Specialized.dll System.Collections.dll System.ComponentModel.EventBasedAsync.dll System.ComponentModel.Primitives.dll System.ComponentModel.TypeConverter.dll System.ComponentModel.dll System.Console.dll System.Data.Common.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.Contracts.dll System.Diagnostics.Debug.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.Diagnostics.TextWriterTraceListener.dll System.Diagnostics.Tools.dll System.Diagnostics.TraceSource.dll System.Diagnostics.Tracing.dll System.Drawing.Primitives.dll System.Dynamic.Runtime.dll System.Globalization.Calendars.dll System.Globalization.Extensions.dll System.Globalization.dll System.IO.Compression.ZipFile.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.Watcher.dll System.IO.FileSystem.dll System.IO.IsolatedStorage.dll System.IO.MemoryMappedFiles.dll System.IO.Pipes.dll System.IO.UnmanagedMemoryStream.dll System.IO.dll System.IdentityModel.Tokens.Jwt.dll System.Linq.Expressions.dll System.Linq.Parallel.dll System.Linq.Queryable.dll System.Linq.dll System.Net.Http.Formatting.dll System.Net.Http.dll System.Net.NameResolution.dll System.Net.NetworkInformation.dll System.Net.Ping.dll System.Net.Primitives.dll System.Net.Requests.dll System.Net.Security.dll System.Net.Sockets.dll System.Net.WebHeaderCollection.dll System.Net.WebSockets.Client.dll System.Net.WebSockets.dll System.ObjectModel.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reactive.Windows.Threading.dll System.Reflection.Extensions.dll System.Reflection.Primitives.dll System.Reflection.dll System.Resources.Reader.dll System.Resources.ResourceManager.dll System.Resources.Writer.dll System.Runtime.CompilerServices.VisualC.dll System.Runtime.Extensions.dll System.Runtime.Handles.dll System.Runtime.InteropServices.RuntimeInformation.dll System.Runtime.InteropServices.dll System.Runtime.Numerics.dll System.Runtime.Serialization.Formatters.dll System.Runtime.Serialization.Json.dll System.Runtime.Serialization.Primitives.dll System.Runtime.Serialization.Xml.dll System.Runtime.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Csp.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.dll System.Security.SecureString.dll System.Text.Encoding.Extensions.dll System.Text.Encoding.dll System.Text.RegularExpressions.dll System.Threading.Overlapped.dll System.Threading.Tasks.Parallel.dll System.Threading.Tasks.dll System.Threading.Thread.dll System.Threading.ThreadPool.dll System.Threading.Timer.dll System.Threading.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Web.Razor.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XDocument.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll System.Xml.XmlSerializer.dll Tango.AdvancedInstaller.dll Tango.AutoComplete.dll Tango.BL.dll Tango.BrushPicker.dll Tango.CSV.dll Tango.CircularGauge.dll Tango.CodeGeneration.dll Tango.ColorLib.dll Tango.ColorPicker.dll Tango.Core.dll Tango.DAL.Local.dll Tango.DAL.Remote.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Editors.dll Tango.Embroidery.dll Tango.EmbroideryUI.dll Tango.Emulations.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.MachineStudio.ColorCapture.dll Tango.MachineStudio.ColorLab.dll Tango.MachineStudio.Common.dll Tango.MachineStudio.DB.dll Tango.MachineStudio.DataCapture.dll Tango.MachineStudio.Developer.dll Tango.MachineStudio.Dispensers.dll Tango.MachineStudio.HardwareDesigner.dll Tango.MachineStudio.Logging.dll Tango.MachineStudio.MachineDesigner.dll Tango.MachineStudio.RML.dll Tango.MachineStudio.Statistics.dll_1 Tango.MachineStudio.Storage.dll Tango.MachineStudio.Stubs.dll Tango.MachineStudio.Technician.dll Tango.MachineStudio.UI.exe Tango.MachineStudio.Updater.exe Tango.MachineStudio.UsersAndRoles.dll Tango.PMR.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.Stubs.dll Tango.Synchronization.dll Tango.TCC.BL.dll Tango.TCC.CardDetector.dll Tango.TCC.ColorDetector.dll Tango.TCC.LoadTestLib.dll Tango.TCC.OpenCV.DLL.dll Tango.TFS.dll Tango.Transport.dll Tango.Video.dll Tango.Visuals.dll Tango.Web.dll WpfAnimatedGif.dll WriteableBitmapEx.Wpf.dll ZedGraph.dll ZedGraph.resources.dll benchmarks_rgb_lab.csv concrt140.dll cvextern.dll fpgen.exe libMagickCore2.dll libMagickWand2.dll libiconv2.dll libjpeg7.dll libpng120.dll libtiff3.dll libxml22.dll libzbar0.dll mscoree.dll msvcp140.dll msvcp140d.dll netstandard.dll opencv_aruco330d.dll opencv_calib3d330d.dll opencv_core330d.dll opencv_dnn330d.dll opencv_features2d330d.dll opencv_ffmpeg310.dll opencv_ffmpeg310_64.dll opencv_ffmpeg320.dll opencv_ffmpeg320_64.dll opencv_ffmpeg330.dll opencv_flann330d.dll opencv_highgui330d.dll opencv_imgcodecs330d.dll opencv_imgproc330d.dll opencv_ml330d.dll opencv_objdetect330d.dll opencv_photo330d.dll opencv_shape330d.dll opencv_stitching330d.dll opencv_superres330d.dll opencv_video330d.dll opencv_videoio330d.dll opencv_videostab330d.dll protoc.exe protoc1.0M4.jar protocc.exe roslyn ucrtbased.dll vcruntime140.dll vcruntime140d.dll zlib1.dll"/>
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AForge.Imaging.dll AForge.Math.dll AForge.dll AI_ExePath ColorMine.dll CommandLine.dll DeepEqual.dll DocumentFormat.OpenXml.dll Dragablz.dll Dragablz.xml EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll HelixToolkit.Wpf.Input.dll HelixToolkit.Wpf.dll HelixToolkit.dll ICSharpCode.AvalonEdit.dll Ionic.Zip.dll JWT.dll LiveCharts.Wpf.dll_1 LiveCharts.dll_1 MahApps.Metro.dll MaterialDesignColors.dll MaterialDesignThemes.Wpf.dll Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.Practices.ServiceLocation.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.WITDataStore32.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAPICodePack.Shell.dll Microsoft.WindowsAPICodePack.ShellExtensions.dll Microsoft.WindowsAPICodePack.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll ProductInformation RazorEngine.dll RealTimeGraphX.WPF.dll RealTimeGraphX.dll SHORTCUTDIR SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Concurrent.dll System.Collections.NonGeneric.dll System.Collections.Specialized.dll System.Collections.dll System.ComponentModel.EventBasedAsync.dll System.ComponentModel.Primitives.dll System.ComponentModel.TypeConverter.dll System.ComponentModel.dll System.Console.dll System.Data.Common.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.Contracts.dll System.Diagnostics.Debug.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.Diagnostics.TextWriterTraceListener.dll System.Diagnostics.Tools.dll System.Diagnostics.TraceSource.dll System.Diagnostics.Tracing.dll System.Drawing.Primitives.dll System.Dynamic.Runtime.dll System.Globalization.Calendars.dll System.Globalization.Extensions.dll System.Globalization.dll System.IO.Compression.ZipFile.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.Watcher.dll System.IO.FileSystem.dll System.IO.IsolatedStorage.dll System.IO.MemoryMappedFiles.dll System.IO.Pipes.dll System.IO.UnmanagedMemoryStream.dll System.IO.dll System.IdentityModel.Tokens.Jwt.dll System.Linq.Expressions.dll System.Linq.Parallel.dll System.Linq.Queryable.dll System.Linq.dll System.Net.Http.Formatting.dll System.Net.Http.dll System.Net.NameResolution.dll System.Net.NetworkInformation.dll System.Net.Ping.dll System.Net.Primitives.dll System.Net.Requests.dll System.Net.Security.dll System.Net.Sockets.dll System.Net.WebHeaderCollection.dll System.Net.WebSockets.Client.dll System.Net.WebSockets.dll System.ObjectModel.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reactive.Windows.Threading.dll System.Reflection.Extensions.dll System.Reflection.Primitives.dll System.Reflection.dll System.Resources.Reader.dll System.Resources.ResourceManager.dll System.Resources.Writer.dll System.Runtime.CompilerServices.VisualC.dll System.Runtime.Extensions.dll System.Runtime.Handles.dll System.Runtime.InteropServices.RuntimeInformation.dll System.Runtime.InteropServices.dll System.Runtime.Numerics.dll System.Runtime.Serialization.Formatters.dll System.Runtime.Serialization.Json.dll System.Runtime.Serialization.Primitives.dll System.Runtime.Serialization.Xml.dll System.Runtime.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Csp.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.dll System.Security.SecureString.dll System.Text.Encoding.Extensions.dll System.Text.Encoding.dll System.Text.RegularExpressions.dll System.Threading.Overlapped.dll System.Threading.Tasks.Parallel.dll System.Threading.Tasks.dll System.Threading.Thread.dll System.Threading.ThreadPool.dll System.Threading.Timer.dll System.Threading.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Web.Razor.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XDocument.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll System.Xml.XmlSerializer.dll Tango.AdvancedInstaller.dll Tango.AutoComplete.dll Tango.BL.dll Tango.BrushPicker.dll Tango.CSV.dll Tango.CircularGauge.dll Tango.CodeGeneration.dll Tango.ColorLib.dll Tango.ColorPicker.dll Tango.Core.dll Tango.DAL.Local.dll Tango.DAL.Remote.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Editors.dll Tango.Embroidery.dll Tango.EmbroideryUI.dll Tango.Emulations.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.MachineStudio.ColorCapture.dll Tango.MachineStudio.ColorLab.dll Tango.MachineStudio.Common.dll Tango.MachineStudio.DB.dll Tango.MachineStudio.DataCapture.dll Tango.MachineStudio.Developer.dll Tango.MachineStudio.Dispensers.dll Tango.MachineStudio.HardwareDesigner.dll Tango.MachineStudio.Logging.dll Tango.MachineStudio.MachineDesigner.dll Tango.MachineStudio.RML.dll Tango.MachineStudio.Statistics.dll_1 Tango.MachineStudio.Storage.dll Tango.MachineStudio.Stubs.dll Tango.MachineStudio.Technician.dll Tango.MachineStudio.UI.exe Tango.MachineStudio.Updater.exe Tango.MachineStudio.UsersAndRoles.dll Tango.PMR.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.Stubs.dll Tango.Synchronization.dll Tango.TCC.BL.dll Tango.TCC.CardDetector.dll Tango.TCC.ColorDetector.dll Tango.TCC.LoadTestLib.dll Tango.TCC.OpenCV.DLL.dll Tango.TFS.dll Tango.Transport.dll Tango.Video.dll Tango.Visuals.dll Tango.Web.dll WpfAnimatedGif.dll WriteableBitmapEx.Wpf.dll ZedGraph.dll ZedGraph.resources.dll benchmarks_rgb_lab.csv concrt140.dll cvextern.dll fpgen.exe libMagickCore2.dll libMagickWand2.dll libiconv2.dll libjpeg7.dll libpng120.dll libtiff3.dll libxml22.dll libzbar0.dll mscoree.dll msvcp140.dll msvcp140d.dll netstandard.dll opencv_aruco330d.dll opencv_calib3d330d.dll opencv_core330d.dll opencv_dnn330d.dll opencv_features2d330d.dll opencv_ffmpeg310.dll opencv_ffmpeg310_64.dll opencv_ffmpeg320.dll opencv_ffmpeg320_64.dll opencv_ffmpeg330.dll opencv_flann330d.dll opencv_highgui330d.dll opencv_imgcodecs330d.dll opencv_imgproc330d.dll opencv_ml330d.dll opencv_objdetect330d.dll opencv_photo330d.dll opencv_shape330d.dll opencv_stitching330d.dll opencv_superres330d.dll opencv_video330d.dll opencv_videoio330d.dll opencv_videostab330d.dll protoc.exe protoc1.0M4.jar protocc.exe roslyn ucrtbased.dll vcruntime140.dll vcruntime140d.dll zlib1.dll"/>
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
+    <ROW File="AForge.Imaging.dll" Component_="AForge.Imaging.dll" FileName="AFORGE~1.DLL|AForge.Imaging.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\AForge.Imaging.dll" SelfReg="false" NextFile="AForge.Math.dll"/>
+    <ROW File="AForge.Math.dll" Component_="AForge.Math.dll" FileName="AFORGE~2.DLL|AForge.Math.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\AForge.Math.dll" SelfReg="false" NextFile="HelixToolkit.dll"/>
+    <ROW File="AForge.dll" Component_="AForge.dll" FileName="AForge.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\AForge.dll" SelfReg="false" NextFile="AForge.Imaging.dll"/>
     <ROW File="ColorMine.dll" Component_="ColorMine.dll" FileName="COLORM~1.DLL|ColorMine.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ColorMine.dll" SelfReg="false" NextFile="ColorMine.pdb"/>
     <ROW File="ColorMine.pdb" Component_="ColorMine.dll" FileName="COLORM~1.PDB|ColorMine.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ColorMine.pdb" SelfReg="false" NextFile="DeepEqual.dll"/>
     <ROW File="CommandLine.dll" Component_="CommandLine.dll" FileName="COMMAN~1.DLL|CommandLine.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\CommandLine.dll" SelfReg="false" NextFile="CommandLine.xml"/>
@@ -354,6 +363,9 @@
     <ROW File="FontAwesome.WPF.xml" Component_="Dragablz.xml" FileName="FONTAW~1.XML|FontAwesome.WPF.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\FontAwesome.WPF.xml" SelfReg="false" NextFile="Google.Protobuf.dll"/>
     <ROW File="Google.Protobuf.dll" Component_="Google.Protobuf.dll" FileName="GOOGLE~1.DLL|Google.Protobuf.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Google.Protobuf.dll" SelfReg="false" NextFile="Google.Protobuf.xml"/>
     <ROW File="Google.Protobuf.xml" Component_="Dragablz.xml" FileName="GOOGLE~1.XML|Google.Protobuf.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Google.Protobuf.xml" SelfReg="false" NextFile="ICSharpCode.AvalonEdit.dll"/>
+    <ROW File="HelixToolkit.Wpf.Input.dll" Component_="HelixToolkit.Wpf.Input.dll" FileName="HELIXT~3.DLL|HelixToolkit.Wpf.Input.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\HelixToolkit.Wpf.Input.dll" SelfReg="false" NextFile="Microsoft.SqlServer.AzureStorageEnum.xml"/>
+    <ROW File="HelixToolkit.Wpf.dll" Component_="HelixToolkit.Wpf.dll" FileName="HELIXT~2.DLL|HelixToolkit.Wpf.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\HelixToolkit.Wpf.dll" SelfReg="false" NextFile="HelixToolkit.Wpf.Input.dll"/>
+    <ROW File="HelixToolkit.dll" Component_="HelixToolkit.dll" FileName="HELIXT~1.DLL|HelixToolkit.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\HelixToolkit.dll" SelfReg="false" NextFile="HelixToolkit.Wpf.dll"/>
     <ROW File="ICSharpCode.AvalonEdit.dll" Component_="ICSharpCode.AvalonEdit.dll" FileName="ICSHAR~1.DLL|ICSharpCode.AvalonEdit.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ICSharpCode.AvalonEdit.dll" SelfReg="false" NextFile="ICSharpCode.AvalonEdit.pdb"/>
     <ROW File="ICSharpCode.AvalonEdit.pdb" Component_="ICSharpCode.AvalonEdit.dll" FileName="ICSHAR~1.PDB|ICSharpCode.AvalonEdit.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ICSharpCode.AvalonEdit.pdb" SelfReg="false" NextFile="Ionic.Zip.dll"/>
     <ROW File="Ionic.Zip.dll" Component_="Ionic.Zip.dll" FileName="IONICZ~1.DLL|Ionic.Zip.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Ionic.Zip.dll" SelfReg="false" NextFile="MahApps.Metro.dll"/>
@@ -383,6 +395,7 @@
     <ROW File="Microsoft.ServiceBus.dll" Component_="Microsoft.ServiceBus.dll" FileName="MICROS~3.DLL|Microsoft.ServiceBus.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.ServiceBus.dll" SelfReg="false" NextFile="Microsoft.ServiceBus.xml"/>
     <ROW File="Microsoft.ServiceBus.xml" Component_="Dragablz.xml" FileName="MICROS~3.XML|Microsoft.ServiceBus.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.ServiceBus.xml" SelfReg="false" NextFile="Microsoft.TeamFoundation.Client.dll"/>
     <ROW File="Microsoft.SqlServer.AzureStorageEnum.dll" Component_="Microsoft.SqlServer.AzureStorageEnum.dll" FileName="MICRO~37.DLL|Microsoft.SqlServer.AzureStorageEnum.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.SqlServer.AzureStorageEnum.dll" SelfReg="false" NextFile="Tango.FirmwareUpdateLib.dll"/>
+    <ROW File="Microsoft.SqlServer.AzureStorageEnum.xml" Component_="Dragablz.xml" FileName="MICRO~21.XML|Microsoft.SqlServer.AzureStorageEnum.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.SqlServer.AzureStorageEnum.xml" SelfReg="false" NextFile="Tango.TCC.ColorDetector.pdb"/>
     <ROW File="Microsoft.SqlServer.ConnectionInfo.dll" Component_="Microsoft.SqlServer.ConnectionInfo.dll" FileName="MICRO~28.DLL|Microsoft.SqlServer.ConnectionInfo.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.SqlServer.ConnectionInfo.dll" SelfReg="false" NextFile="Microsoft.SqlServer.ConnectionInfo.xml"/>
     <ROW File="Microsoft.SqlServer.ConnectionInfo.xml" Component_="Dragablz.xml" FileName="MICRO~25.XML|Microsoft.SqlServer.ConnectionInfo.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.SqlServer.ConnectionInfo.xml" SelfReg="false" NextFile="Microsoft.SqlServer.Diagnostics.STrace.dll"/>
     <ROW File="Microsoft.SqlServer.Diagnostics.STrace.dll" Component_="Microsoft.SqlServer.Diagnostics.STrace.dll" FileName="MICRO~29.DLL|Microsoft.SqlServer.Diagnostics.STrace.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.SqlServer.Diagnostics.STrace.dll" SelfReg="false" NextFile="Microsoft.SqlServer.Dmf.Common.dll"/>
@@ -700,6 +713,7 @@
     <ROW File="Tango.TCC.CardDetector.dll" Component_="Tango.TCC.CardDetector.dll" FileName="TANGOT~4.DLL|Tango.TCC.CardDetector.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.TCC.CardDetector.dll" SelfReg="false" NextFile="Tango.TCC.CardDetector.pdb"/>
     <ROW File="Tango.TCC.CardDetector.pdb" Component_="Tango.TCC.CardDetector.dll" FileName="TANGOT~4.PDB|Tango.TCC.CardDetector.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.TCC.CardDetector.pdb" SelfReg="false" NextFile="Tango.TCC.ColorDetector.dll"/>
     <ROW File="Tango.TCC.ColorDetector.dll" Component_="Tango.TCC.ColorDetector.dll" FileName="TANGOT~5.DLL|Tango.TCC.ColorDetector.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.TCC.ColorDetector.dll" SelfReg="false" NextFile="Tango.TCC.LoadTestLib.dll"/>
+    <ROW File="Tango.TCC.ColorDetector.pdb" Component_="Tango.TCC.ColorDetector.dll" FileName="TANGOT~6.PDB|Tango.TCC.ColorDetector.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.TCC.ColorDetector.pdb" SelfReg="false"/>
     <ROW File="Tango.TCC.LoadTestLib.dll" Component_="Tango.TCC.LoadTestLib.dll" FileName="TANGOT~6.DLL|Tango.TCC.LoadTestLib.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.TCC.LoadTestLib.dll" SelfReg="false" NextFile="Tango.TCC.OpenCV.DLL.dll"/>
     <ROW File="Tango.TCC.OpenCV.DLL.dll" Component_="Tango.TCC.OpenCV.DLL.dll" FileName="TANGOT~7.DLL|Tango.TCC.OpenCV.DLL.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.TCC.OpenCV.DLL.dll" SelfReg="false" NextFile="Tango.TCC.OpenCV.DLL.pdb"/>
     <ROW File="Tango.TCC.OpenCV.DLL.pdb" Component_="Tango.TCC.OpenCV.DLL.dll" FileName="TANGOT~5.PDB|Tango.TCC.OpenCV.DLL.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.TCC.OpenCV.DLL.pdb" SelfReg="false" NextFile="benchmarks_rgb_lab.csv"/>
@@ -764,7 +778,7 @@
     <ROW File="opencv_video330d.dll" Component_="opencv_video330d.dll" FileName="OPENC~21.DLL|opencv_video330d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\opencv_video330d.dll" SelfReg="false" NextFile="opencv_videoio330d.dll"/>
     <ROW File="opencv_videoio330d.dll" Component_="opencv_videoio330d.dll" FileName="OPENC~22.DLL|opencv_videoio330d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\opencv_videoio330d.dll" SelfReg="false" NextFile="opencv_videostab330d.dll"/>
     <ROW File="opencv_videostab330d.dll" Component_="opencv_videostab330d.dll" FileName="OPENC~23.DLL|opencv_videostab330d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\opencv_videostab330d.dll" SelfReg="false" NextFile="Tango.MachineStudio.ColorCapture.dll"/>
-    <ROW File="protoc.exe" Component_="protoc.exe" FileName="protoc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ProtoCompilers\protoc.exe" SelfReg="false" DigSign="true"/>
+    <ROW File="protoc.exe" Component_="protoc.exe" FileName="protoc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ProtoCompilers\protoc.exe" SelfReg="false" NextFile="AForge.dll" DigSign="true"/>
     <ROW File="protoc1.0M4.jar" Component_="protoc1.0M4.jar" FileName="PROTOC~1.JAR|protoc-1.0M4.jar" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ProtoCompilers\protoc-1.0M4.jar" SelfReg="false" NextFile="protocc.exe"/>
     <ROW File="protocc.exe" Component_="protocc.exe" FileName="protoc-c.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ProtoCompilers\protoc-c.exe" SelfReg="false" NextFile="protoc.exe" DigSign="true"/>
     <ROW File="template.bmp" Component_="benchmarks_rgb_lab.csv" FileName="template.bmp" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\TCC\template.bmp" SelfReg="false" NextFile="ZedGraph.dll"/>
@@ -787,7 +801,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.0.9" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.0.19"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.0.9" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.0.20"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index 109c4d6da..35eafa66e 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip	
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip	
@@ -18,10 +18,10 @@
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{0D9CFD4A-7DA0-4CBB-AFC3-28A0B7ED6D01} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{FE5F6784-700F-467C-A1F2-94ABABF5D7A8} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.0.24.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.0.26.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -115,6 +115,7 @@
     <ROW Component="Newtonsoft.Json.dll" ComponentId="{E556628B-DB87-4249-AF5E-F5D0AC9E6C32}" Directory_="APPDIR" Attributes="0" KeyPath="Newtonsoft.Json.dll"/>
     <ROW Component="OverrideData.xml" ComponentId="{D7B559ED-70E2-42F9-996D-2D6FDB2ED752}" Directory_="Configurations_Dir" Attributes="0" KeyPath="OverrideData.xml" Type="0"/>
     <ROW Component="ProductInformation" ComponentId="{1D49743C-F4ED-4BE9-8ED0-3792287247F6}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
+    <ROW Component="ProtoCompilers" ComponentId="{ED179509-B252-43BA-94CC-AA7D8BA8A709}" Directory_="ProtoCompilers_Dir" Attributes="0"/>
     <ROW Component="SA.Binary.dll" ComponentId="{FCC45B67-1B47-46A2-8C0A-6CAA78E7C9F0}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="SA.Binary.dll"/>
     <ROW Component="SA.CodeView.dll" ComponentId="{0C133131-0EB4-4E2B-885F-B62EECF039AB}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="SA.CodeView.dll"/>
     <ROW Component="SA.CommonTypes.dll" ComponentId="{7CE9EB0C-3192-4540-8A08-E7E6C59AA62A}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="SA.CommonTypes.dll"/>
@@ -211,16 +212,13 @@
     <ROW Component="csi.exe" ComponentId="{E336E715-213E-4B46-9EC8-6512CDA2BC73}" Directory_="roslyn_Dir" Attributes="0" KeyPath="csi.exe"/>
     <ROW Component="mscoree.dll" ComponentId="{85F439D0-8FD0-4B99-888D-336C7A125E3D}" Directory_="APPDIR" Attributes="0" KeyPath="mscoree.dll"/>
     <ROW Component="msvcp140d.dll" ComponentId="{69E32675-9ACF-4C23-A495-300B78913B66}" Directory_="APPDIR" Attributes="0" KeyPath="msvcp140d.dll"/>
-    <ROW Component="protoc.exe" ComponentId="{6378E0D1-D2C5-4B06-A7A9-83DEFC97C2B3}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc.exe"/>
-    <ROW Component="protoc1.0M4.jar" ComponentId="{15BF0976-E323-4D75-A7B4-6F9B4F3F7C7F}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc1.0M4.jar" Type="0"/>
-    <ROW Component="protocc.exe" ComponentId="{2F49DDEA-4491-406B-B56E-116E779FE965}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protocc.exe"/>
     <ROW Component="ucrtbased.dll" ComponentId="{B8D025EA-CD16-4EE7-A3E7-713E2BE82BF3}" Directory_="APPDIR" Attributes="0" KeyPath="ucrtbased.dll"/>
     <ROW Component="vbc.exe" ComponentId="{4744BEEE-9411-407E-A359-C3755394DF7C}" Directory_="roslyn_Dir" Attributes="0" KeyPath="vbc.exe"/>
     <ROW Component="vcruntime140.dll" ComponentId="{144594CC-D19B-45E4-A420-7A1BBB122EE3}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140.dll"/>
     <ROW Component="vcruntime140d.dll" ComponentId="{7653420C-C6C3-4F31-97E8-D6DE417D3DF2}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140d.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_ExePath ColorMine.dll CommandLine.dll CommandLine.xml ControlzEx.dll DocumentFormat.OpenXml.dll EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll Hyak.Common.dll ICSharpCode.AvalonEdit.dll Interop.MSDASC.dll Ionic.Zip.dll JWT.dll License.lic Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.Azure.Common.NetFramework.dll Microsoft.Azure.Common.dll Microsoft.Azure.ResourceManager.dll Microsoft.Build.Tasks.CodeAnalysis.dll Microsoft.CodeAnalysis.CSharp.Scripting.dll Microsoft.CodeAnalysis.CSharp.dll Microsoft.CodeAnalysis.Scripting.dll Microsoft.CodeAnalysis.VisualBasic.dll Microsoft.CodeAnalysis.dll Microsoft.Data.Edm.dll Microsoft.Data.OData.dll Microsoft.Data.Services.Client.dll Microsoft.DiaSymReader.Native.amd64.dll Microsoft.DiaSymReader.Native.x86.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll OverrideData.xml ProductInformation SA.Binary.dll SA.CodeView.dll SA.CommonTypes.dll SA.CommonUI.dll SA.SCBaseProvider.dll SA.SQLDataExaminer.Engine.dll SA.SQLExaminer.Engine.dll SA.Utils.ErrorReporter.dll SHORTCUTDIR SQLDECmd.exe SQLECmd.exe SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Immutable.dll System.Console.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.IO.Compression.FileSystem.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.dll System.IO.Pipes.dll System.IdentityModel.Tokens.Jwt.dll System.Net.Http.Formatting.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reflection.Metadata.dll System.Security.AccessControl.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.Windows.dll System.Spatial.dll System.Text.Encoding.CodePages.dll System.Threading.Thread.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll Tango.AdvancedInstaller.dll Tango.AnimatedGif.dll Tango.BL.dll Tango.ColorLib.dll Tango.Core.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Emulations.dll Tango.Explorer.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.PMR.dll Tango.PPC.BootScreen.exe Tango.PPC.Common.dll Tango.PPC.Events.dll Tango.PPC.Jobs.dll Tango.PPC.MachineSettings.dll Tango.PPC.Storage.dll Tango.PPC.Technician.dll Tango.PPC.UI.exe Tango.PPC.Updater.exe Tango.PPC.WatchDog.exe Tango.Pulse.dll Tango.SQLExaminer.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.TFS.dll Tango.Touch.dll Tango.Transport.dll Tango.Web.dll Tango.WiFi.dll VBCSCompiler.exe csc.exe csc.exe.config csi.exe mscoree.dll msvcp140d.dll protoc.exe protoc1.0M4.jar protocc.exe ucrtbased.dll vbc.exe vcruntime140.dll vcruntime140d.dll"/>
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_ExePath ColorMine.dll CommandLine.dll CommandLine.xml ControlzEx.dll DocumentFormat.OpenXml.dll EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll Hyak.Common.dll ICSharpCode.AvalonEdit.dll Interop.MSDASC.dll Ionic.Zip.dll JWT.dll License.lic Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.Azure.Common.NetFramework.dll Microsoft.Azure.Common.dll Microsoft.Azure.ResourceManager.dll Microsoft.Build.Tasks.CodeAnalysis.dll Microsoft.CodeAnalysis.CSharp.Scripting.dll Microsoft.CodeAnalysis.CSharp.dll Microsoft.CodeAnalysis.Scripting.dll Microsoft.CodeAnalysis.VisualBasic.dll Microsoft.CodeAnalysis.dll Microsoft.Data.Edm.dll Microsoft.Data.OData.dll Microsoft.Data.Services.Client.dll Microsoft.DiaSymReader.Native.amd64.dll Microsoft.DiaSymReader.Native.x86.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll OverrideData.xml ProductInformation ProtoCompilers SA.Binary.dll SA.CodeView.dll SA.CommonTypes.dll SA.CommonUI.dll SA.SCBaseProvider.dll SA.SQLDataExaminer.Engine.dll SA.SQLExaminer.Engine.dll SA.Utils.ErrorReporter.dll SHORTCUTDIR SQLDECmd.exe SQLECmd.exe SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Immutable.dll System.Console.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.IO.Compression.FileSystem.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.dll System.IO.Pipes.dll System.IdentityModel.Tokens.Jwt.dll System.Net.Http.Formatting.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reflection.Metadata.dll System.Security.AccessControl.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.Windows.dll System.Spatial.dll System.Text.Encoding.CodePages.dll System.Threading.Thread.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll Tango.AdvancedInstaller.dll Tango.AnimatedGif.dll Tango.BL.dll Tango.ColorLib.dll Tango.Core.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Emulations.dll Tango.Explorer.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.PMR.dll Tango.PPC.BootScreen.exe Tango.PPC.Common.dll Tango.PPC.Events.dll Tango.PPC.Jobs.dll Tango.PPC.MachineSettings.dll Tango.PPC.Storage.dll Tango.PPC.Technician.dll Tango.PPC.UI.exe Tango.PPC.Updater.exe Tango.PPC.WatchDog.exe Tango.Pulse.dll Tango.SQLExaminer.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.TFS.dll Tango.Touch.dll Tango.Transport.dll Tango.Web.dll Tango.WiFi.dll VBCSCompiler.exe csc.exe csc.exe.config csi.exe mscoree.dll msvcp140d.dll ucrtbased.dll vbc.exe vcruntime140.dll vcruntime140d.dll"/>
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
@@ -335,7 +333,7 @@
     <ROW File="SA.SQLExaminer.Engine.dll" Component_="SA.SQLExaminer.Engine.dll" FileName="SASQLE~1.DLL|SA.SQLExaminer.Engine.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SQLExaminer\SA.SQLExaminer.Engine.dll" SelfReg="false" NextFile="SA.Utils.ErrorReporter.dll"/>
     <ROW File="SA.Utils.ErrorReporter.dll" Component_="SA.Utils.ErrorReporter.dll" FileName="SAUTIL~1.DLL|SA.Utils.ErrorReporter.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SQLExaminer\SA.Utils.ErrorReporter.dll" SelfReg="false" NextFile="SQLDECmd.exe"/>
     <ROW File="SQLDECmd.exe" Component_="SQLDECmd.exe" FileName="SQLDECmd.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SQLExaminer\SQLDECmd.exe" SelfReg="false" NextFile="SQLECmd.exe" DigSign="true"/>
-    <ROW File="SQLECmd.exe" Component_="SQLECmd.exe" FileName="SQLECmd.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SQLExaminer\SQLECmd.exe" SelfReg="false" NextFile="protoc1.0M4.jar" DigSign="true"/>
+    <ROW File="SQLECmd.exe" Component_="SQLECmd.exe" FileName="SQLECmd.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SQLExaminer\SQLECmd.exe" SelfReg="false" NextFile="csc.exe" DigSign="true"/>
     <ROW File="SQLite.Interop.dll" Component_="SQLite.Interop.dll" FileName="SQLITE~1.DLL|SQLite.Interop.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\x64\SQLite.Interop.dll" SelfReg="false" NextFile="SQLite.Interop.dll_1"/>
     <ROW File="SQLite.Interop.dll_1" Component_="SQLite.Interop.dll_1" FileName="SQLITE~1.DLL|SQLite.Interop.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\x86\SQLite.Interop.dll" SelfReg="false" NextFile="JWT.dll"/>
     <ROW File="Schema.xml" Component_="OverrideData.xml" FileName="Schema.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SQLExaminer\Configurations\Schema.xml" SelfReg="false" NextFile="UpdateMachine.xml"/>
@@ -497,9 +495,6 @@
     <ROW File="csi.rsp" Component_="csc.exe.config" FileName="csi.rsp" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\csi.rsp" SelfReg="false" NextFile="Microsoft.Build.Tasks.CodeAnalysis.dll"/>
     <ROW File="mscoree.dll" Component_="mscoree.dll" FileName="mscoree.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\mscoree.dll" SelfReg="false" NextFile="msvcp140d.dll"/>
     <ROW File="msvcp140d.dll" Component_="msvcp140d.dll" FileName="MSVCP1~1.DLL|msvcp140d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\msvcp140d.dll" SelfReg="false" NextFile="Newtonsoft.Json.dll"/>
-    <ROW File="protoc.exe" Component_="protoc.exe" FileName="protoc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ProtoCompilers\protoc.exe" SelfReg="false" NextFile="csc.exe" DigSign="true"/>
-    <ROW File="protoc1.0M4.jar" Component_="protoc1.0M4.jar" FileName="PROTOC~1.JAR|protoc-1.0M4.jar" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ProtoCompilers\protoc-1.0M4.jar" SelfReg="false" NextFile="protocc.exe"/>
-    <ROW File="protocc.exe" Component_="protocc.exe" FileName="protoc-c.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ProtoCompilers\protoc-c.exe" SelfReg="false" NextFile="protoc.exe" DigSign="true"/>
     <ROW File="ucrtbased.dll" Component_="ucrtbased.dll" FileName="UCRTBA~1.DLL|ucrtbased.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ucrtbased.dll" SelfReg="false" NextFile="vcruntime140.dll"/>
     <ROW File="vbc.exe" Component_="vbc.exe" FileName="vbc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\vbc.exe" SelfReg="false" NextFile="vbc.exe.config" DigSign="true"/>
     <ROW File="vbc.exe.config" Component_="csc.exe.config" FileName="VBCEXE~1.CON|vbc.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\vbc.exe.config" SelfReg="false" NextFile="vbc.rsp"/>
@@ -515,7 +510,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.0.24"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.0.26"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -582,6 +577,7 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
     <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/>
+    <ROW Directory_="ProtoCompilers_Dir" Component_="ProtoCompilers" ManualDelete="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
     <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
index 03a370eb7..3d44219c1 100644
Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk differ
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 91fdbf3aa..3cf0dce1a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("4.0.19.0")]
+[assembly: AssemblyVersion("4.0.20.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/NavigationObjects/TwineCatalogNavigationObject.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/NavigationObjects/TwineCatalogNavigationObject.cs
new file mode 100644
index 000000000..cb1b892fd
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/NavigationObjects/TwineCatalogNavigationObject.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.PPC.Jobs.NavigationObjects
+{
+    public class TwineCatalogNavigationObject
+    {
+        public Rml RML { get; set; }
+
+        public BrushStop BrushStop { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
index 8659367b3..b24313bbb 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
@@ -216,6 +216,7 @@
     <Compile Include="Messages\NavigatedToJobsModuleMessage.cs" />
     <Compile Include="NavigationObjects\JobNavigationObject.cs" />
     <Compile Include="NavigationObjects\JobSummeryNavigationObject.cs" />
+    <Compile Include="NavigationObjects\TwineCatalogNavigationObject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -447,7 +448,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index e2c29cac5..edcc741e6 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -865,7 +865,11 @@ namespace Tango.PPC.Jobs.ViewModels
         /// <param name="stop">The stop.</param>
         private async void OpenTwineCatalog(BrushStop stop)
         {
-            var catalogItem = await NavigationManager.NavigateForResult<JobsModule, TwineCatalogView, CatalogItem, BrushStop>(stop, true);
+            var catalogItem = await NavigationManager.NavigateForResult<JobsModule, TwineCatalogView, CatalogItem, TwineCatalogNavigationObject>(new TwineCatalogNavigationObject()
+            {
+                BrushStop = stop,
+                RML = Job.Rml,
+            }, true);
 
             if (catalogItem != null)
             {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs
index 1fd5c8474..7c6ed0c81 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs
@@ -9,6 +9,7 @@ using Tango.BL.Entities;
 using Tango.Core.Commands;
 using Tango.PPC.Common;
 using Tango.PPC.Common.Navigation;
+using Tango.PPC.Jobs.NavigationObjects;
 using Tango.Settings;
 
 namespace Tango.PPC.Jobs.ViewModels
@@ -16,11 +17,12 @@ namespace Tango.PPC.Jobs.ViewModels
     /// <summary>
     /// Represents the twine catalog view model.
     /// </summary>
-    /// <seealso cref="Tango.PPC.Common.PPCViewModel" />
-    /// <seealso cref="Tango.PPC.Common.Navigation.INavigationResultProvider{Tango.BL.Catalogs.CatalogItem, Tango.BL.Entities.BrushStop}" />
-    public class TwineCatalogViewVM : PPCViewModel, INavigationResultProvider<CatalogItem, BrushStop>
+    /// <seealso cref="PPCViewModel" />
+    /// <seealso cref="INavigationResultProvider{CatalogItem, TwineCatalogNavigationObject}" />
+    public class TwineCatalogViewVM : PPCViewModel, INavigationResultProvider<CatalogItem, TwineCatalogNavigationObject>
     {
         private bool _confirmed;
+        private ObservablesContext _db;
 
         private Catalog _catalog;
         /// <summary>
@@ -73,11 +75,7 @@ namespace Tango.PPC.Jobs.ViewModels
         /// </summary>
         public override void OnApplicationStarted()
         {
-            InvokeUI(() =>
-            {
-                Catalog = CatalogLoader.LoadCatalog(BL.Enumerations.ColorSpaces.Twine, ObservablesStaticCollections.Instance.Context);
-                Recent = CatalogLoader.GetRecent(Catalog, SettingsManager.Default.GetOrCreate<JobsModuleSettings>().RecentTwineCatalogColors);
-            });
+            _db = ObservablesContext.CreateDefault();
         }
 
         /// <summary>
@@ -96,7 +94,6 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             SettingsManager.Default.GetOrCreate<JobsModuleSettings>().RecentTwineCatalogColors.Add(SelectedItem.Entity.Name);
             SettingsManager.Default.Save();
-            Recent = CatalogLoader.GetRecent(Catalog, SettingsManager.Default.GetOrCreate<JobsModuleSettings>().RecentTwineCatalogColors);
 
             _confirmed = true;
             NavigationManager.NavigateBack();
@@ -122,11 +119,16 @@ namespace Tango.PPC.Jobs.ViewModels
         /// Called when the navigation object has been received
         /// </summary>
         /// <param name="brushStop">The brush stop.</param>
-        public virtual void OnNavigationObjectReceived(BrushStop brushStop)
+        public async virtual void OnNavigationObjectReceived(TwineCatalogNavigationObject obj)
         {
-            if (brushStop.ColorCatalog != null)
+            IsFree = false;
+            Catalog = await CatalogLoader.LoadCatalog(BL.Enumerations.ColorSpaces.Twine, obj.RML, _db);
+            Recent = CatalogLoader.GetRecent(Catalog, SettingsManager.Default.GetOrCreate<JobsModuleSettings>().RecentTwineCatalogColors);
+            IsFree = true;
+
+            if (obj.BrushStop.ColorCatalog != null)
             {
-                SelectedItem = Catalog.Groups.SelectMany(x => x.Items).SingleOrDefault(x => x.Entity.Guid == brushStop.ColorCatalog.Guid);
+                SelectedItem = Catalog.Groups.SelectMany(x => x.Items).SingleOrDefault(x => x.Entity.Guid == obj.BrushStop.ColorCatalog.Guid);
             }
             else
             {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml
index 3a29c3dd2..a5ce50ad2 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml
@@ -22,15 +22,17 @@
             </Border>
 
             <Grid Grid.Row="1">
-                <DockPanel Margin="10">
-                    <Border DockPanel.Dock="Bottom" Height="100">
-                        <touch:TouchButton Command="{Binding OKCommand}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="OK" Height="50" Width="150" Style="{StaticResource TangoHollowButton}" Margin="0 0 20 0" />
-                    </Border>
+                <touch:TouchLoadingPanel IsLoading="{Binding IsBusy}">
+                    <DockPanel Margin="10">
+                        <Border DockPanel.Dock="Bottom" Height="100">
+                            <touch:TouchButton Command="{Binding OKCommand}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="OK" Height="50" Width="150" Style="{StaticResource TangoHollowButton}" Margin="0 0 20 0" />
+                        </Border>
 
-                    <Border Style="{StaticResource TangoTouchBorder}" Padding="20 20 20 100" Margin="0 10 0 0">
-                        <controls:TwineCatalogViewer Catalog="{Binding Catalog}" Recent="{Binding Recent}" SelectedItem="{Binding SelectedItem,Mode=TwoWay}" />
-                    </Border>
-                </DockPanel>
+                        <Border Style="{StaticResource TangoTouchBorder}" Padding="20 20 20 100" Margin="0 10 0 0">
+                            <controls:TwineCatalogViewer Catalog="{Binding Catalog}" Recent="{Binding Recent}" SelectedItem="{Binding SelectedItem,Mode=TwoWay}" />
+                        </Border>
+                    </DockPanel>
+                </touch:TouchLoadingPanel>
             </Grid>
         </Grid>
     </Grid>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml
index db6920c80..93af8965a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml
@@ -27,7 +27,7 @@
                     <DataTemplate>
                         <StackPanel Margin="0 0 10 0">
                             <TextBlock HorizontalAlignment="Center" Text="{Binding Name,IsAsync=True}" FontSize="{StaticResource TangoTitleFontSize}"></TextBlock>
-                            <touch:TouchStaticListBox ItemsSource="{Binding Items,IsAsync=True}" SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=SelectedItem,Mode=TwoWay}" Margin="0 20 0 40">
+                            <touch:TouchStaticListBox ItemsSource="{Binding Items}" SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=SelectedItem,Mode=TwoWay}" Margin="0 20 0 40">
                                 <touch:TouchStaticListBox.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <WrapPanel Orientation="Horizontal" />
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 592edd180..2ad5765f0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.0.24.0")]
+[assembly: AssemblyVersion("1.0.26.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>
diff --git a/Software/Visual_Studio/Tango.BL/Catalogs/CatalogLoader.cs b/Software/Visual_Studio/Tango.BL/Catalogs/CatalogLoader.cs
index 1522d0900..3784ee065 100644
--- a/Software/Visual_Studio/Tango.BL/Catalogs/CatalogLoader.cs
+++ b/Software/Visual_Studio/Tango.BL/Catalogs/CatalogLoader.cs
@@ -3,35 +3,39 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL.Entities;
 using Tango.BL.Enumerations;
+using System.Data.Entity;
 
 namespace Tango.BL.Catalogs
 {
     public static class CatalogLoader
     {
-        public static Catalog LoadCatalog(ColorSpaces colorSpace, ObservablesContext context)
+        public static async Task<Catalog> LoadCatalog(ColorSpaces colorSpace, Rml rml, ObservablesContext context)
         {
-            var all_items = context.ColorCatalogs.Where(x => x.ColorSpace.Code == (int)colorSpace).ToList();
-
-            all_items = all_items.DistinctBy(x => x.Name).ToList();
-
-            var first = all_items.First();
+            var space = await context.ColorSpaces.SingleOrDefaultAsync(x => x.Code == (int)colorSpace);
+            var all_items = await context.ColorCatalogs.Where(x => x.RmlGuid == rml.Guid && x.ColorSpace.Code == (int)colorSpace).ToListAsync();
 
             Catalog catalog = new Catalog();
-            catalog.ColorSpace = first.ColorSpace;
-            catalog.Name = first.ColorSpace.Description;
+            catalog.ColorSpace = space;
+            catalog.Name = space.Description;
 
-            foreach (var item in all_items.GroupBy(x => x.ColorGroup))
+            if (all_items.Count > 0)
             {
-                CatalogGroup group = new CatalogGroup();
-                group.Name = item.First().ColorGroup;
+                all_items = all_items.DistinctBy(x => x.Name).ToList();
 
-                foreach (var i in item)
+                foreach (var item in all_items.GroupBy(x => x.ColorGroup))
                 {
-                    group.Items.Add(new CatalogItem(i));
-                }
+                    CatalogGroup group = new CatalogGroup();
+                    group.Name = item.First().ColorGroup;
+
+                    foreach (var i in item)
+                    {
+                        group.Items.Add(new CatalogItem(i));
+                    }
 
-                catalog.Groups.Add(group);
+                    catalog.Groups.Add(group);
+                }
             }
 
             return catalog;
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs
index 89c8f8d86..1e0d5546d 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs
@@ -111,7 +111,6 @@ namespace Tango.BL
                     MidTankTypes = db.MidTankTypes.ToObservableCollection();
                     CartridgeTypes = db.CartridgeTypes.ToObservableCollection();
                     IdsPackFormulas = db.IdsPackFormulas.ToObservableCollection();
-                    ColorCatalogs = db.ColorCatalogs.ToObservableCollection();
 
 
                     Rmls = db.Rmls.ToObservableCollection();
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index f8e632fa5..3f62cd301 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1470,6 +1470,8 @@ namespace Tango.Integration.Operation
 
                     LogManager.Log($"Job upload method is set to {JobUploadStrategy}...");
 
+                    var oldKeepAlive = UseKeepAlive;
+
                     if (JobUploadStrategy == JobUploadStrategy.JobDescriptionFile)
                     {
                         LogManager.Log("Generating job description file...");
@@ -1492,7 +1494,8 @@ namespace Tango.Integration.Operation
                             var storage = CreateStorageManager();
 
                             //Suppress keep alive while job uploads.
-                            storage.SuppressKeepAliveWhileFileUploads = true;
+                            //storage.SuppressKeepAliveWhileFileUploads = true;
+                            UseKeepAlive = false; //This is a work around for Shlomo not managing to keep alive while parsing the file.
 
                             LogManager.Log("Getting storage drive information...");
                             var storageInfo = await storage.GetStorageDrive();
@@ -1518,6 +1521,7 @@ namespace Tango.Integration.Operation
                         }
                         catch (Exception ex)
                         {
+                            UseKeepAlive = oldKeepAlive;
                             Status = MachineStatuses.ReadyToDye;
                             PrintingFailed?.Invoke(this, new PrintingFailedEventArgs(handler, originalJob, ex));
                             PrintingEnded?.Invoke(this, new PrintingEventArgs(handler, originalJob));
@@ -1529,6 +1533,7 @@ namespace Tango.Integration.Operation
 
                     if (handler.IsCanceled)
                     {
+                        UseKeepAlive = oldKeepAlive;
                         Status = MachineStatuses.ReadyToDye;
                         return;
                     }
@@ -1544,6 +1549,14 @@ namespace Tango.Integration.Operation
                             handler.RaiseStatusReceived(response.Message.Status);
                             _last_job_status = handler.Status;
 
+                            if (response.Message.Status.Progress > 0)
+                            {
+                                if (oldKeepAlive != UseKeepAlive)
+                                {
+                                    UseKeepAlive = oldKeepAlive;
+                                }
+                            }
+
                             if (!responseLogged)
                             {
                                 requestSent = true;
@@ -1579,6 +1592,8 @@ namespace Tango.Integration.Operation
                         {
                             completed = true;
 
+                            UseKeepAlive = oldKeepAlive;
+
                             if (!(ex is ContinuousResponseAbortedException))
                             {
                                 Status = MachineStatuses.ReadyToDye;
@@ -1602,6 +1617,8 @@ namespace Tango.Integration.Operation
                         {
                             completed = true;
 
+                            UseKeepAlive = oldKeepAlive;
+
                             Status = MachineStatuses.ReadyToDye;
                             PrintingCompleted?.Invoke(this, new PrintingEventArgs(handler, originalJob));
                             PrintingEnded?.Invoke(this, new PrintingEventArgs(handler, originalJob));
diff --git a/Software/Visual_Studio/Utilities/Tango.CatalogImporter/Program.cs b/Software/Visual_Studio/Utilities/Tango.CatalogImporter/Program.cs
index 7449b06ab..0027fe6a6 100644
--- a/Software/Visual_Studio/Utilities/Tango.CatalogImporter/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.CatalogImporter/Program.cs
@@ -42,7 +42,15 @@ namespace Tango.CatalogImporter
 
             if (!String.IsNullOrWhiteSpace(rml_name))
             {
-                using (ObservablesContext db = ObservablesContext.CreateDefault())
+                using (ObservablesContext db = ObservablesContext.CreateDefault(new Core.DataSource()
+                {
+                    Address = "twine.database.windows.net",
+                    Catalog = "Tango",
+                    Type = Core.DataSourceType.SQLServer,
+                    UserName = "Roy",
+                    Password = "Aa123456",
+                    IntegratedSecurity = false,
+                }))
                 {
                     var rml = db.Rmls.Single(x => x.Name == rml_name);
                     var twine_color_space_guid = db.ColorSpaces.Single(x => (ColorSpaces)x.Code == ColorSpaces.Twine).Guid;
-- 
cgit v1.3.1