Fixed issues with reset counters.

Display general authorization error instead of unexpected application error.
Display environment on FSE.
Completed cleaner dispensing dialog.
Hide/show "Open/Close dyeing head lid" on Flat/Arc.
Emulator will raise proper "Opened" events after "Open dyeing head lid" command.
Updated EF Extensions version to all project due to a bug in "DeleteFromQuery".

24 files changed, 282 insertions, 142 deletions

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/ViewModels/FileSystemViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/ViewModels/FileSystemViewVM.cs
index 4c88d65be..e2be72127 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/ViewModels/FileSystemViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/ViewModels/FileSystemViewVM.cs
@@ -433,40 +433,47 @@ namespace Tango.FSE.Firmware.ViewModels
 
         private async void UploadFiles(List<String> files)
         {
-            String currentPathBefore = CurrentPath;
-
-            foreach (var file in files)
-            {
-                if (!File.Exists(file))
-                {
-                    await NotificationProvider.ShowError($"File '{file}' cannot be uploaded.");
-                    return;
-                }
-            }
-
-            foreach (var file in files)
+            try
             {
-                String itemName = Path.GetFileName(file);
+                String currentPathBefore = CurrentPath;
 
-                if ((CurrentItem as IFileSystemContainer).Items.ToList().Exists(x => x.Name.ToLower() == itemName.ToLower()))
+                foreach (var file in files)
                 {
-                    if (!await NotificationProvider.ShowWarningQuestion($"'{itemName}' already exists on '{CurrentItem.Name}'. Do you want to overwrite?"))
+                    if (!File.Exists(file))
                     {
-                        continue;
+                        await NotificationProvider.ShowError($"File '{file}' cannot be uploaded.");
+                        return;
                     }
                 }
 
-                var handler = await FirmwareStorageProvider.Upload(file, Path.Combine(CurrentItem.Path, Path.GetFileName(file)));
-
-                handler.StatusChanged += (x, status) =>
+                foreach (var file in files)
                 {
-                    if (status == FileSystemHandlerStatus.Completed && currentPathBefore == CurrentPath)
+                    String itemName = Path.GetFileName(file);
+
+                    if ((CurrentItem as IFileSystemContainer).Items.ToList().Exists(x => x.Name.ToLower() == itemName.ToLower()))
                     {
-                        NavigateToCurrentPath();
+                        if (!await NotificationProvider.ShowWarningQuestion($"'{itemName}' already exists on '{CurrentItem.Name}'. Do you want to overwrite?"))
+                        {
+                            continue;
+                        }
                     }
-                };
 
-                FileSystemHandlers.Insert(0, handler);
+                    var handler = await FirmwareStorageProvider.Upload(file, Path.Combine(CurrentItem.Path, Path.GetFileName(file)));
+
+                    handler.StatusChanged += (x, status) =>
+                    {
+                        if (status == FileSystemHandlerStatus.Completed && currentPathBefore == CurrentPath)
+                        {
+                            NavigateToCurrentPath();
+                        }
+                    };
+
+                    FileSystemHandlers.Insert(0, handler);
+                }
+            }
+            catch (Exception ex)
+            {
+                await NotificationProvider.ShowError($"Error uploading to file system.\n{ex.FlattenMessage()}");
             }
         }
 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/SettingsViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/SettingsViewVM.cs
index ed2cbd714..a8300b9b7 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/SettingsViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/SettingsViewVM.cs
@@ -81,11 +81,19 @@ namespace Tango.FSE.MachineConfiguration.ViewModels
 
         private async void SaveConfiguration()
         {
-            using (NotificationProvider.PushTaskItem("Saving machine configuration..."))
+            try
             {
-                EditingComposition.Machine.SiteGuid = SelectedSite.Guid;
-                EditingComposition = await Services.MachineConfigurationService.SaveMachineEditingComposition(EditingComposition);
-                await NotificationProvider.ShowSuccess("Machine configuration saved successfully.");
+                using (NotificationProvider.PushTaskItem("Saving machine configuration..."))
+                {
+                    EditingComposition.Machine.SiteGuid = SelectedSite.Guid;
+                    EditingComposition = await Services.MachineConfigurationService.SaveMachineEditingComposition(EditingComposition);
+                    await NotificationProvider.ShowSuccess("Machine configuration saved successfully.");
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error saving the machine configuration.");
+                await NotificationProvider.ShowError($"Error saving the machine configuration.\n{ex.FlattenMessage()}");
             }
         }
 
@@ -105,24 +113,33 @@ namespace Tango.FSE.MachineConfiguration.ViewModels
 
             if (!await NotificationProvider.ShowWarningQuestion("Resetting the machine counters will delete the entire job runs history. Are you sure?", "RESET COUNTERS", "CANCEL")) return;
 
-            using (var task = NotificationProvider.PushTaskItem("Resetting machine counters..."))
+            try
             {
-                task.UpdateProgress("Resetting local machine counters...");
-
-                var result = await RemoteSqlProvider.ExecuteSqlCommandAsync(new RemoteSqlCommand()
+                using (var task = NotificationProvider.PushTaskItem("Resetting machine counters..."))
                 {
-                    Mode = RemoteSqlCommandMode.Local,
-                    Timeout = 30,
-                    SQL = "DELETE FROM JOB_RUNS"
-                });
+                    task.UpdateProgress("Resetting local machine counters...");
 
-                int localJobRuns = result.LocalAffectedRecords;
+                    var result = await RemoteSqlProvider.ExecuteSqlCommandAsync(new RemoteSqlCommand()
+                    {
+                        Mode = RemoteSqlCommandMode.Local,
+                        Timeout = 30,
+                        SQL = "DELETE FROM JOB_RUNS"
+                    });
 
-                task.UpdateProgress("Resetting global machine counters...");
+                    int localJobRuns = result.LocalAffectedRecords;
 
-                int remoteJobRuns = await Services.MachineConfigurationService.ResetCounters(EditingComposition.Machine.Guid);
+                    task.UpdateProgress("Resetting global machine counters...");
 
-                await NotificationProvider.ShowSuccess("Machine counters deleted successfully.");
+                    int remoteJobRuns = await Services.MachineConfigurationService.ResetCounters(EditingComposition.Machine.Guid);
+                    EditingComposition.ResetCounters();
+
+                    await NotificationProvider.ShowSuccess("Machine counters deleted successfully.");
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error resetting machine counters.");
+                await NotificationProvider.ShowError($"Error resetting the machine counters.\n{ex.FlattenMessage()}");
             }
         }
 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/FileSystemViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/FileSystemViewVM.cs
index b34c8c527..2ab3e5c62 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/FileSystemViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/FileSystemViewVM.cs
@@ -326,31 +326,38 @@ namespace Tango.FSE.PPCConsole.ViewModels
 
         private async void OnItemsDroppedIn(List<FileSystemItem> items)
         {
-            String currentPathBefore = CurrentPath;
-
-            foreach (var item in items.Where(x => x.Type != FileSystemItemType.Drive))
+            try
             {
-                Debug.WriteLine($"Dropped in: {item.Name} => {CurrentItem.Path}");
+                String currentPathBefore = CurrentPath;
 
-                if ((CurrentItem as IFileSystemContainer).Items.ToList().Exists(x => x.Name.ToLower() == item.Name.ToLower()))
+                foreach (var item in items.Where(x => x.Type != FileSystemItemType.Drive))
                 {
-                    if (!await NotificationProvider.ShowWarningQuestion($"'{item.Name}' already exists on '{CurrentItem.Name}'. Do you want to overwrite?"))
+                    Debug.WriteLine($"Dropped in: {item.Name} => {CurrentItem.Path}");
+
+                    if ((CurrentItem as IFileSystemContainer).Items.ToList().Exists(x => x.Name.ToLower() == item.Name.ToLower()))
                     {
-                        continue;
+                        if (!await NotificationProvider.ShowWarningQuestion($"'{item.Name}' already exists on '{CurrentItem.Name}'. Do you want to overwrite?"))
+                        {
+                            continue;
+                        }
                     }
-                }
 
-                var handler = await FileSystemProvider.Upload(item.Path, CurrentItem);
+                    var handler = await FileSystemProvider.Upload(item.Path, CurrentItem);
 
-                handler.StatusChanged += (x, status) =>
-                {
-                    if (status == FileSystemHandlerStatus.Completed && currentPathBefore == CurrentPath)
+                    handler.StatusChanged += (x, status) =>
                     {
-                        NavigateToCurrentPath();
-                    }
-                };
+                        if (status == FileSystemHandlerStatus.Completed && currentPathBefore == CurrentPath)
+                        {
+                            NavigateToCurrentPath();
+                        }
+                    };
 
-                FileSystemHandlers.Insert(0, handler);
+                    FileSystemHandlers.Insert(0, handler);
+                }
+            }
+            catch (Exception ex)
+            {
+                await NotificationProvider.ShowError($"Error uploading to file system.\n{ex.FlattenMessage()}");
             }
         }
 
@@ -552,40 +559,47 @@ namespace Tango.FSE.PPCConsole.ViewModels
             var result = await StorageProvider.SelectFilesAndFolders("Select files and folders to upload");
             if (result)
             {
-                String currentPathBefore = CurrentPath;
-
-                foreach (var item in result.SelectedItems)
-                {
-                    if (!File.Exists(item) && !Directory.Exists(item))
-                    {
-                        await NotificationProvider.ShowError($"File or folder '{item}' cannot be uploaded.");
-                        return;
-                    }
-                }
-
-                foreach (var item in result.SelectedItems)
+                try
                 {
-                    String itemName = Path.GetFileName(item);
+                    String currentPathBefore = CurrentPath;
 
-                    if ((CurrentItem as IFileSystemContainer).Items.ToList().Exists(x => x.Name.ToLower() == itemName.ToLower()))
+                    foreach (var item in result.SelectedItems)
                     {
-                        if (!await NotificationProvider.ShowWarningQuestion($"'{itemName}' already exists on '{CurrentItem.Name}'. Do you want to overwrite?"))
+                        if (!File.Exists(item) && !Directory.Exists(item))
                         {
-                            continue;
+                            await NotificationProvider.ShowError($"File or folder '{item}' cannot be uploaded.");
+                            return;
                         }
                     }
 
-                    var handler = await FileSystemProvider.Upload(item, CurrentItem);
-
-                    handler.StatusChanged += (x, status) =>
+                    foreach (var item in result.SelectedItems)
                     {
-                        if (status == FileSystemHandlerStatus.Completed && currentPathBefore == CurrentPath)
+                        String itemName = Path.GetFileName(item);
+
+                        if ((CurrentItem as IFileSystemContainer).Items.ToList().Exists(x => x.Name.ToLower() == itemName.ToLower()))
                         {
-                            NavigateToCurrentPath();
+                            if (!await NotificationProvider.ShowWarningQuestion($"'{itemName}' already exists on '{CurrentItem.Name}'. Do you want to overwrite?"))
+                            {
+                                continue;
+                            }
                         }
-                    };
 
-                    FileSystemHandlers.Insert(0, handler);
+                        var handler = await FileSystemProvider.Upload(item, CurrentItem);
+
+                        handler.StatusChanged += (x, status) =>
+                        {
+                            if (status == FileSystemHandlerStatus.Completed && currentPathBefore == CurrentPath)
+                            {
+                                NavigateToCurrentPath();
+                            }
+                        };
+
+                        FileSystemHandlers.Insert(0, handler);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    await NotificationProvider.ShowError($"Error uploading to file system.\n{ex.FlattenMessage()}");
                 }
             }
         }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs
index 5b7991f44..6dec3a40d 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs
@@ -9,12 +9,13 @@ using System.Data.Entity;
 using Tango.BL.Builders;
 using Tango.BL.DTO;
 using Tango.BL.Enumerations;
+using Tango.Core;
 
 namespace Tango.FSE.BL.Services
 {
     public class MachineConfigurationService : FSEServiceBase
     {
-        public class MachineEditingComposition : IDisposable
+        public class MachineEditingComposition : ExtendedObject, IDisposable
         {
             internal MachineDTO PreviousMachineState { get; set; }
 
@@ -31,6 +32,14 @@ namespace Tango.FSE.BL.Services
                 HardwareVersions = new List<HardwareVersion>();
             }
 
+            public void ResetCounters()
+            {
+                TotalDyeMeters = "0 meters";
+                RaisePropertyChanged(nameof(TotalDyeMeters));
+                TotalDyeTime = "00:00:00";
+                RaisePropertyChanged(nameof(TotalDyeTime));
+            }
+
             public void Dispose()
             {
                 Context?.Dispose();
@@ -100,7 +109,9 @@ namespace Tango.FSE.BL.Services
         {
             return Task.Factory.StartNew<int>(() =>
             {
-                using (ObservablesContext db = new ObservablesContext())
+                Authentication.ThrowIfNoPermission(Permissions.FSE_ResetMachineCounters);
+
+                using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
                     var sn = db.Machines.SingleOrDefault(x => x.Guid == machineGuid).SerialNumber;
                     ActionLogManager.InsertLog(ActionLogType.MachineCountersReset, CurrentUser.Guid, sn, machineGuid, "Machine counters reset via FSE.");
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj b/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj
index c361f1d3f..00025adb5 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj
@@ -76,14 +76,14 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
-    <Reference Include="Z.EntityFramework.Extensions, Version=4.0.58.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Z.EntityFramework.Extensions.4.0.58\lib\net45\Z.EntityFramework.Extensions.dll</HintPath>
+    <Reference Include="Z.EntityFramework.Extensions, Version=5.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Z.EntityFramework.Extensions.5.1.6\lib\net45\Z.EntityFramework.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Z.EntityFramework.Plus.EF6, Version=1.12.19.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Z.EntityFramework.Plus.EF6.1.12.19\lib\net45\Z.EntityFramework.Plus.EF6.dll</HintPath>
+    <Reference Include="Z.EntityFramework.Plus.EF6, Version=5.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Z.EntityFramework.Plus.EF6.5.1.6\lib\net45\Z.EntityFramework.Plus.EF6.dll</HintPath>
     </Reference>
-    <Reference Include="Z.Expressions.Eval, Version=3.1.8.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Z.Expressions.Eval.3.1.8\lib\net45\Z.Expressions.Eval.dll</HintPath>
+    <Reference Include="Z.Expressions.Eval, Version=4.0.27.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Z.Expressions.Eval.4.0.27\lib\net45\Z.Expressions.Eval.dll</HintPath>
     </Reference>
     <Reference Include="ZSpitz.Util, Version=0.0.6.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\ZSpitz.Util.0.0.6\lib\netstandard2.0\ZSpitz.Util.dll</HintPath>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/packages.config b/Software/Visual_Studio/FSE/Tango.FSE.BL/packages.config
index 413d8b6de..0f62e5b36 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/packages.config
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/packages.config
@@ -9,8 +9,8 @@
   <package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net461" />
   <package id="WindowsAPICodePack-Core" version="1.1.1" targetFramework="net461" />
   <package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net461" />
-  <package id="Z.EntityFramework.Extensions" version="4.0.58" targetFramework="net461" />
-  <package id="Z.EntityFramework.Plus.EF6" version="1.12.19" targetFramework="net461" />
-  <package id="Z.Expressions.Eval" version="3.1.8" targetFramework="net461" />
+  <package id="Z.EntityFramework.Extensions" version="5.1.6" targetFramework="net461" />
+  <package id="Z.EntityFramework.Plus.EF6" version="5.1.6" targetFramework="net461" />
+  <package id="Z.Expressions.Eval" version="4.0.27" targetFramework="net461" />
   <package id="ZSpitz.Util" version="0.0.6" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Converters.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Converters.xaml
index dcc60e62c..54f8e5d63 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Converters.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Converters.xaml
@@ -47,4 +47,6 @@
     <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
     <converters:GenericMessageProtocolToStringConverter x:Key="GenericMessageProtocolToStringConverter" />
     <localConverters:LiquidTypeToShortNameConverter x:Key="LiquidTypeToShortNameConverter" />
+    <converters:IsEqualConverter x:Key="IsEqualConverter" />
+    <converters:IsNotConverter x:Key="IsNotConverter" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/App.xaml.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/App.xaml.cs
index 0f35e985d..fec442831 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/App.xaml.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/App.xaml.cs
@@ -263,19 +263,26 @@ namespace Tango.FSE.UI
 
                             if (notificationProvider != null)
                             {
-                                notificationProvider.PushSnackbarItem(MessageType.Error, "Application Error", true, "Unexpected error has occurred\nTap to report this issue.", null, null, () =>
+                                if (e.Exception.GetType() == typeof(AuthorizationException))
                                 {
-                                    if (bugReporter != null)
+                                    notificationProvider.PushSnackbarItem(MessageType.Error, "Authorization Error", true, "You are not authorized to perform the specified action.", TimeSpan.FromSeconds(8));
+                                }
+                                else
+                                {
+                                    notificationProvider.PushSnackbarItem(MessageType.Error, "Application Error", true, "Unexpected error has occurred\nTap to report this issue.", null, null, () =>
                                     {
-                                        bugReporter.ShowBugReportDialog(new Bug()
+                                        if (bugReporter != null)
                                         {
-                                            Title = $"Unexpected Application Error",
-                                            Description = e.Exception.Message,
-                                            Type = BugType.FSE,
-                                            Exception = e.Exception
-                                        });
-                                    }
-                                });
+                                            bugReporter.ShowBugReportDialog(new Bug()
+                                            {
+                                                Title = $"Unexpected Application Error",
+                                                Description = e.Exception.Message,
+                                                Type = BugType.FSE,
+                                                Exception = e.Exception
+                                            });
+                                        }
+                                    });
+                                }
                             }
                         }
                         catch (Exception ex)
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Authentication/DefaultAuthenticationProvider.cs
index 309839831..e1399560e 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -70,10 +70,15 @@ namespace Tango.FSE.UI.Authentication
             }
         }
 
+        private EnvironmentConfiguration _currentEnvironment;
         /// <summary>
         /// Gets the current environment configuration.
         /// </summary>
-        public EnvironmentConfiguration CurrentEnvironment { get; private set; }
+        public EnvironmentConfiguration CurrentEnvironment
+        {
+            get { return _currentEnvironment; }
+            private set { _currentEnvironment = value; RaisePropertyChangedAuto(); }
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DefaultAuthenticationProvider"/> class.
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/FileAssociation/DefaultFileAssociationProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/FileAssociation/DefaultFileAssociationProvider.cs
index 89364cbbd..b1f750f4d 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/FileAssociation/DefaultFileAssociationProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/FileAssociation/DefaultFileAssociationProvider.cs
@@ -45,7 +45,7 @@ namespace Tango.FSE.UI.FileAssociation
 
         public async void OnApplicationReady(IFSEApplicationManager applicationManager)
         {
-            if (!_initialized) return;
+            if (_initialized) return;
 
             _initialized = true;
 
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
index 1857168ba..35e4ffc6a 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
@@ -110,6 +110,21 @@
                                                 </Style>
                                             </material:PackIcon.Style>
                                         </material:PackIcon>
+
+                                        <DockPanel Margin="10 6">
+                                            <DockPanel.Style>
+                                                <Style TargetType="DockPanel">
+                                                    <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding AuthenticationProvider.CurrentEnvironment.Name,Converter={StaticResource IsNotConverter},ConverterParameter='PROD'}" Value="True">
+                                                            <Setter Property="Visibility" Value="Visible"></Setter>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </DockPanel.Style>
+                                            <Rectangle Stroke="{StaticResource FSE_BorderBrush}" />
+                                            <TextBlock Margin="10 0 0 0" Foreground="{StaticResource FSE_GrayBrush}" Text="{Binding AuthenticationProvider.CurrentEnvironment.Description}" FontSize="{StaticResource FSE_SmallFontSize}" VerticalAlignment="Center"></TextBlock>
+                                        </DockPanel>
                                     </StackPanel>
 
                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 5 0">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingView.xaml
index 5fa737221..98be45608 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingView.xaml
@@ -6,28 +6,45 @@
              xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
              xmlns:local="clr-namespace:Tango.PPC.Maintenance.Dialogs"
              mc:Ignorable="d" 
-             Background="{StaticResource TangoPrimaryBackgroundBrush}"  d:DesignHeight="555" d:DesignWidth="560" Width="600" Height="800" d:DataContext="{d:DesignInstance Type=local:CleanerDispensingViewVM, IsDesignTimeCreatable=False}">
+             Background="{StaticResource TangoPrimaryBackgroundBrush}"  d:DesignHeight="555" d:DesignWidth="560" Width="600" Height="950" d:DataContext="{d:DesignInstance Type=local:CleanerDispensingViewVM, IsDesignTimeCreatable=False}">
     <Grid>
         <StackPanel Margin="0 50 0 0" HorizontalAlignment="Center">
             <Image Source="../Images/head_cleaning.png" RenderOptions.BitmapScalingMode="Fant" Stretch="Uniform" Height="120"></Image>
             <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" Margin="0 30 0 0">Dispense Cleaning Liquid</TextBlock>
 
+
+            <DockPanel Margin="20 40" HorizontalAlignment="Center">
+                <touch:TouchIcon Icon="Alert" Foreground="{StaticResource TangoErrorBrush}" />
+                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" Foreground="{StaticResource TangoErrorBrush}">Please put on safety glasses</TextBlock>
+            </DockPanel>
+            
             <Label Margin="20 10" HorizontalAlignment="Center">
                 <Label.Style>
                     <Style TargetType="Label">
                         <Setter Property="Content">
                             <Setter.Value>
-                                <TextBlock>
-                                    <Run>Press 'start' to initiate the cleaner liquid dispensing</Run>
+                                <TextBlock LineHeight="30" TextWrapping="Wrap">
+                                    <Run>1. Pull the thread aside and clean with Q tip when the liquid is dispensed.</Run>
+                                    <LineBreak/>
+                                    <Run>2. Dispense again if the liquid isn't enough for cleaning.</Run>
+                                    <LineBreak/>
+                                    <Run>3. When cleaning is completed, return the thread back to the V-Groove and press the 'Close Dyeing Head Lid' button to close the head lid</Run>
                                 </TextBlock>    
                             </Setter.Value>
                         </Setter>
                         <Style.Triggers>
-                            <DataTrigger Binding="{Binding IsStarted}" Value="True">
-                                <Setter Property="Content" Value="Cleaner dispensing in progress"></Setter>
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding IsCompleted}" Value="True">
-                                <Setter Property="Content" Value="Cleaner dispensing completed"></Setter>
+                            <DataTrigger Binding="{Binding MachineProvider.Machine.MachineHeadType}" Value="Arc">
+                                <Setter Property="Content">
+                                    <Setter.Value>
+                                        <TextBlock LineHeight="30" TextWrapping="Wrap">
+                                            <Run>1. Open the dyeing head lid,  pull the thread aside and clean with Q tip when the liquid is dispensed.</Run>
+                                            <LineBreak/>
+                                            <Run>2. Dispense again if the liquid isn't enough for cleaning.</Run>
+                                            <LineBreak/>
+                                            <Run>3. When cleaning is completed, return the thread back to the V-Groove and install the head lid back.</Run>
+                                        </TextBlock>
+                                    </Setter.Value>
+                                </Setter>
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
@@ -40,7 +57,7 @@
 
             <StackPanel Margin="40 150 40 40">
                 <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Status}"></TextBlock>
-                <touch:TouchProgressBar Margin="0 5 0 0" VerticalAlignment="Bottom" Width="500" Height="10" Minimum="0" Maximum="100" Value="0" IsIndeterminate="{Binding IsStarted}">
+                <touch:TouchProgressBar Margin="0 5 0 0" VerticalAlignment="Bottom" Height="10" Minimum="0" Maximum="100" Value="0" IsIndeterminate="{Binding IsStarted}">
                     
                 </touch:TouchProgressBar>
             </StackPanel>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingViewVM.cs
index b84cd83de..e37be417f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingViewVM.cs
@@ -23,7 +23,7 @@ namespace Tango.PPC.Maintenance.Dialogs
         private const int JOGGING_SPEED = 400;
 
         [TangoInject]
-        private IMachineProvider MachineProvider { get; set; }
+        public IMachineProvider MachineProvider { get; set; }
 
         [TangoInject]
         private INotificationProvider NotificationProvider { get; set; }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
index 286485d47..d00b4abb2 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
@@ -10,6 +10,7 @@
              xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
              xmlns:localConverters="clr-namespace:Tango.PPC.Maintenance.Converters"
              xmlns:localControls="clr-namespace:Tango.PPC.Maintenance.Controls"
+             xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.PPC.Maintenance.Views"
              mc:Ignorable="d" 
              d:DesignHeight="1800" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MaintenanceViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MaintenanceViewVM}">
@@ -247,7 +248,7 @@
                                         <localControls:ButtonState Value="Opened" Content="CLOSE RIGHT LEADING WHEELS" />
                                     </localControls:StateTouchButton>
 
-                                    <localControls:StateTouchButton Command="{Binding OpenCloseDyeingHeadCommand.Command}" SelectedState="{Binding OpenCloseDyeingHeadCommand.State}" Margin="20" CornerRadius="25" Height="50" FontSize="18" Style="{StaticResource TangoHollowButton}">
+                                    <localControls:StateTouchButton Command="{Binding OpenCloseDyeingHeadCommand.Command}" SelectedState="{Binding OpenCloseDyeingHeadCommand.State}" Margin="20" CornerRadius="25" Height="50" FontSize="18" Style="{StaticResource TangoHollowButton}" Visibility="{Binding MachineProvider.Machine.MachineHeadType,Converter={StaticResource IsToStringEqualToVisibilityConverter},ConverterParameter='Flat'}">
                                         <localControls:ButtonState Value="Closed" Content="OPEN DYEING HEAD LID" />
                                         <localControls:ButtonState Value="Opened" Content="CLOSE DYEING HEAD LID" />
                                     </localControls:StateTouchButton>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
index 374f5b51b..09762d7ce 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
@@ -59,6 +59,8 @@
     <converters:TimeSpanToSecondsConverter x:Key="TimeSpanToSecondsConverter" />
     <converters:TimeSpanToDaysConverter x:Key="TimeSpanToDaysConverter" />
     <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
+    <converters:IsEqualToVisibilityConverter x:Key="IsEqualToVisibilityConverter" />
+    <converters:IsToStringEqualToVisibilityConverter x:Key="IsToStringEqualToVisibilityConverter" />
 
     <Style TargetType="FrameworkElement">
         <Setter Property="TextElement.FontFamily" Value="{StaticResource TangoFlexoFontFamily}"></Setter>
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index 4da8606f7..dc817af6e 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -84,14 +84,14 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Z.EntityFramework.Extensions, Version=4.0.50.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Z.EntityFramework.Extensions.4.0.50\lib\net45\Z.EntityFramework.Extensions.dll</HintPath>
+    <Reference Include="Z.EntityFramework.Extensions, Version=5.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\packages\Z.EntityFramework.Extensions.5.1.6\lib\net45\Z.EntityFramework.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Z.EntityFramework.Plus.EF6, Version=1.12.13.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Z.EntityFramework.Plus.EF6.1.12.13\lib\net45\Z.EntityFramework.Plus.EF6.dll</HintPath>
+    <Reference Include="Z.EntityFramework.Plus.EF6, Version=5.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\packages\Z.EntityFramework.Plus.EF6.5.1.6\lib\net45\Z.EntityFramework.Plus.EF6.dll</HintPath>
     </Reference>
-    <Reference Include="Z.Expressions.Eval, Version=3.1.5.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Z.Expressions.Eval.3.1.5\lib\net45\Z.Expressions.Eval.dll</HintPath>
+    <Reference Include="Z.Expressions.Eval, Version=4.0.27.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\packages\Z.Expressions.Eval.4.0.27\lib\net45\Z.Expressions.Eval.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -645,7 +645,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/packages.config b/Software/Visual_Studio/Tango.BL/packages.config
index d928d5575..81001d8fe 100644
--- a/Software/Visual_Studio/Tango.BL/packages.config
+++ b/Software/Visual_Studio/Tango.BL/packages.config
@@ -10,7 +10,7 @@
   <package id="System.Data.SQLite.Core" version="1.0.108.0" targetFramework="net46" />
   <package id="System.Data.SQLite.EF6" version="1.0.108.0" targetFramework="net46" />
   <package id="System.Data.SQLite.Linq" version="1.0.108.0" targetFramework="net46" />
-  <package id="Z.EntityFramework.Extensions" version="4.0.50" targetFramework="net461" />
-  <package id="Z.EntityFramework.Plus.EF6" version="1.12.13" targetFramework="net461" />
-  <package id="Z.Expressions.Eval" version="3.1.5" targetFramework="net461" />
+  <package id="Z.EntityFramework.Extensions" version="5.1.6" targetFramework="net461" />
+  <package id="Z.EntityFramework.Plus.EF6" version="5.1.6" targetFramework="net461" />
+  <package id="Z.Expressions.Eval" version="4.0.27" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 9cdf6dcae..6360b7bbc 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -1009,6 +1009,24 @@ namespace Tango.Emulations.Emulators
                 Transporter.SendResponse<MotorHomingResponse>(new MotorHomingResponse() { MaxProgress = 100, Progress = 100 }, request.Container.Token, new TransportResponseConfig() { Completed = true });
                 _motorHomingRequestCodes.Remove(homeRequest.MotorType);
                 ResetGraphFactors();
+
+                if (request.Message.MotorType == PMR.Hardware.HardwareMotorType.MotoDhLid)
+                {
+                    if (request.Message.Direction == MotorDirection.Backward)
+                    {
+                        var eventState1 = EventsStates.FirstOrDefault(x => x.EventType == PMR.Diagnostics.EventType.DyeingHeadArcLidIsOpen);
+                        var eventState2 = EventsStates.FirstOrDefault(x => x.EventType == PMR.Diagnostics.EventType.DyeingHeadCoverIsOpen);
+                        eventState1.IsActive = true;
+                        eventState2.IsActive = true;
+                    }
+                    else
+                    {
+                        var eventState1 = EventsStates.FirstOrDefault(x => x.EventType == PMR.Diagnostics.EventType.DyeingHeadArcLidIsOpen);
+                        var eventState2 = EventsStates.FirstOrDefault(x => x.EventType == PMR.Diagnostics.EventType.DyeingHeadCoverIsOpen);
+                        eventState1.IsActive = false;
+                        eventState2.IsActive = false;
+                    }
+                }
             });
         }
 
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/IsToStringEqualToVisibilityConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/IsToStringEqualToVisibilityConverter.cs
new file mode 100644
index 000000000..478b21c09
--- /dev/null
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/IsToStringEqualToVisibilityConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Tango.SharedUI.Converters
+{
+    public class IsToStringEqualToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value.ToStringSafe().Equals(parameter.ToStringSafe());
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
index 49f1b8e7d..e4dc72746 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
+++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
@@ -121,6 +121,7 @@
     <Compile Include="Converters\IsNullToVisibilityConverter.cs" />
     <Compile Include="Converters\IsSegmentGradientConverter.cs" />
     <Compile Include="Converters\IsSegmentGradientToVisibilityConverter.cs" />
+    <Compile Include="Converters\IsToStringEqualToVisibilityConverter.cs" />
     <Compile Include="Converters\LastItemInContainerToBooleanConverter.cs" />
     <Compile Include="Converters\MathOperatorConverter.cs" />
     <Compile Include="Converters\NumberToFileSizeConverter.cs" />
@@ -260,7 +261,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/Utilities/Tango.JobRunsGenerator/Tango.JobRunsGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Tango.JobRunsGenerator.csproj
index b89b1cb21..e8f5af6f3 100644
--- a/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Tango.JobRunsGenerator.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Tango.JobRunsGenerator.csproj
@@ -48,14 +48,14 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="Z.EntityFramework.Extensions, Version=4.0.50.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Z.EntityFramework.Extensions.4.0.50\lib\net45\Z.EntityFramework.Extensions.dll</HintPath>
+    <Reference Include="Z.EntityFramework.Extensions, Version=5.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Z.EntityFramework.Extensions.5.1.6\lib\net45\Z.EntityFramework.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Z.EntityFramework.Plus.EF6, Version=1.12.13.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Z.EntityFramework.Plus.EF6.1.12.13\lib\net45\Z.EntityFramework.Plus.EF6.dll</HintPath>
+    <Reference Include="Z.EntityFramework.Plus.EF6, Version=5.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Z.EntityFramework.Plus.EF6.5.1.6\lib\net45\Z.EntityFramework.Plus.EF6.dll</HintPath>
     </Reference>
-    <Reference Include="Z.Expressions.Eval, Version=3.1.5.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Z.Expressions.Eval.3.1.5\lib\net45\Z.Expressions.Eval.dll</HintPath>
+    <Reference Include="Z.Expressions.Eval, Version=4.0.27.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Z.Expressions.Eval.4.0.27\lib\net45\Z.Expressions.Eval.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/packages.config b/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/packages.config
index a025a5d0d..6d95e7b5d 100644
--- a/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/packages.config
+++ b/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
-  <package id="Z.EntityFramework.Extensions" version="4.0.50" targetFramework="net461" />
-  <package id="Z.EntityFramework.Plus.EF6" version="1.12.13" targetFramework="net461" />
-  <package id="Z.Expressions.Eval" version="3.1.5" targetFramework="net461" />
+  <package id="Z.EntityFramework.Extensions" version="5.1.6" targetFramework="net461" />
+  <package id="Z.EntityFramework.Plus.EF6" version="5.1.6" targetFramework="net461" />
+  <package id="Z.Expressions.Eval" version="4.0.27" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
index bccd84cad..2e05ad690 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
@@ -277,14 +277,14 @@
       <Private>True</Private>
       <HintPath>..\..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Z.EntityFramework.Extensions, Version=4.0.50.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Z.EntityFramework.Extensions.4.0.50\lib\net45\Z.EntityFramework.Extensions.dll</HintPath>
+    <Reference Include="Z.EntityFramework.Extensions, Version=5.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Z.EntityFramework.Extensions.5.1.6\lib\net45\Z.EntityFramework.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Z.EntityFramework.Plus.EF6, Version=1.12.13.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Z.EntityFramework.Plus.EF6.1.12.13\lib\net45\Z.EntityFramework.Plus.EF6.dll</HintPath>
+    <Reference Include="Z.EntityFramework.Plus.EF6, Version=5.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Z.EntityFramework.Plus.EF6.5.1.6\lib\net45\Z.EntityFramework.Plus.EF6.dll</HintPath>
     </Reference>
-    <Reference Include="Z.Expressions.Eval, Version=3.1.5.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Z.Expressions.Eval.3.1.5\lib\net45\Z.Expressions.Eval.dll</HintPath>
+    <Reference Include="Z.Expressions.Eval, Version=4.0.27.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Z.Expressions.Eval.4.0.27\lib\net45\Z.Expressions.Eval.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -505,7 +505,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <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>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/packages.config b/Software/Visual_Studio/Web/Tango.MachineService/packages.config
index 599e31535..f2f83d078 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/packages.config
+++ b/Software/Visual_Studio/Web/Tango.MachineService/packages.config
@@ -44,7 +44,7 @@
   <package id="System.Data.SQLite.EF6" version="1.0.108.0" targetFramework="net46" />
   <package id="System.Data.SQLite.Linq" version="1.0.108.0" targetFramework="net46" />
   <package id="WebGrease" version="1.5.2" targetFramework="net45" />
-  <package id="Z.EntityFramework.Extensions" version="4.0.50" targetFramework="net461" />
-  <package id="Z.EntityFramework.Plus.EF6" version="1.12.13" targetFramework="net461" />
-  <package id="Z.Expressions.Eval" version="3.1.5" targetFramework="net461" />
+  <package id="Z.EntityFramework.Extensions" version="5.1.6" targetFramework="net461" />
+  <package id="Z.EntityFramework.Plus.EF6" version="5.1.6" targetFramework="net461" />
+  <package id="Z.Expressions.Eval" version="4.0.27" targetFramework="net461" />
 </packages>
\ No newline at end of file